Skip to content

Commit f12f059

Browse files
committed
Scaffolding: update base elements font-size to match GCDS
1 parent 58e9486 commit f12f059

40 files changed

+279
-276
lines changed

_data/common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
"pages": {
206206
"docs": [
207207
{
208-
"title": "Colour (Foreground/Background)",
208+
"title": "Color (Foreground/Background)",
209209
"language": "en",
210210
"path": "colour-en.html"
211211
},

_data/components.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@
564564
"fr": "Mars 2024 - Stabilisation de la composante."
565565
},
566566
{
567-
"en": "August 2023 - Adding possibility to customize the background colour.",
567+
"en": "August 2023 - Adding possibility to customize the background color.",
568568
"fr": "Août 2023 - Ajout de la possibilité de personnaliser la couleur de fond."
569569
},
570570
{
@@ -600,7 +600,7 @@
600600
},
601601
"notes": {
602602
"en": [
603-
"When customizing the background color, the component will automatically apply the correct colour to the text: <code>#FFFFFF</code> for dark colours, <code>#333333</code> for light colours, <code>#000000</code> for colours in-between."
603+
"When customizing the background color, the component will automatically apply the correct color to the text: <code>#FFFFFF</code> for dark colours, <code>#333333</code> for light colours, <code>#000000</code> for colours in-between."
604604
],
605605
"fr": [
606606
"Lorsque la couleur de fond est personnalisée, la composante appliquera automatiquement la bonne couleur au texte : <code>#FFFFFF</code> pour les couleurs sombres, <code>#333333</code> pour les couleurs claires, <code>#000000</code> pour les couleurs intermédiaires."

_data/templates.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"modified": "2025-01-09",
103103
"componentName": "all-services",
104104
"status": "stable",
105-
"version": "1.1",
105+
"version": "1.2",
106106
"pages": {
107107
"examples": [
108108
{
@@ -152,6 +152,10 @@
152152
"_:implement_allservices"
153153
],
154154
"history": [
155+
{
156+
"en": "January 2025 - Adding expand/collapse.",
157+
"fr": "Janvier 2025 - Ajout des accordéons."
158+
},
155159
{
156160
"en": "November 2024 - Initial implementation of the page template.",
157161
"fr": "Novembre 2024 - Implémentation initiale du gabarit de page."
@@ -1086,7 +1090,7 @@
10861090
"en": "News templates samples",
10871091
"fr": "Exemple de page générique."
10881092
},
1089-
"modified": "2025-02-21",
1093+
"modified": "2025-04-16",
10901094
"componentName": "news",
10911095
"status": "stable",
10921096
"pages": {
@@ -1127,11 +1131,11 @@
11271131
},
11281132
"title": {
11291133
"en": "Organizational profile",
1130-
"fr": "Profil organisationnel"
1134+
"fr": "Profil organisationel"
11311135
},
11321136
"description": {
11331137
"en": "Organizational profile templates",
1134-
"fr": "Gabarit à propos de page de profil organisationnel"
1138+
"fr": "Gabarit à propos de page de profil organisationel"
11351139
},
11361140
"modified": "2017-12-05",
11371141
"componentName": "organizational",

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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*
2+
*
3+
*
4+
* @title: Scaffolding
5+
*
6+
*/
7+
8+
output {
9+
font-size: 1em;
10+
}
11+
12+
blockquote {
13+
font-size: 1em;
14+
}

common/scaffolding/text-level-semantics.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,11 @@ <h2>The <code>wbr</code> element</h2>
203203
<pre><code>
204204
www.simply&lt;wbr>orange&lt;wbr>juice.com
205205
</code></pre>
206+
207+
<h2>The <code>blockquote</code> element</h2>
208+
<blockquote>This is a quote</blockquote>
209+
<pre><code>&lt;blockquote>This is a quote&lt;/blockquote></code></pre>
210+
211+
<h2>The <code>output</code> element</h2>
212+
<output>This is an output</output>
213+
<pre><code>&lt;output>This is an output&lt;/output></code></pre>

common/scaffolding/texte-niveau-semantique.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,4 +203,12 @@ <h2>The <code>wbr</code> element</h2>
203203
<pre><code>
204204
www.simply&lt;wbr>orange&lt;wbr>juice.com
205205
</code></pre>
206+
207+
<h2>The <code>blockquote</code> element</h2>
208+
<blockquote>This is a quote</blockquote>
209+
<pre><code>&lt;blockquote>This is a quote&lt;/blockquote></code></pre>
210+
211+
<h2>The <code>output</code> element</h2>
212+
<output>This is an output</output>
213+
<pre><code>&lt;output>This is an output&lt;/output></code></pre>
206214
</div>

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+
}

common/text-level-modifiers/text-level-modifiers-en.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,7 @@ <h4><code>.text-uppercase</code></h4>
112112
<h4><code>.text-capitalize</code></h4>
113113
<p class="text-capitalize">capitalize text.</p>
114114
<pre><code>&lt;p <strong>class=&quot;text-capitalize&quot;</strong>&gt;capitalize text&lt;/p&gt;</code></pre>
115+
116+
<h4><code>.lead</code></h4>
117+
<p class="lead">Enlarge text for leading text. Lorem ipsum dolor sit amet consectetur adipisicing elit. Eius cupiditate doloribus, accusantium dicta doloremque harum fugiat quidem perspiciatis? Mollitia, eligendi?</p>
118+
<pre><code>&lt;p class="lead">Enlarge text for leading text. Lorem ipsum dolor sit amet consectetur adipisicing elit. Eius cupiditate doloribus, accusantium dicta doloremque harum fugiat quidem perspiciatis? Mollitia, eligendi?&lt;/p></code></pre>

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;

0 commit comments

Comments
 (0)