Skip to content

Commit 6e439ef

Browse files
BrahimMahadiGarneauma
BrahimMahadi
authored and
Garneauma
committed
Theme page heading fix
1 parent 92e9159 commit 6e439ef

24 files changed

+1205
-228
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/templates.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,6 +1995,11 @@
19951995
"title": "Page de thème personnalisée pour IRCC",
19961996
"language": "fr",
19971997
"path": "theme-ircc-fr.html"
1998+
},
1999+
{
2000+
"title": "AEM Authoring",
2001+
"language": "en",
2002+
"path": "theme-aem-authoring.html"
19982003
}
19992004
],
20002005
"docs": [

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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 to main content</a>
5+
<button id="menu-btn" class="btn btn-primary"><span aria-hidden="true" class="glyphicon glyphicon-chevron-left mr-2"></span>Menu</button>
6+
<div id="theme-nav-dialog">
7+
<button class="btn btn-primary btn-block">Close<span class="wb-inv"> menu (escape key)</span></button>
8+
<ul class="list-unstyled">
9+
<li><a href="theme-en.html">Jobs</a></li>
10+
<li><a href="theme-ircc-en.html">Immigration and citizenship</a></li>
11+
<li><a href="https://travel.gc.ca/">Travel and tourism</a></li>
12+
<li><a href="theme-business-en.html">Business</a></li>
13+
<li><a href="#">Benefits</a></li>
14+
<li><a href="#">Health</a></li>
15+
<li><a href="#">Taxes</a></li>
16+
<li><a href="#">Environment and natural resources</a></li>
17+
<li><a href="#">National security and defence</a></li>
18+
<li><a href="#">Culture, history and sport</a></li>
19+
<li><a href="#">Policing, justice and emergencies</a></li>
20+
<li><a href="#">Transport and infrastructure</a></li>
21+
<li><a href="#">Canada and the world</a></li>
22+
<li><a href="#">Money and finances</a></li>
23+
<li><a href="#">Science and innovation</a></li>
24+
<li><a href="#">Indigenous peoples</a></li>
25+
<li><a href="#">Veterans and military</a></li>
26+
<li><a href="#">Youth</a></li>
27+
<li><a href="#">Manage life events</a></li>
28+
</ul>
29+
</div>
30+
</div>
31+
</nav>

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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 au contenu principal</a>
5+
<button id="menu-btn" class="btn btn-primary"><span aria-hidden="true" class="glyphicon glyphicon-chevron-left mr-2"></span>Menu</button>
6+
<div id="theme-nav-dialog">
7+
<button class="btn btn-primary btn-block">Fermer<span class="wb-inv"> le menu (touche d'échappement)</span></button>
8+
<ul class="list-unstyled">
9+
<li><a href="theme-fr.html">Emplois</a></li>
10+
<li><a href="theme-ircc-fr.html">Immigration et citoyenneté</a></li>
11+
<li><a href="https://travel.gc.ca/">Voyage et tourisme</a></li>
12+
<li><a href="theme-business-fr.html">Entreprises</a></li>
13+
<li><a href="#">Prestations</a></li>
14+
<li><a href="#">Santé</a></li>
15+
<li><a href="#">Impôts</a></li>
16+
<li><a href="#">Environnement et ressources naturelles</a></li>
17+
<li><a href="#">Sécurité nationale et défense</a></li>
18+
<li><a href="#">Culture, histoire et sport</a></li>
19+
<li><a href="#">Services de police, justice et urgences</a></li>
20+
<li><a href="#">Transport et infrastructure</a></li>
21+
<li><a href="#">Canada et le monde</a></li>
22+
<li><a href="#">Argent et finances</a></li>
23+
<li><a href="#">Science et innovation</a></li>
24+
<li><a href="#">Autochtones</a></li>
25+
<li><a href="#">Vétérans et militaires</a></li>
26+
<li><a href="#">Jeunesse</a></li>
27+
<li><a href="#">Gérer les événements de la vie</a></li>
28+
</ul>
29+
</div>
30+
</div>
31+
</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
}

‎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
};

‎templates/theme/_base.scss‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
a {
2626
color: $link-color;
2727
display: block;
28-
font-size: 16px;
28+
font-size: 1rem;
2929
line-height: 1.65em;
30-
padding: 10px 14px;
30+
padding: .625rem 1rem;
3131
text-decoration: none;
3232

3333
&:hover {
@@ -49,19 +49,25 @@
4949
}
5050
}
5151

52+
#theme-nav-dialog {
53+
button {
54+
display: none;
55+
}
56+
}
57+
5258
#menu-btn {
5359
border-radius: 0;
5460
display: block;
5561
margin: .25em 0 1em -15px;
5662
text-align: left;
5763
width: calc(100% + 30px);
5864

59-
.glyphicon-chevron-down {
60-
margin-left: 10px;
65+
.glyphicon-chevron-left {
66+
margin-right: 10px;
6167
}
6268

63-
&.expanded .glyphicon-chevron-down {
64-
transform: rotate(180deg) translateY(2px);
69+
&.expanded .glyphicon-chevron-left {
70+
display: none;
6571
}
6672

6773
// Les items du menu sont affichés par défaut en mode basic HTML, donc il n'est pas nécessaire d'afficher le bouton menu car il ne sera pas fonctionnel
@@ -73,7 +79,7 @@
7379
main {
7480
h1#wb-cont {
7581
border: none;
76-
font-size: 1.625rem;
82+
font-size: 1.81rem;
7783
line-height: 1.1;
7884
margin: 10px 0 11.5px;
7985
}
@@ -100,7 +106,7 @@
100106
background-color: #fff;
101107
border-radius: 0;
102108
margin-top: 2rem;
103-
padding: 1rem 1.5rem;
109+
padding: 1.25rem 1.5rem 1.5rem;
104110
position: relative;
105111

106112
h3 {
@@ -117,5 +123,11 @@
117123
}
118124
}
119125
}
126+
127+
.gc-features {
128+
h2 {
129+
font-size: 1.625rem;
130+
}
131+
}
120132
}
121133
}

‎templates/theme/_screen-md-min.scss‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
}
3737
}
3838

39-
> *:last-child {
39+
> *:nth-child(2) {
4040
border-left: 5px solid #26374a;
4141
flex: 1 0 0%;
4242

@@ -62,7 +62,7 @@
6262

6363
main {
6464
h1#wb-cont {
65-
font-size: 1.81rem;
65+
font-size: 2.1875rem;
6666
}
6767

6868
h2 {
@@ -84,5 +84,11 @@
8484
.bg-light {
8585
@include continuous-bg(#f5f5f5);
8686
}
87+
88+
.gc-features {
89+
h2 {
90+
font-size: 1.81rem;
91+
}
92+
}
8793
}
8894
}

0 commit comments

Comments
 (0)