Skip to content

Commit 6658c96

Browse files
committed
💄 Match default font size with browser defaults
1 parent 58c00e2 commit 6658c96

19 files changed

+38
-38
lines changed

src/components/Accordion/accordion.module.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
li {
88
@include border(primary-50, bottom);
99
@include spacing(py-sm, px-none, m0);
10-
@include typography(md);
1110

1211
&:first-child {
1312
padding-top: 0;
@@ -20,7 +19,7 @@
2019

2120
.title {
2221
@include layout(flex, h-between, v-center, sm);
23-
@include typography(md, primary, left);
22+
@include typography(default, primary, left);
2423
@include size('w100%');
2524
@include spacing(p0);
2625
@include border(0);

src/components/Alert/alert.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
}
4242

4343
.title {
44-
@include typography(hmd);
44+
@include typography(lg, hmd);
4545
display: block;
4646
}
4747

4848
.body {
49-
@include typography(primary-20, md, hmd);
49+
@include typography(primary-20, hmd);
5050
}
5151
}

src/components/Badge/badge.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@include spacing(py-xs, px-sm);
66
@include border-radius(xs);
77
@include layout(inline-flex, v-center, xs);
8-
@include typography(xs, primary-50);
8+
@include typography(sm, primary-50);
99
@include border(0);
1010
@include background(primary);
1111

src/components/Button/button.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
.button {
44
@include layout(inline-flex, v-center, xs);
5-
@include typography(md, primary-50, none);
5+
@include typography(default, primary-50, none);
66
@include spacing(py-sm, px-md);
77
@include border-radius(xs);
88
@include border(0);

src/components/Card/card.module.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
.title {
1717
@include spacing(p-default);
1818
@include border(primary-50, bottom);
19-
@include typography(md);
2019
display: block;
2120
}
2221

src/components/Checkbox/checkbox.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body {
66

77
.checkbox {
88
@include layout(inline-flex, sm);
9-
@include typography(md, hmd);
9+
@include typography(hmd);
1010

1111
cursor: pointer;
1212

@@ -57,7 +57,7 @@ body {
5757

5858
.text {
5959
@include spacing(ml-lg);
60-
@include typography(sm, primary-20);
60+
@include typography(md, primary-20);
6161

6262
a {
6363
@include typography(primary-20);

src/components/Input/input.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@include layout(flex, column);
5555

5656
.label {
57-
@include typography(md, primary-20);
57+
@include typography(primary-20);
5858
@include spacing(mb-xs);
5959
}
6060

@@ -73,7 +73,7 @@
7373
}
7474

7575
.subtext {
76-
@include typography(sm, primary-30);
76+
@include typography(md, primary-30);
7777
@include spacing(mt-xs);
7878
}
7979
}

src/components/Menu/menu.module.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
.menu {
44
@include background(primary-70);
55
@include spacing(p-md);
6-
@include typography(md);
76
@include border(bottom, primary-50);
87
@include position(sticky, t0);
98
@include layer(header);

src/components/Progress/progress.module.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ body {
1111
@include size('w100%', h10px);
1212
@include border-radius(xl);
1313
@include visibility(hidden);
14-
@include typography(bold, xxs);
14+
@include typography(bold, xs);
1515
@include background(var(--w-progress-background));
1616

1717
color: var(--w-progress-background);
1818

1919
&.medium {
2020
@include size(h15px);
21-
@include typography(xs);
21+
@include typography(sm);
2222
}
2323

2424
&.large {
2525
@include size(h20px);
26-
@include typography(sm);
26+
@include typography(md);
2727
}
2828

2929
&.square {

src/components/Radio/radio.module.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ body {
1313

1414
label {
1515
@include layout(flex, xs);
16-
@include typography(md);
1716

1817
cursor: pointer;
1918

@@ -71,7 +70,7 @@ body {
7170

7271
.subtext {
7372
@include spacing(ml-lg);
74-
@include typography(sm, primary-20);
73+
@include typography(md, primary-20);
7574

7675
a {
7776
@include typography(primary-20);

src/components/Rating/rating.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ body {
3535

3636
.text {
3737
@include transition(color);
38-
@include typography(md, primary-20);
38+
@include typography(default, primary-20);
3939
@include spacing(ml-xs);
4040

4141
&.m {

src/components/Switch/switch.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ body {
3636
}
3737

3838
.label {
39-
@include typography(sm);
39+
@include typography(md);
4040
}
4141
}
4242

src/components/Table/table.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
table {
77
@include size('w100%');
8-
@include typography(md, left);
8+
@include typography(left);
99

1010
border-collapse: collapse;
1111
}

src/components/Tabs/tabs.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
button {
7777
@include transition(color);
7878
@include background(transparent);
79-
@include typography(md, primary-20);
79+
@include typography(default, primary-20);
8080
@include border(0);
8181
@include spacing(p-md);
8282
@include layout(flex, v-center, sm);

src/components/TimelineItem/timelineitem.module.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
.item {
44
@include position(relative);
5-
@include typography(md);
65
@include spacing(m0);
76

87
&::before {
98
@include position(absolute, t-5px);
109
@include size(25px);
1110
@include border-radius(max);
1211
@include background(var(--w-timeline-color));
13-
@include typography(sm);
12+
@include typography(md);
1413
@include layout(inline-flex, center);
1514
@include border(2px, primary-70);
1615

@@ -21,7 +20,7 @@
2120
}
2221

2322
.title {
24-
@include typography(bold, default);
23+
@include typography(bold, lg);
2524
@include spacing(mb-sm);
2625

2726
display: block;

src/pages/resets.astro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import Card from '@components/Card/Card.astro'
3131
<li>Call the <code>setup</code> mixin in your global SCSS file.</li>
3232
</ol>
3333

34+
<hr />
3435
<p>Start your dev server with:</p>
3536
<pre>npm run dev</pre>
3637

src/scss/config/typography.scss

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ $fontTypes: (
44
) !default;
55

66
$fontSizes: (
7-
'xxs': 10px,
8-
'xs': 12px,
9-
'sm': 14px,
10-
'md': 16px,
11-
'default': 18px,
12-
'lg': 21px,
13-
'xl': 24px,
14-
'2xl': 28px,
15-
'3xl': 32px
7+
'xs': 10px,
8+
'sm': 12px,
9+
'md': 14px,
10+
'default': 16px,
11+
'lg': 18px,
12+
'xl': 21px,
13+
'2xl': 24px,
14+
'3xl': 28px
1615
) !default;
1716

1817
$lineHeights: (

src/scss/global/tooltip.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
&::before {
2525
@include border-radius(md);
2626
@include position(absolute);
27-
@include typography(sm, hlg);
27+
@include typography(md, hlg);
2828
@include background(var(--w-tooltip-background));
2929
@include size(wmax-content);
3030
@include spacing(px-xs);

src/scss/resets.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
pre {
5454
@include border(primary-50);
5555
@include border-radius(md);
56-
@include typography(sm);
56+
@include typography(md);
5757
}
5858

5959
code {
@@ -73,7 +73,7 @@
7373
}
7474

7575
figcaption {
76-
@include typography(sm, primary-20);
76+
@include typography(md, primary-20);
7777

7878
a {
7979
@include typography(primary-20);
@@ -85,7 +85,7 @@
8585
}
8686

8787
p, ul, ol {
88-
@include typography(md, hlg);
88+
@include typography(hlg);
8989
@include spacing(my-default);
9090
}
9191

@@ -94,8 +94,13 @@
9494
}
9595

9696
blockquote {
97-
@include typography(md);
9897
@include spacing(my-default, mx-none, pl-default);
9998
@include border(2px, left, primary-30);
10099
}
100+
101+
hr {
102+
@include size('w100%', h1px);
103+
@include border(0);
104+
@include background(primary-50);
105+
}
101106
}

0 commit comments

Comments
 (0)