From 404ae051cdfd2fdcfe6db407e62cf12621168eef Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sat, 13 Oct 2018 17:30:30 +0200 Subject: [PATCH] scss: make titles respect line heights --- css/clear-typography.css | 38 +++++++++++++++++++------------------- scss/clear-typography.scss | 12 ++++++------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/css/clear-typography.css b/css/clear-typography.css index fffdc71..4d83dc1 100644 --- a/css/clear-typography.css +++ b/css/clear-typography.css @@ -108,40 +108,40 @@ h1, h2, h3, h4, h5, h6, h7 { font-weight: 400; } h1 { - font-size: 2em; - line-height: 1.5em; - padding: 0em 0 1em 0; + font-size: 2.33333em; + line-height: 1em; + padding: 0.33333em 0 0.6em 0; font-weight: 600; } h2 { - font-size: 1.8em; + font-size: 2em; line-height: 1.5em; - padding: 0em 0 0em 0; + padding: 0.33333em 0 0.4em 0; font-weight: 600; } h3 { - font-size: 1.6em; - line-height: 1.5em; - padding: 0em 0 0em 0; + font-size: 1.5em; + line-height: 1em; + padding: 0em 0 1em 0; font-weight: 600; } h4 { - font-size: 1.4em; - line-height: 1.5em; - padding: 0em 0 0em 0; - font-weight: 600; } + font-size: 1.5em; + line-height: 1em; + padding: 0em 0 1em 0; + font-weight: 400; } h5 { - font-size: 1.4em; - line-height: 1.5em; - padding: 0em 0 0em 0; + font-size: 1.33333em; + line-height: 1em; + padding: 0.1em 0 1.13333em 0; font-weight: 400; } h6 { - font-size: 1.2em; - line-height: 1.5em; - padding: 0em 0 0em 0; - font-weight: 400; } + font-size: 1.1em; + line-height: 1.4em; + padding: 0.1em 0 1.2em 0; + font-weight: 600; } /* ------------------ HR ------------------- */ hr { diff --git a/scss/clear-typography.scss b/scss/clear-typography.scss index 797f5b5..8456d3f 100644 --- a/scss/clear-typography.scss +++ b/scss/clear-typography.scss @@ -141,27 +141,27 @@ h1, h2, h3, h4, h5, h6, h7 { } h1 { - @include title(2em, 1.5em, 0em, 1em, 600); + @include title(2.3333333em, 1em, 0.333333em, 0.6em, 600); } h2 { - @include title(1.8em, 1.5em, 0em, 0em, 600); + @include title(2em, 1.5em, 0.333333em, 0.4em, 600); } h3 { - @include title(1.6em, 1.5em, 0em, 0em, 600); + @include title(1.5em, 1em, 0em, 1em, 600); } h4 { - @include title(1.4em, 1.5em, 0em, 0em, 600); + @include title(1.5em, 1em, 0em, 1em, 400); } h5 { - @include title(1.4em, 1.5em, 0em, 0em, 400); + @include title(1.333333em, 1em, 0.1em, 1.133333em, 400); } h6 { - @include title(1.2em, 1.5em, 0em, 0em, 400); + @include title(1.1em, 1.4em, 0.1em, 1.2em, 600); } /* ------------------ HR ------------------- */