diff options
author | Volpeon <git@volpeon.ink> | 2021-05-10 16:41:05 +0200 |
---|---|---|
committer | Volpeon <git@volpeon.ink> | 2021-05-10 16:41:05 +0200 |
commit | a48d05d1d5fcff414359c8ba6cc8f38467aebdeb (patch) | |
tree | 3542bf116c910a1bb42b40d8531f60c2c2498b08 /assets | |
parent | Update (diff) | |
download | volpeon.ink-a48d05d1d5fcff414359c8ba6cc8f38467aebdeb.tar.gz volpeon.ink-a48d05d1d5fcff414359c8ba6cc8f38467aebdeb.tar.bz2 volpeon.ink-a48d05d1d5fcff414359c8ba6cc8f38467aebdeb.zip |
Refactoring to fully take advantage of Make
Diffstat (limited to 'assets')
-rw-r--r-- | assets/css/_basics.scss | 11 | ||||
-rw-r--r-- | assets/css/_vars.scss | 2 | ||||
-rw-r--r-- | assets/css/components/_outer-button.scss | 8 | ||||
-rw-r--r-- | assets/css/scopes/_body.scss | 9 | ||||
-rw-r--r-- | assets/css/scopes/_headlines.scss | 12 |
5 files changed, 26 insertions, 16 deletions
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, | |||
138 | h4, | 138 | h4, |
139 | h5, | 139 | h5, |
140 | h6 { | 140 | h6 { |
141 | margin: ($line-height * 2rem) 0 0; | 141 | margin: ($line-height * 2rem) 0 0; |
142 | color: var(--heading--fg); | 142 | color: var(--heading--fg); |
143 | font-family: $font-fam--large; | 143 | font-size: 1em; |
144 | font-size: 1em; | 144 | font-weight: 700; |
145 | font-weight: 600; | ||
146 | line-height: 1.4; | ||
147 | font-feature-settings: 'ss02' 1; | ||
148 | 145 | ||
149 | & + & { | 146 | & + & { |
150 | margin-top: $line-height * 1rem; | 147 | 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: ( | |||
14 | 14 | ||
15 | $responsive-mod-scale: ( | 15 | $responsive-mod-scale: ( |
16 | xs: (.8rem, 1.35), | 16 | xs: (.8rem, 1.35), |
17 | md: (.8rem, 1.58) | 17 | md: (.8rem, 1.53) |
18 | ); | 18 | ); |
19 | 19 | ||
20 | $font-fam--text: 'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif; | 20 | $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 @@ | |||
24 | transition: background-color .2s, color .2s; | 24 | transition: background-color .2s, color .2s; |
25 | background-color: prop(--colors --bg); | 25 | background-color: prop(--colors --bg); |
26 | color: prop(--colors --fg); | 26 | color: prop(--colors --fg); |
27 | font-size: 1 / 16 * 15rem; | 27 | font-size: 1rem; |
28 | font-weight: 700; | ||
28 | letter-spacing: 1px; | 29 | letter-spacing: 1px; |
29 | text-decoration: none; | 30 | text-decoration: none; |
30 | text-transform: uppercase; | 31 | text-transform: uppercase; |
@@ -51,8 +52,8 @@ | |||
51 | 52 | ||
52 | @include element('icon-symbol') { | 53 | @include element('icon-symbol') { |
53 | display: block; | 54 | display: block; |
54 | width: 1.45em; | 55 | width: 1.5em; |
55 | height: 1.45em; | 56 | height: 1.5em; |
56 | } | 57 | } |
57 | 58 | ||
58 | @include element('content') { | 59 | @include element('content') { |
@@ -60,6 +61,7 @@ | |||
60 | padding-right: prop(--dims --pad-x); | 61 | padding-right: prop(--dims --pad-x); |
61 | padding-left: prop(--dims --pad-x); | 62 | padding-left: prop(--dims --pad-x); |
62 | transition: border-color .2s; | 63 | transition: border-color .2s; |
64 | font-size: 1 / 16 * 14em; | ||
63 | line-height: prop(--dims --outer, $global: true); | 65 | line-height: prop(--dims --outer, $global: true); |
64 | white-space: nowrap; | 66 | white-space: nowrap; |
65 | } | 67 | } |
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 @@ | |||
11 | font-size: 1 / 16 * 19em; | 11 | font-size: 1 / 16 * 19em; |
12 | 12 | ||
13 | @include element('meta') { | 13 | @include element('meta') { |
14 | margin-top: $line-height * 1rem; | 14 | color: prop(--colors --meta --fg); |
15 | color: prop(--colors --meta --fg); | 15 | font-size: 1 / 16 * 15rem; |
16 | font-size: 1 / 16 * 15rem; | ||
17 | 16 | ||
18 | + * { | 17 | + h1 { |
19 | margin-top: $line-height * 1.5rem; | 18 | margin-top: $line-height * .5rem; |
20 | } | 19 | } |
21 | } | 20 | } |
22 | 21 | ||
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 | |||
@@ -11,6 +11,18 @@ | |||
11 | h1, | 11 | h1, |
12 | h2, | 12 | h2, |
13 | h3, | 13 | h3, |
14 | h4, | ||
15 | h5, | ||
16 | h6 { | ||
17 | font-family: $font-fam--large; | ||
18 | font-weight: 600; | ||
19 | line-height: 1.4; | ||
20 | font-feature-settings: 'ss02' 1; | ||
21 | } | ||
22 | |||
23 | h1, | ||
24 | h2, | ||
25 | h3, | ||
14 | h4 { | 26 | h4 { |
15 | transform: translateX(-.06em); | 27 | transform: translateX(-.06em); |
16 | } | 28 | } |