Skip to content

Commit a721991

Browse files
BrahimMahadiGarneauma
authored andcommitted
Theme page heading fix
1 parent 62f2f34 commit a721991

35 files changed

Lines changed: 1092 additions & 378 deletions

Gruntfile.coffee

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ module.exports = (grunt) ->
11311131
"!Gemfile.lock"
11321132

11331133
# Web contents
1134-
"!{sites,common,components,templates,design-patterns,wet-boew}/**/*.md"
1134+
"!{_site,sites,common,components,templates,design-patterns,wet-boew}/**/*.md"
11351135
# "{sites,components,templatesdesign-patterns}/*/*.{md,html}"
11361136
# "{sites,components,templatesdesign-patterns}/*.{md, html}"
11371137
# "!{sites,components,templatesdesign-patterns}/*/**/*.{md,html}"
@@ -1176,6 +1176,7 @@ module.exports = (grunt) ->
11761176
'!_site/**/*.md'
11771177
'!_wetboew-demos/**/*.md',
11781178
'!~sites/**/*.md'
1179+
'!_site/**/*.md'
11791180
]
11801181

11811182
require( "load-grunt-tasks" )( grunt )

_data/components.json

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,7 +2077,7 @@
20772077
"en": "Features top tasks related to the page it is on.",
20782078
"fr": "Comprend des tâches principales liées à la page sur laquelle elles se trouvent."
20792079
},
2080-
"modified": "2025-10-31",
2080+
"modified": "2026-06-04",
20812081
"componentName": "gc-most-requested",
20822082
"status": "stable",
20832083
"version": "1.3",
@@ -2208,7 +2208,7 @@
22082208
"en": "https://design.canada.ca/common-design-patterns/most-requested.html",
22092209
"fr": "https://conception.canada.ca/configurations-conception-communes/en-demande.html"
22102210
},
2211-
"iteration": "_:iteration_mostrequested_4",
2211+
"iteration": "_:iteration_mostrequested_highlight_1",
22122212
"example": [
22132213
{
22142214
"en": { "href": "gc-most-requested-highlight-en.html", "text": "Most requested with highlight" },
@@ -2220,8 +2220,8 @@
22202220
],
22212221
"history": [
22222222
{
2223-
"en": "November 2025 - Initial implementation of the variation.",
2224-
"fr": "Novembre 2025 - Implémentation initiale de la variante."
2223+
"en": "June 2026 - Initial implementation of the variation.",
2224+
"fr": "Juin 2026 - Implémentation initiale de la variante."
22252225
}
22262226
]
22272227
}
@@ -2288,7 +2288,7 @@
22882288
"en": [
22892289
"Refer to the code sample below.",
22902290
"The component cannot be located inside another element with the class <code>container</code>.",
2291-
"This variation must be directly followed be the default variation of the Most requested component. It cannot be implemented on its own."
2291+
"This variation must be directly followed by the default variation of the Most requested component. It cannot be implemented on its own."
22922292
],
22932293
"fr": [
22942294
"Référez-vous au code qui suit.",
@@ -2318,8 +2318,8 @@
23182318
{
23192319
"@id": "_:iteration_mostrequested_highlight_1",
23202320
"name": "Most requested with highlight - Iteration 1",
2321-
"date": "2025-11",
2322-
"detectableBy": ".gc-most-requested.highlight",
2321+
"date": "2026-06",
2322+
"detectableBy": ".gc-most-requested+.gc-most-requested",
23232323
"assets": [
23242324
{
23252325
"@type": "source-code",
@@ -2471,10 +2471,10 @@
24712471
"en": "Used to present sets of links with accompanying descriptions.",
24722472
"fr": "Utilisé pour présenter des ensembles de liens accompagnés de descriptions."
24732473
},
2474-
"modified": "2026-02-17",
2474+
"modified": "2026-06-04",
24752475
"componentName": "gc-srvinfo",
24762476
"status": "stable",
2477-
"version": "3.3",
2477+
"version": "3.4",
24782478
"pages": {
24792479
"examples": [
24802480
{
@@ -2488,14 +2488,24 @@
24882488
"path": "gc-srvinfo-fr.html"
24892489
},
24902490
{
2491-
"title": "Services and information with FieldFlow - Working examples",
2491+
"title": "Services and information with FieldFlow",
24922492
"language": "en",
24932493
"path": "gc-srvinfo-fieldflow-en.html"
24942494
},
24952495
{
2496-
"title": "Services et renseignements avec FieldFlow - Exemples pratiques",
2496+
"title": "Services et renseignements avec FieldFlow",
24972497
"language": "fr",
24982498
"path": "gc-srvinfo-fieldflow-fr.html"
2499+
},
2500+
{
2501+
"title": "Services and information with more information",
2502+
"language": "en",
2503+
"path": "gc-srvinfo-more-info-en.html"
2504+
},
2505+
{
2506+
"title": "Services et renseignements avec plus d'informations",
2507+
"language": "fr",
2508+
"path": "gc-srvinfo-more-info-fr.html"
24992509
}
25002510
],
25012511
"reports": [
@@ -2539,7 +2549,7 @@
25392549
"en": "https://design.canada.ca/common-design-patterns/services-information.html",
25402550
"fr": "https://conception.canada.ca/configurations-conception-communes/services-renseignements.html"
25412551
},
2542-
"iteration": "_:iteration_srvinfo_6",
2552+
"iteration": "_:iteration_srvinfo_8",
25432553
"example": [
25442554
{
25452555
"en": { "href": "gc-srvinfo-en.html", "text": "Services and information" },
@@ -2559,8 +2569,12 @@
25592569
],
25602570
"history": [
25612571
{
2562-
"en": "December 2025 - Added new pattern with more information block.",
2563-
"fr": "Décembre 2025 - Ajout d'un nouveau modèle avec un bloc d'informations complémentaires."
2572+
"en": "June 2026 - Added new pattern with more information block.",
2573+
"fr": "Juin 2026 - Ajout d'un nouveau modèle avec un bloc d'informations complémentaires."
2574+
},
2575+
{
2576+
"en": "February 2026 - Limited width of single column pattern.",
2577+
"fr": "Février 2026 - Limitation de la largeur du modèle à une seule colonne."
25642578
},
25652579
{
25662580
"en": "July 2025 - Added new pattern with FieldFlow drop-down list.",
@@ -2596,7 +2610,7 @@
25962610
"implementation": [
25972611
{
25982612
"@id": "_:implement_srvinfo",
2599-
"iteration": "_:iteration_srvinfo_6",
2613+
"iteration": "_:iteration_srvinfo_8",
26002614
"name": {
26012615
"en": "Standard",
26022616
"fr": "Standard"
@@ -2659,11 +2673,11 @@
26592673
],
26602674
"iteration": [
26612675
{
2662-
"@id": "_:iteration_srvinfo_7",
2663-
"name": "Services and information - Iteration 7 (More information)",
2664-
"date": "2025-07",
2676+
"@id": "_:iteration_srvinfo_8",
2677+
"name": "Services and information - Iteration 8 (More information)",
2678+
"date": "2026-06",
26652679
"detectableBy": ".gc-srvinfo .well",
2666-
"predecessor": "_:iteration_srvinfo_6",
2680+
"predecessor": "_:iteration_srvinfo_7",
26672681
"additions": [
26682682
"Added new pattern with more information block."
26692683
],
@@ -2672,10 +2686,19 @@
26722686
"@type": "source-code",
26732687
"@language": "en",
26742688
"description": "Code sample",
2675-
"code": "<section class=\"gc-srvinfo\">\n\t<h2>Services and information</h2>\n\t<div class=\"wb-eqht row\">\n\t\t<div class=\"col-md-6 col-lg-4\">\n\t\t\t<h3><a href=\"#\">[Hyperlink text]</a></h3>\n\t\t\t<p>Use action verbs, or simply list keywords to summarize the information or tasks that can be accomplished on the page it links to</p>\n\t\t</div>\n\t\t<div class=\"col-md-6 col-lg-4\">\n\t\t\t<h3><a href=\"#\">[Hyperlink text]</a></h3>\n\t\t\t<p>Use action verbs, or simply list keywords to summarize the information or tasks that can be accomplished on the page it links to</p>\n\t\t</div>\n\t\t<div class=\"col-md-6 col-lg-4\">\n\t\t\t<h3><a href=\"#\">[Hyperlink text]</a></h3>\n\t\t\t<p>Use action verbs, or simply list keywords to summarize the information or tasks that can be accomplished on the page it links to</p>\n\t\t</div>\n\t</div>\n</section>\n\t<div class=\"well\">\n\t\t<h3>[More information title]</h3>\n\t\t<p>[Additional information related to the services and information presented above]</p>\n\t</div>"
2689+
"code": "<section class=\"gc-srvinfo\">\n\t<h2>Services and information</h2>\n\t<div class=\"wb-eqht row\">\n\t\t<div class=\"col-md-6 col-lg-4\">\n\t\t\t<h3><a href=\"#\">[Hyperlink text]</a></h3>\n\t\t\t<p>Use action verbs, or simply list keywords to summarize the information or tasks that can be accomplished on the page it links to</p>\n\t\t</div>\n\t\t<div class=\"col-md-6 col-lg-4\">\n\t\t\t<h3><a href=\"#\">[Hyperlink text]</a></h3>\n\t\t\t<p>Use action verbs, or simply list keywords to summarize the information or tasks that can be accomplished on the page it links to</p>\n\t\t</div>\n\t\t<div class=\"col-md-6 col-lg-4\">\n\t\t\t<h3><a href=\"#\">[Hyperlink text]</a></h3>\n\t\t\t<p>Use action verbs, or simply list keywords to summarize the information or tasks that can be accomplished on the page it links to</p>\n\t\t</div>\n\t</div>\n\t<div class=\"well\">\n\t\t<h3>[More information title]</h3>\n\t\t<p>[Additional information related to the services and information presented above]</p>\n\t</div>\n</section>"
26762690
}
26772691
]
26782692
},
2693+
{
2694+
"@id": "_:iteration_srvinfo_7",
2695+
"name": "Services and information - Iteration 7",
2696+
"date": "2026-02",
2697+
"detectableBy": ".gc-srvinfo",
2698+
"predecessor": "_:iteration_srvinfo_6",
2699+
"successor": "_:iteration_srvinfo_8",
2700+
"additions": ["Added the CSS class .cnt-wdth-lmtd to the body element to limit the width of the single-column pattern"]
2701+
},
26792702
{
26802703
"@id": "_:iteration_srvinfo_6",
26812704
"name": "Services and information - Iteration 6 (FieldFlow)",
@@ -2695,14 +2718,6 @@
26952718
}
26962719
]
26972720
},
2698-
{
2699-
"@id": "_:iteration_srvinfo_6",
2700-
"name": "Services and information - Iteration 6",
2701-
"date": "2026-02",
2702-
"detectableBy": ".gc-srvinfo",
2703-
"predecessor": "_:iteration_srvinfo_5",
2704-
"additions": ["Added the CSS class .cnt-wdth-lmtd to the body element to limit the width of the single-column pattern"]
2705-
},
27062721
{
27072722
"@id": "_:iteration_srvinfo_5",
27082723
"name": "Services and information - Iteration 5",

_data/templates.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,7 +2000,7 @@
20002000
"en": "Theme page template",
20012001
"fr": "Gabarit de page thème"
20022002
},
2003-
"modified": "2025-11-19",
2003+
"modified": "2026-06-04",
20042004
"componentName": "theme",
20052005
"status": "stable",
20062006
"version": "2.0.3",
@@ -2035,6 +2035,11 @@
20352035
"title": "Page de thème personnalisée pour IRCC",
20362036
"language": "fr",
20372037
"path": "theme-ircc-fr.html"
2038+
},
2039+
{
2040+
"title": "AEM Authoring",
2041+
"language": "en",
2042+
"path": "theme-aem-authoring.html"
20382043
}
20392044
],
20402045
"docs": [
@@ -2119,8 +2124,8 @@
21192124
],
21202125
"history": [
21212126
{
2122-
"en": "November 2025 - Added Featured link and Context-specific features components support. Added custom working example for Immigration and Citizenship.",
2123-
"fr": "Novembre 2025 - Ajout du support pour les composantes Lien en vedette et Promotions contextuelles. Ajout d'un exemple pratique personnalisé pour Immigration et Citoyenneté."
2127+
"en": "June 2025 - Added Featured link and Context-specific features components support. Added custom working example for Immigration and Citizenship.",
2128+
"fr": "Juin 2025 - Ajout du support pour les composantes Lien en vedette et Promotions contextuelles. Ajout d'un exemple pratique personnalisé pour Immigration et Citoyenneté."
21242129
},
21252130
{
21262131
"en": "July 2025 - Minor adjustments for other environments compatibility and addition of wb-navcurrent.",
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<nav id="theme-nav" aria-labelledby="themesMenu">
2+
<div class="container">
3+
<h2 id="themesMenu" class="wb-inv">Themes menu</h2>
4+
<a class="wb-sl" href="#wb-cont">Skip themes menu and go to main content</a>
5+
<button id="menu-btn" class="btn btn-primary"><span class="wb-inv">Toggle </span>Menu<span aria-hidden="true" class="glyphicon glyphicon-chevron-down"></span></button>
6+
<ul class="list-unstyled">
7+
<li><a href="theme-en.html">Jobs</a></li>
8+
<li><a href="theme-ircc-en.html">Immigration and citizenship</a></li>
9+
<li><a href="https://travel.gc.ca/">Travel and tourism</a></li>
10+
<li><a href="theme-business-en.html">Business</a></li>
11+
<li><a href="#">Benefits</a></li>
12+
<li><a href="#">Health</a></li>
13+
<li><a href="#">Taxes</a></li>
14+
<li><a href="#">Environment and natural resources</a></li>
15+
<li><a href="#">National security and defence</a></li>
16+
<li><a href="#">Culture, history and sport</a></li>
17+
<li><a href="#">Policing, justice and emergencies</a></li>
18+
<li><a href="#">Transport and infrastructure</a></li>
19+
<li><a href="#">Canada and the world</a></li>
20+
<li><a href="#">Money and finances</a></li>
21+
<li><a href="#">Science and innovation</a></li>
22+
<li><a href="#">Indigenous Peoples</a></li>
23+
<li><a href="#">Veterans and military</a></li>
24+
<li><a href="#">Youth</a></li>
25+
<li><a href="#">Manage life events</a></li>
26+
</ul>
27+
</div>
28+
</nav>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<nav id="theme-nav" aria-labelledby="themesMenu">
2+
<div class="container">
3+
<h2 id="themesMenu" class="wb-inv">Menu de thèmes</h2>
4+
<a class="wb-sl" href="#wb-cont">Passer la navigation de thèmes et sauter au contenu principal</a>
5+
<button id="menu-btn" class="btn btn-primary"><span class="wb-inv">Basculer le </span>Menu<span aria-hidden="true" class="glyphicon glyphicon-chevron-down"></span></button>
6+
<ul class="list-unstyled">
7+
<li><a href="theme-fr.html">Emplois</a></li>
8+
<li><a href="theme-ircc-fr.html">Immigration et citoyenneté</a></li>
9+
<li><a href="https://travel.gc.ca/">Voyage et tourisme</a></li>
10+
<li><a href="theme-business-fr.html">Entreprises</a></li>
11+
<li><a href="#">Prestations</a></li>
12+
<li><a href="#">Santé</a></li>
13+
<li><a href="#">Impôts</a></li>
14+
<li><a href="#">Environnement et ressources naturelles</a></li>
15+
<li><a href="#">Sécurité nationale et défense</a></li>
16+
<li><a href="#">Culture, histoire et sport</a></li>
17+
<li><a href="#">Services de police, justice et urgences</a></li>
18+
<li><a href="#">Transport et infrastructure</a></li>
19+
<li><a href="#">Canada et le monde</a></li>
20+
<li><a href="#">Argent et finances</a></li>
21+
<li><a href="#">Science et innovation</a></li>
22+
<li><a href="#">Autochtones</a></li>
23+
<li><a href="#">Vétérans et militaires</a></li>
24+
<li><a href="#">Jeunesse</a></li>
25+
<li><a href="#">Gérer les événements de la vie</a></li>
26+
</ul>
27+
</div>
28+
</nav>

components/gc-most-requested/_base.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
}
2929
}
3030

31-
// Styles to slightly break the layout for bad implementation
32-
.container .gc-most-requested {
31+
// Styles to slightly break the layout for bad implementation. Styles to be used for the AEM authoring theme page.
32+
// To validate once implemented in MWS
33+
.container:not(.responsivegrid) .gc-most-requested {
3334
background: transparent;
3435
}
3536

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
}
4545
}
4646

47-
// Styles to slightly break the layout for bad implementation
48-
.container .gc-most-requested {
47+
// Styles to slightly break the layout for bad implementation. Styles to be used for the AEM authoring theme page.
48+
// To validate once implemented in MWS
49+
.container:not(.responsivegrid) .gc-most-requested {
4950
h2 {
5051
float: none;
5152
}

components/gc-most-requested/gc-most-requested-highlight-en.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
{
33
"altLangPage": "gc-most-requested-highlight-fr.html",
4-
"dateModified": "2025-05-08",
5-
"description": "Working examples for the Highlight variant of the Most requested component.",
4+
"dateModified": "2026-06-04",
5+
"description": "Working example for the Highlight variant of the Most requested component.",
66
"language": "en",
77
"title": "Most requested with highlight",
88
"breadcrumbs": [

components/gc-most-requested/gc-most-requested-highlight-fr.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
{
33
"altLangPage": "gc-most-requested-highlight-en.html",
4-
"dateModified": "2025-05-08",
4+
"dateModified": "2026-06-04",
55
"description": "Exemple pratique pour la variation En demande avec mise en évidence de la composante En demande",
66
"language": "fr",
77
"title": "En demande avec mise en évidence",

components/gc-most-requested/index.json-ld

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"en": "Features top tasks related to the page it is on.",
1515
"fr": "Comprend des tâches principales liées à la page sur laquelle elles se trouvent."
1616
},
17-
"modified": "2025-10-31",
17+
"modified": "2026-06-04",
1818
"componentName": "gc-most-requested",
1919
"status": "stable",
2020
"version": "1.3",
@@ -145,7 +145,7 @@
145145
"en": "https://design.canada.ca/common-design-patterns/most-requested.html",
146146
"fr": "https://conception.canada.ca/configurations-conception-communes/en-demande.html"
147147
},
148-
"iteration": "_:iteration_mostrequested_4",
148+
"iteration": "_:iteration_mostrequested_highlight_1",
149149
"example": [
150150
{
151151
"en": { "href": "gc-most-requested-highlight-en.html", "text": "Most requested with highlight" },
@@ -157,8 +157,8 @@
157157
],
158158
"history": [
159159
{
160-
"en": "November 2025 - Initial implementation of the variation.",
161-
"fr": "Novembre 2025 - Implémentation initiale de la variante."
160+
"en": "June 2026 - Initial implementation of the variation.",
161+
"fr": "Juin 2026 - Implémentation initiale de la variante."
162162
}
163163
]
164164
}
@@ -225,7 +225,7 @@
225225
"en": [
226226
"Refer to the code sample below.",
227227
"The component cannot be located inside another element with the class <code>container</code>.",
228-
"This variation must be directly followed be the default variation of the Most requested component. It cannot be implemented on its own."
228+
"This variation must be directly followed by the default variation of the Most requested component. It cannot be implemented on its own."
229229
],
230230
"fr": [
231231
"Référez-vous au code qui suit.",
@@ -255,8 +255,8 @@
255255
{
256256
"@id": "_:iteration_mostrequested_highlight_1",
257257
"name": "Most requested with highlight - Iteration 1",
258-
"date": "2025-11",
259-
"detectableBy": ".gc-most-requested.highlight",
258+
"date": "2026-06",
259+
"detectableBy": ".gc-most-requested+.gc-most-requested",
260260
"assets": [
261261
{
262262
"@type": "source-code",

0 commit comments

Comments
 (0)