From a48d05d1d5fcff414359c8ba6cc8f38467aebdeb Mon Sep 17 00:00:00 2001 From: Volpeon Date: Mon, 10 May 2021 16:41:05 +0200 Subject: Refactoring to fully take advantage of Make --- assets/css/_basics.scss | 11 ++++------- assets/css/_vars.scss | 2 +- assets/css/components/_outer-button.scss | 8 +++++--- assets/css/scopes/_body.scss | 9 ++++----- assets/css/scopes/_headlines.scss | 12 ++++++++++++ 5 files changed, 26 insertions(+), 16 deletions(-) (limited to 'assets/css') diff --git a/assets/css/_basics.scss b/assets/css/_basics.scss index b2a437b..573167c 100644 --- a/assets/css/_basics.scss +++ b/assets/css/_basics.scss @@ -138,13 +138,10 @@ h3, h4, h5, h6 { - margin: ($line-height * 2rem) 0 0; - color: var(--heading--fg); - font-family: $font-fam--large; - font-size: 1em; - font-weight: 600; - line-height: 1.4; - font-feature-settings: 'ss02' 1; + margin: ($line-height * 2rem) 0 0; + color: var(--heading--fg); + font-size: 1em; + font-weight: 700; & + & { margin-top: $line-height * 1rem; diff --git a/assets/css/_vars.scss b/assets/css/_vars.scss index 3adce04..0df3a61 100644 --- a/assets/css/_vars.scss +++ b/assets/css/_vars.scss @@ -14,7 +14,7 @@ $unit-intervals: ( $responsive-mod-scale: ( xs: (.8rem, 1.35), - md: (.8rem, 1.58) + md: (.8rem, 1.53) ); $font-fam--text: 'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif; diff --git a/assets/css/components/_outer-button.scss b/assets/css/components/_outer-button.scss index 22fa251..e54c83d 100644 --- a/assets/css/components/_outer-button.scss +++ b/assets/css/components/_outer-button.scss @@ -24,7 +24,8 @@ transition: background-color .2s, color .2s; background-color: prop(--colors --bg); color: prop(--colors --fg); - font-size: 1 / 16 * 15rem; + font-size: 1rem; + font-weight: 700; letter-spacing: 1px; text-decoration: none; text-transform: uppercase; @@ -51,8 +52,8 @@ @include element('icon-symbol') { display: block; - width: 1.45em; - height: 1.45em; + width: 1.5em; + height: 1.5em; } @include element('content') { @@ -60,6 +61,7 @@ padding-right: prop(--dims --pad-x); padding-left: prop(--dims --pad-x); transition: border-color .2s; + font-size: 1 / 16 * 14em; line-height: prop(--dims --outer, $global: true); white-space: nowrap; } diff --git a/assets/css/scopes/_body.scss b/assets/css/scopes/_body.scss index 8e5f876..96231ad 100644 --- a/assets/css/scopes/_body.scss +++ b/assets/css/scopes/_body.scss @@ -11,12 +11,11 @@ font-size: 1 / 16 * 19em; @include element('meta') { - margin-top: $line-height * 1rem; - color: prop(--colors --meta --fg); - font-size: 1 / 16 * 15rem; + color: prop(--colors --meta --fg); + font-size: 1 / 16 * 15rem; - + * { - margin-top: $line-height * 1.5rem; + + h1 { + margin-top: $line-height * .5rem; } } diff --git a/assets/css/scopes/_headlines.scss b/assets/css/scopes/_headlines.scss index 6b28e9c..8b75708 100644 --- a/assets/css/scopes/_headlines.scss +++ b/assets/css/scopes/_headlines.scss @@ -8,6 +8,18 @@ )); @include scope(namespace()) { + h1, + h2, + h3, + h4, + h5, + h6 { + font-family: $font-fam--large; + font-weight: 600; + line-height: 1.4; + font-feature-settings: 'ss02' 1; + } + h1, h2, h3, -- cgit v1.2.3-70-g09d2