Skip to content

Commit ccf0259

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

19 files changed

+1022
-60
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": [

‎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: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
main {
7474
h1#wb-cont {
7575
border: none;
76-
font-size: 1.625rem;
76+
font-size: 1.81rem;
7777
line-height: 1.1;
7878
margin: 10px 0 11.5px;
7979
}
@@ -100,7 +100,7 @@
100100
background-color: #fff;
101101
border-radius: 0;
102102
margin-top: 2rem;
103-
padding: 1rem 1.5rem;
103+
padding: 1.25rem 1.5rem 1.5rem;
104104
position: relative;
105105

106106
h3 {
@@ -117,5 +117,11 @@
117117
}
118118
}
119119
}
120+
121+
.gc-features {
122+
h2 {
123+
font-size: 1.625rem;
124+
}
125+
}
120126
}
121127
}

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

‎templates/theme/aem-authoring.css‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
.main-container.container-base.container.responsivegrid {
2+
margin: 0 !important;
3+
padding: 0 !important;
4+
}
5+
6+
/* Remove container styles when the container is not a grid column or a wrap-container */
7+
div:not(.wrap-container).wcontainer.container.responsivegrid:not([class*="aem-GridColumn--offset--xs-"]):not([class*="aem-GridColumn--offset--sm-"]):not([class*="aem-GridColumn--offset--md-"]):not([class*="aem-GridColumn--offset--lg-"]) {
8+
margin-left: 0 !important;
9+
margin-right: 0 !important;
10+
padding-left: 0 !important;
11+
padding-right: 0 !important;
12+
width: auto !important;
13+
}
14+
15+
.wcontainer.container.responsivegrid .aem-GridColumn:not(.wrap-container).aem-GridColumn--xs--none,
16+
.wcontainer.container.responsivegrid .aem-GridColumn:not(.wrap-container).aem-GridColumn--offset--xs--0,
17+
.wcontainer.container.responsivegrid .aem-GridColumn:not(.wrap-container).aem-GridColumn--xs--12,
18+
.wcontainer.container.responsivegrid .aem-GridColumn:not(.wrap-container) .cq-Editable-dom .cq-Editable-dom--container {
19+
padding: 0 !important;
20+
}
21+
22+
.wcontainer.container.responsivegrid .aem-GridColumn:not(.wrap-container)[class*="aem-GridColumn--default--"] {
23+
padding: 0 !important;
24+
}
25+
26+
.wrap-container.container.aem-GridColumn--default--12 {
27+
float: none !important;
28+
}
29+
30+
.wrap-container.container {
31+
margin: 0 auto;
32+
padding: 0 15px;
33+
}
34+
35+
.wrap-container.container:before,
36+
.wrap-container.container:after,
37+
.wrap-container .container-fluid:before,
38+
.wrap-container .container-fluid:after {
39+
content: "";
40+
display: table;
41+
}
42+
43+
.wrap-container.container:after,
44+
.wrap-container .container-fluid:after {
45+
clear: both;
46+
}
47+
48+
@media (min-width: 768px) {
49+
.wrap-container.container {
50+
width: 750px !important;
51+
}
52+
}
53+
54+
@media (min-width: 992px) {
55+
.wrap-container.container {
56+
width: 970px !important;
57+
}
58+
}
59+
60+
@media (min-width: 1200px) {
61+
.wrap-container.container {
62+
width: 1170px !important;
63+
}
64+
}
65+
66+
.wrap-container .container-fluid {
67+
margin: 0 auto;
68+
padding: 0 15px;
69+
}
70+
71+
.xf-content-height {
72+
margin: 0 !important;
73+
}

‎templates/theme/demo/demo.css‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.page-type-theme {
2+
.wb-dismissable-container {
3+
background: transparent;
4+
margin: 0;
5+
padding: 0;
6+
}
7+
}

0 commit comments

Comments
 (0)