Skip to content

Commit 511a61d

Browse files
BrahimMahadiGarneauma
BrahimMahadi
authored and
Garneauma
committed
Theme page heading fix
1 parent d223855 commit 511a61d

28 files changed

+1057
-253
lines changed

‎Gruntfile.coffee‎

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

11301130
# Web contents
1131-
"!{sites,common,components,templates,design-patterns,wet-boew}/**/*.md"
1131+
"!{_site,sites,common,components,templates,design-patterns,wet-boew}/**/*.md"
11321132
# "{sites,components,templatesdesign-patterns}/*/*.{md,html}"
11331133
# "{sites,components,templatesdesign-patterns}/*.{md, html}"
11341134
# "!{sites,components,templatesdesign-patterns}/*/**/*.{md,html}"
@@ -1172,6 +1172,7 @@ module.exports = (grunt) ->
11721172
'!node_modules/**/*.md'
11731173
'!_wetboew-demos/**/*.md',
11741174
'!~sites/**/*.md'
1175+
'!_site/**/*.md'
11751176
]
11761177

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

‎_data/components.json‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,7 +2453,7 @@
24532453
"modified": "2026-02-17",
24542454
"componentName": "gc-srvinfo",
24552455
"status": "stable",
2456-
"version": "3.3",
2456+
"version": "3.4",
24572457
"pages": {
24582458
"examples": [
24592459
{
@@ -2518,7 +2518,7 @@
25182518
"en": "https://design.canada.ca/common-design-patterns/services-information.html",
25192519
"fr": "https://conception.canada.ca/configurations-conception-communes/services-renseignements.html"
25202520
},
2521-
"iteration": "_:iteration_srvinfo_6",
2521+
"iteration": "_:iteration_srvinfo_8",
25222522
"example": [
25232523
{
25242524
"en": { "href": "gc-srvinfo-en.html", "text": "Services and information" },
@@ -2538,8 +2538,12 @@
25382538
],
25392539
"history": [
25402540
{
2541-
"en": "December 2025 - Added new pattern with more information block.",
2542-
"fr": "Décembre 2025 - Ajout d'un nouveau modèle avec un bloc d'informations complémentaires."
2541+
"en": "March 2026 - Added new pattern with more information block.",
2542+
"fr": "Mars 2026 - Ajout d'un nouveau modèle avec un bloc d'informations complémentaires."
2543+
},
2544+
{
2545+
"en": "February 2026 - Limited width of single column pattern.",
2546+
"fr": "Février 2026 - Limitation de la largeur du modèle à une seule colonne."
25432547
},
25442548
{
25452549
"en": "July 2025 - Added new pattern with FieldFlow drop-down list.",
@@ -2575,7 +2579,7 @@
25752579
"implementation": [
25762580
{
25772581
"@id": "_:implement_srvinfo",
2578-
"iteration": "_:iteration_srvinfo_6",
2582+
"iteration": "_:iteration_srvinfo_8",
25792583
"name": {
25802584
"en": "Standard",
25812585
"fr": "Standard"
@@ -2638,11 +2642,11 @@
26382642
],
26392643
"iteration": [
26402644
{
2641-
"@id": "_:iteration_srvinfo_7",
2642-
"name": "Services and information - Iteration 7 (More information)",
2643-
"date": "2025-07",
2645+
"@id": "_:iteration_srvinfo_8",
2646+
"name": "Services and information - Iteration 8 (More information)",
2647+
"date": "2026-03",
26442648
"detectableBy": ".gc-srvinfo .well",
2645-
"predecessor": "_:iteration_srvinfo_6",
2649+
"predecessor": "_:iteration_srvinfo_7",
26462650
"additions": [
26472651
"Added new pattern with more information block."
26482652
],
@@ -2651,10 +2655,19 @@
26512655
"@type": "source-code",
26522656
"@language": "en",
26532657
"description": "Code sample",
2654-
"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>"
2658+
"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>"
26552659
}
26562660
]
26572661
},
2662+
{
2663+
"@id": "_:iteration_srvinfo_7",
2664+
"name": "Services and information - Iteration 7",
2665+
"date": "2026-02",
2666+
"detectableBy": ".gc-srvinfo",
2667+
"predecessor": "_:iteration_srvinfo_6",
2668+
"successor": "_:iteration_srvinfo_8",
2669+
"additions": ["Added the CSS class .cnt-wdth-lmtd to the body element to limit the width of the single-column pattern"]
2670+
},
26582671
{
26592672
"@id": "_:iteration_srvinfo_6",
26602673
"name": "Services and information - Iteration 6 (FieldFlow)",
@@ -2674,14 +2687,6 @@
26742687
}
26752688
]
26762689
},
2677-
{
2678-
"@id": "_:iteration_srvinfo_6",
2679-
"name": "Services and information - Iteration 6",
2680-
"date": "2026-02",
2681-
"detectableBy": ".gc-srvinfo",
2682-
"predecessor": "_:iteration_srvinfo_5",
2683-
"additions": ["Added the CSS class .cnt-wdth-lmtd to the body element to limit the width of the single-column pattern"]
2684-
},
26852690
{
26862691
"@id": "_:iteration_srvinfo_5",
26872692
"name": "Services and information - Iteration 5",

‎_data/templates.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,6 +1989,11 @@
19891989
"title": "Page de thème personnalisée pour IRCC",
19901990
"language": "fr",
19911991
"path": "theme-ircc-fr.html"
1992+
},
1993+
{
1994+
"title": "AEM Authoring",
1995+
"language": "en",
1996+
"path": "theme-aem-authoring.html"
19921997
}
19931998
],
19941999
"docs": [

‎_includes/templates/theme/theme-nav-en.html‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<nav id="theme-nav">
2+
<div class="container">
3+
<h2 class="wb-inv">Themes menu</h2>
4+
<a class="wb-sl" href="#wb-cont">Skip left 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>

‎_includes/templates/theme/theme-nav-fr.html‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<nav id="theme-nav">
2+
<div class="container">
3+
<h2 class="wb-inv">Menu de thèmes</h2>
4+
<a class="wb-sl" href="#wb-cont">Passer la navigation à gauche 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
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+
.container:not(.responsivegrid) .gc-most-requested {
3333
background: transparent;
3434
}
3535

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
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+
.container:not(.responsivegrid) .gc-most-requested {
4949
h2 {
5050
float: none;
5151
}

‎components/gc-srvinfo/index.json-ld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"modified": "2026-02-17",
1818
"componentName": "gc-srvinfo",
1919
"status": "stable",
20-
"version": "3.3",
20+
"version": "3.4",
2121
"pages": {
2222
"examples": [
2323
{

‎eslint.config.mjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export default defineConfig( [ globalIgnores( [
2222
"**/_wetboew-demos/",
2323
"**/~jekyll-dist/",
2424
"**/~sites/*",
25+
"**/_site/*",
2526
"components/wb-chtwzrd/chatwizard.js"
2627
] ), {
2728
extends: compat.extends( "eslint:recommended", "jquery" ),

‎stylelint.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ module.exports = {
136136
"méli-mélo/deprecated/**",
137137
"node_modules/**",
138138
"~sites/**",
139+
"_site/**",
139140
"dist/**"
140141
]
141142
};

0 commit comments

Comments
 (0)