Skip to content

Commit e743d3e

Browse files
GarneaumaGarneauma
committed
Scaffolding: update base elements font-size to match GCDS
1 parent c52e9df commit e743d3e

34 files changed

+284
-202
lines changed

‎_data/templates.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@
10861086
"en": "News templates samples",
10871087
"fr": "Exemple de page générique."
10881088
},
1089-
"modified": "2025-02-21",
1089+
"modified": "2025-04-16",
10901090
"componentName": "news",
10911091
"status": "stable",
10921092
"pages": {

‎common/list/_lists.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ div.list-advanced.square>ul, ul.square {
182182

183183
ul.compact {
184184
li {
185-
font-size: $small-size;
185+
font-size: 17px;
186186
line-height: 1.5em;
187187
}
188188
}

‎common/scaffolding/_base.scss‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/*
2+
*
3+
*
4+
* @title: Scaffolding
5+
*
6+
*/
7+
8+
9+
/* Headings */
10+
11+
h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6
12+
{
13+
@include defaults-alternative-font-family();
14+
font-variant-ligatures: no-common-ligatures;
15+
font-weight: $bold-weight;
16+
}
17+
18+
.h3,
19+
.h4,
20+
.h5,
21+
.h6 {
22+
border: 0;
23+
}
24+
25+
h1, .h1 {
26+
line-height: 1.17;
27+
margin-bottom: .2em;
28+
margin-top: 1em;
29+
padding-bottom: 4px;
30+
}
31+
32+
h2, .h2 {
33+
line-height: 1.23;
34+
}
35+
36+
h3, .h3 {
37+
line-height: 1.37;
38+
}
39+
40+
h4, .h4, h5, .h5 {
41+
line-height: 1.33;
42+
}
43+
44+
h6, .h6 {
45+
line-height: 1.45;
46+
}
47+
48+
49+
/* Forms */
50+
51+
// scss-lint:disable QualifyingElement
52+
input[placeholder],
53+
[placeholder],
54+
*[placeholder] {
55+
color: $input-color-placeholder;
56+
}
57+
58+
legend {
59+
font-size: 1.2em;
60+
line-height: 1.65em;
61+
}
62+
63+
/* Other */
64+
65+
output {
66+
font-size: 1em;
67+
}
68+
69+
pre {
70+
font-size: 1rem;
71+
}
72+
73+
blockquote {
74+
font-size: 1em;
75+
}

‎common/scaffolding/_screen-sm-max.scss‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
*
3+
* Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
4+
* wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html
5+
*
6+
* @title: Scaffolding - Small view and under (screen only)
7+
* @desc: Variable $screen-sm-max <= 991 px
8+
*
9+
*/
10+
11+
12+
// Heading font-sizes
13+
h1,
14+
.h1 {
15+
font-size: 2.3125rem; // expected 37px;
16+
line-height: 1.19;
17+
margin-top: 1.265rem; // expected ~26px;
18+
}
19+
20+
h2,
21+
.h2 {
22+
font-size: 2.1875rem; // expected 35px;
23+
line-height: 1.25;
24+
}
25+
26+
h3,
27+
.h3 {
28+
font-size: 1.625rem; // expected 26px;
29+
line-height: 1.23;
30+
}
31+
32+
h4,
33+
.h4 {
34+
font-size: 1.375rem; // expected 22px;
35+
line-height: 1.33;
36+
}
37+
38+
h5,
39+
.h5 {
40+
font-size: 1.25rem; // expected 20px;
41+
line-height: 1.27;
42+
}
43+
44+
h6,
45+
.h6 {
46+
font-size: 1.125rem; // expected 18px;
47+
line-height: 1.40;
48+
}

‎common/scaffolding/_screen-xs-max.scss‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*
2+
*
3+
* Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
4+
* wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html
5+
*
6+
* @title: Scaffolding
7+
* @desc: Variable $screen-sm-max <= 767 px
8+
*
9+
*/
10+
11+
main {
12+
font-size: 1.125rem;
13+
line-height: 1.55;
14+
}

‎common/text-level-modifiers/_base.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@
88
.fnt-hdng {
99
@include defaults-alternative-font-family();
1010
}
11+
12+
.lead {
13+
font-size: 1.2em;
14+
}

‎components/gc-features/_base.scss‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@
88
*/
99

1010
.gc-features {
11+
margin-bottom: $space-md;
1112

12-
@include subcomponent;
13+
h3, h4, h5, h6 {
14+
font-size: $font-size-h5;
15+
margin-bottom: 5px;
16+
margin-top: 23px; // same as h5
17+
}
1318

14-
margin-bottom: $space-md;
19+
p {
20+
font-size: 17px;
21+
line-height: 1.5em;
22+
}
1523

1624
img {
1725
width: 100%;
18-
}
26+
}
1927

2028
.well {
2129
border-radius: 0;

‎components/gc-features/_screen-sm-max.scss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
*/
66

77
.gc-features {
8-
@include subcomponent-small-devices;
8+
p {
9+
font-size: 17px;
10+
}
911
}

‎components/gc-most-requested/_base.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ div:not(.container) .gc-most-requested {
1010
padding: 24px 0 12px;
1111

1212
h2 {
13-
font-size: $font-size-h4;
13+
font-size: 22px;
1414
margin-top: 0;
1515
}
1616

1717
ul {
1818
li {
1919
font-family: "Lato", sans-serif;
20-
font-size: 19px;
20+
font-size: 18px;
2121
font-weight: $bold-weight;
2222
line-height: 1.8em;
2323
}

‎components/gc-most-requested/_screen-md-min.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ div:not(.container) .gc-most-requested {
1717

1818
li {
1919
flex-basis: 50%;
20-
font-size: $small-size;
2120
padding-right: 1.3em;
2221
}
2322
}

0 commit comments

Comments
 (0)