Skip to content

Commit 32ff0d7

Browse files
Change typography variables to headings, T-20761
1 parent 5fc384a commit 32ff0d7

File tree

10 files changed

+69
-68
lines changed

10 files changed

+69
-68
lines changed

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
* Prepare for air-blocks-buildtool
1010
* Remove stylelint-file-max-lines, T-20765
1111
* Add more breakpoints like $container-desktop, T-20758
12-
* Fix burger navigation sometimes not being centered vertically
13-
* Change to new dev.docs.dude.fi way of naming conventions, combine font partials under variables to one _typography.scss file
14-
* Move font-face include under _typography.scss
12+
* Fix burger navigation sometimes not being centered vertically, T-20918
13+
* Change to new dev.docs.dude.fi way of naming conventions, combine font partials under variables to one _typography.scss file, T-20761
14+
* Move font-face include under _typography.scss, T-20761
15+
* Change typography variables to headings, T-20761
1516

1617
### 9.4.4: 2024-09-13
1718

css/dev/global.css

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/dev/gutenberg-editor-styles.css

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/prod/global.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/prod/gutenberg-editor-styles.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sass/gutenberg/blocks/_error.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
}
2020

2121
h2 {
22-
font-size: var(--typography-size-h4);
22+
font-size: var(--typography-h4-size);
2323
}
2424
}

sass/layout/_typography.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,27 +48,27 @@ h6 {
4848
// Define heading scales
4949
// Current: Perfect fourth: https://type-scale.com/
5050
h1 {
51-
font-size: var(--typography-size-h1);
51+
font-size: var(--typography-h1-size);
5252
}
5353

5454
h2 {
55-
font-size: var(--typography-size-h2);
55+
font-size: var(--typography-h2-size);
5656
}
5757

5858
h3 {
59-
font-size: var(--typography-size-h3);
59+
font-size: var(--typography-h3-size);
6060
}
6161

6262
h4 {
63-
font-size: var(--typography-size-h4);
63+
font-size: var(--typography-h4-size);
6464
}
6565

6666
h5 {
67-
font-size: var(--typography-size-h5);
67+
font-size: var(--typography-h5-size);
6868
}
6969

7070
h6 {
71-
font-size: var(--typography-size-h6);
71+
font-size: var(--typography-h6-size);
7272
}
7373

7474
h1:first-child,

sass/variables/_typography.scss

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323

2424
// Heading font sizes
2525
--typography-size-hero: 52px;
26-
--typography-size-h1: 40px;
27-
--typography-size-h2: 30px;
28-
--typography-size-h3: 24px;
29-
--typography-size-h4: 20px;
30-
--typography-size-h5: 16px;
31-
--typography-size-h6: 14px;
26+
--typography-h1-size: 40px;
27+
--typography-h2-size: 30px;
28+
--typography-h3-size: 24px;
29+
--typography-h4-size: 20px;
30+
--typography-h5-size: 16px;
31+
--typography-h6-size: 14px;
3232

3333
// Paragraph font sizes
3434
--typography-size-12: 12px;
@@ -62,12 +62,12 @@
6262
// Heading font sizes in mobile
6363
@media (max-width: $container-mobile) {
6464
--typography-size-hero: 38px;
65-
--typography-size-h1: 32px;
66-
--typography-size-h2: 24px;
67-
--typography-size-h3: 21px;
68-
--typography-size-h4: 18px;
69-
--typography-size-h5: 14px;
70-
--typography-size-h6: 12px;
65+
--typography-h1-size: 32px;
66+
--typography-h2-size: 24px;
67+
--typography-h3-size: 21px;
68+
--typography-h4-size: 18px;
69+
--typography-h5-size: 14px;
70+
--typography-h6-size: 12px;
7171
--typography-paragraph-size: 16px;
7272
}
7373

sass/views/_comments.scss

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

4040
.comment-author {
4141
color: var(--color-comment-author-text);
42-
font-size: var(--typography-size-h4);
42+
font-size: var(--typography-h4-size);
4343
margin-bottom: 1rem;
4444
margin-top: 0;
4545
padding: 0;

sass/views/_search.scss

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

3838
h3 {
39-
font-size: var(--typography-size-h4);
39+
font-size: var(--typography-h4-size);
4040
margin-bottom: 1rem;
4141
}
4242

0 commit comments

Comments
 (0)