Skip to content

Commit f435f6d

Browse files
Update font sizes
- Add new fluid type scale using CSS custom properties (CSS variables), generated using utopia.fyi - Replace SCSS font size mixins with CSS variables for the new font sizes
1 parent b67c6de commit f435f6d

27 files changed

+103
-60
lines changed

assets-src/styles/advanced.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
/*------------------------------------*\
2424
#Mixins
2525
\*------------------------------------*/
26-
@import "sass/20-mixins/font-sizes";
2726
@import "sass/20-mixins/media-query";
2827
@import "sass/20-mixins/stack";
2928

assets-src/styles/core.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
@import "sass/00-settings/colors";
1010
//@import "sass/00-settings/debug";
1111
@import "sass/00-settings/fonts";
12+
@import "sass/00-settings/font-sizes";
1213
@import "sass/00-settings/typesetting";
1314

1415

@@ -24,7 +25,6 @@
2425
/*------------------------------------*\
2526
#Mixins
2627
\*------------------------------------*/
27-
@import "sass/20-mixins/font-sizes";
2828
@import "sass/20-mixins/media-query";
2929
@import "sass/20-mixins/stack";
3030

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*------------------------------------*\
2+
#Font sizes
3+
4+
Fluid type calculations generated using Utopia:
5+
https://utopia.fyi/type/calculator/?c=320,16,1.125,1120,18,1.125,7,1,&s=0.75%7C0.5%7C0.25,1.5%7C2%7C3%7C4%7C6,s-l&g=s,l,xl,12
6+
7+
CSS custom property names have been adapted from Utopia, add namespacing, give explicit usage context and use kebab case.
8+
\*------------------------------------*/
9+
10+
:root {
11+
--w3c-text-01: clamp(0.8889rem, 0.8444rem + 0.2222vw, 1rem);
12+
--w3c-text-0: clamp(1rem, 0.95rem + 0.25vw, 1.125rem);
13+
--w3c-text-1: clamp(1.125rem, 1.0688rem + 0.2813vw, 1.2656rem);
14+
--w3c-text-2: clamp(1.2656rem, 1.2023rem + 0.3164vw, 1.4238rem);
15+
--w3c-text-3: clamp(1.4238rem, 1.3526rem + 0.356vw, 1.6018rem);
16+
--w3c-text-4: clamp(1.6018rem, 1.5217rem + 0.4005vw, 1.802rem);
17+
--w3c-text-5: clamp(1.802rem, 1.7119rem + 0.4505vw, 2.0273rem);
18+
--w3c-text-6: clamp(2.0273rem, 1.9259rem + 0.5068vw, 2.2807rem);
19+
--w3c-text-7: clamp(2.2807rem, 2.1667rem + 0.5702vw, 2.5658rem);
20+
}

assets-src/styles/sass/30-base/_forms.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ Group inputs to line up side-by-side
4545
}
4646

4747
.field-legend {
48-
@include txt-saturn;
48+
//@include txt-saturn;
49+
font-size: var(--w3c-text-1);
4950
font-weight: bold;
5051
}
5152

@@ -76,7 +77,8 @@ label,
7677
}
7778

7879
.field-hint {
79-
@include txt-pluto;
80+
//@include txt-pluto;
81+
font-size: var(--w3c-text-01);
8082
color: $storm-gray;
8183
// margin-block-end: 0.25rem;
8284
max-inline-size: rem($text-measure);
@@ -597,7 +599,8 @@ Progress bar
597599
}
598600

599601
> span {
600-
@include txt-pluto;
602+
//@include txt-pluto;
603+
font-size: var(--w3c-text-01);
601604
padding: rem(10);
602605

603606
@include mq($bp-tab-small) {

assets-src/styles/sass/30-base/_html-elements.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ i {
2424
small,
2525
.small,
2626
.small-caps {
27-
@include txt-eris;
27+
//@include txt-eris;
28+
font-size: var(--w3c-text-01);
2829
}
2930

3031

assets-src/styles/sass/30-base/_typography.scss

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
body {
66
font-family: $font-family;
7-
font-size: 1rem; // Equivalent to 16px browser default
7+
font-size: var(--w3c-text-0);
88
font-style: $font-style;
99
font-weight: $font-weight;
1010
line-height: 1.5;
@@ -25,46 +25,37 @@ h1, h2, h3, h4, h5, h6 {
2525
// margin-bottom: 1em;
2626
// }
2727

28-
h1,
29-
.txt-venus {
30-
@include txt-venus;
28+
:where(h1, .venus, .h1) {
29+
font-size: var(--w3c-text-5);
3130
}
3231

33-
h2,
34-
.txt-earth {
35-
@include txt-earth;
32+
:where(h2, .txt-earth, .h2) {
33+
font-size: var(--w3c-text-4);
3634
}
3735

38-
h3,
39-
.txt-mars {
40-
@include txt-mars;
36+
:where(h3, .txt-mars, .h3) {
37+
font-size: var(--w3c-text-3);
4138
}
4239

43-
h4,
44-
.txt-jupiter {
45-
@include txt-jupiter;
40+
:where(h4, .txt-jupiter, .h4) {
41+
font-size: var(--w3c-text-2);
4642
}
4743

48-
h5,
49-
.txt-saturn {
50-
@include txt-saturn;
44+
:where(h5, .txt-saturn, .h5) {
45+
font-size: var(--w3c-text-1);
5146
}
5247

53-
h6 {
54-
font-size: 1rem;
48+
:where(h6, .h6) {
49+
font-size: var(--w3c-text-0);
5550
}
5651

5752
.lead {
5853
font-size: rem(23);
5954
line-height: calc(33.6 / 24);
6055
}
6156

62-
.txt-pluto {
63-
@include txt-pluto;
64-
}
65-
66-
.txt-eris {
67-
@include txt-eris;
57+
:where(.txt-pluto, .txt-eris, .text-sm) {
58+
font-size: var(--w3c-text-01);
6859
}
6960

7061

assets-src/styles/sass/50-core-components/_breadcrumbs.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020

2121
.breadcrumbs a {
22-
@include txt-pluto;
22+
//@include txt-pluto;
2323
color: $off-black;
2424
display: block;
25+
font-size: var(--w3c-text-01);
2526
padding-block: rem(11);
2627

2728
&:visited,

assets-src/styles/sass/50-core-components/_cards.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
}
5858

5959
.card__heading {
60-
@include txt-saturn;
60+
//@include txt-saturn;
61+
font-size: var(--w3c-text-1);
6162
}
6263

6364
.card__image img {

assets-src/styles/sass/50-core-components/_collapsibles.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121
// }
2222

2323
[data-heading="collapsibles"] h3 {
24-
@include txt-saturn;
24+
//@include txt-saturn;
25+
font-size: var(--w3c-text-1);
2526
}
2627

2728
[data-heading="collapsibles"] > * {
28-
@include txt-pluto;
29+
//@include txt-pluto;
2930
display: block;
31+
font-size: var(--w3c-text-01);
3032
font-weight: normal;
3133
// margin-block-start: 1rem;
3234
}

assets-src/styles/sass/50-core-components/_comments.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
padding-block: rem(50);
88

99
h2 {
10-
@include txt-mars;
10+
//@include txt-mars;
11+
font-size: var(--w3c-text-3);
1112
}
1213

1314
}
@@ -89,8 +90,9 @@
8990
}
9091

9192
[data-replylink] {
92-
@include txt-pluto;
93+
//@include txt-pluto;
9394
align-self: flex-start;
95+
font-size: var(--w3c-text-01);
9496
padding-block: rem(11);
9597
}
9698

0 commit comments

Comments
 (0)