Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions _data/sites.json
Original file line number Diff line number Diff line change
Expand Up @@ -1020,6 +1020,16 @@
"title": "Évaluation de l'accessibilité #2 - Test d'utilisabilité de l'ARC",
"language": "fr",
"path": "reports/a11y-3-fr.html"
},
{
"title": "Accessibility assessment #3 - Page feedback tool",
"language": "en",
"path": "reports/a11y-4-en.html"
},
{
"title": "Évaluation de l'accessibilité #3 - Outil de rétroaction sur la page",
"language": "fr",
"path": "reports/a11y-4-fr.html"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion _data/templates.json
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@
"en": "News templates samples",
"fr": "Exemple de page générique."
},
"modified": "2025-02-21",
"modified": "2025-04-16",
"componentName": "news",
"status": "stable",
"pages": {
Expand Down
2 changes: 1 addition & 1 deletion common/list/_lists.scss
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ div.list-advanced.square>ul, ul.square {

ul.compact {
li {
font-size: $small-size;
font-size: 17px;
line-height: 1.5em;
}
}
75 changes: 75 additions & 0 deletions common/scaffolding/_base.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
*
*
* @title: Scaffolding
*
*/


/* Headings */

h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6
{
@include defaults-alternative-font-family();
font-variant-ligatures: no-common-ligatures;
font-weight: $bold-weight;
}

.h3,
.h4,
.h5,
.h6 {
border: 0;
}

h1, .h1 {
line-height: 1.17;
margin-bottom: .2em;
margin-top: 1em;
padding-bottom: 4px;
}

h2, .h2 {
line-height: 1.23;
}

h3, .h3 {
line-height: 1.37;
}

h4, .h4, h5, .h5 {
line-height: 1.33;
}

h6, .h6 {
line-height: 1.45;
}


/* Forms */

// scss-lint:disable QualifyingElement
input[placeholder],
[placeholder],
*[placeholder] {
color: $input-color-placeholder;
}

legend {
font-size: 1.2em;
line-height: 1.65em;
}

/* Other */

output {
font-size: 1em;
}

pre {
font-size: 1rem;
}

blockquote {
font-size: 1em;
}
48 changes: 48 additions & 0 deletions common/scaffolding/_screen-sm-max.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
*
* Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
* wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html
*
* @title: Scaffolding - Small view and under (screen only)
* @desc: Variable $screen-sm-max <= 991 px
*
*/


// Heading font-sizes
h1,
.h1 {
font-size: 2.3125rem; // expected 37px;
line-height: 1.19;
margin-top: 1.265rem; // expected ~26px;
}

h2,
.h2 {
font-size: 2.1875rem; // expected 35px;
line-height: 1.25;
}

h3,
.h3 {
font-size: 1.625rem; // expected 26px;
line-height: 1.23;
}

h4,
.h4 {
font-size: 1.375rem; // expected 22px;
line-height: 1.33;
}

h5,
.h5 {
font-size: 1.25rem; // expected 20px;
line-height: 1.27;
}

h6,
.h6 {
font-size: 1.125rem; // expected 18px;
line-height: 1.40;
}
14 changes: 14 additions & 0 deletions common/scaffolding/_screen-xs-max.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
*
* Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
* wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html
*
* @title: Scaffolding
* @desc: Variable $screen-sm-max <= 767 px
*
*/

main {
font-size: 1.125rem;
line-height: 1.55;
}
4 changes: 4 additions & 0 deletions common/text-level-modifiers/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
.fnt-hdng {
@include defaults-alternative-font-family();
}

.lead {
font-size: 1.2em;
}
14 changes: 11 additions & 3 deletions components/gc-features/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,22 @@
*/

.gc-features {
margin-bottom: $space-md;

@include subcomponent;
h3, h4, h5, h6 {
font-size: $font-size-h5;
margin-bottom: 5px;
margin-top: 23px; // same as h5
}

margin-bottom: $space-md;
p {
font-size: 17px;
line-height: 1.5em;
}

img {
width: 100%;
}
}

.well {
border-radius: 0;
Expand Down
4 changes: 3 additions & 1 deletion components/gc-features/_screen-sm-max.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@
*/

.gc-features {
@include subcomponent-small-devices;
p {
font-size: 17px;
}
}
4 changes: 2 additions & 2 deletions components/gc-most-requested/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
padding: 24px 0 12px;

h2 {
font-size: $font-size-h4;
font-size: 22px;
margin-top: 0;
}

ul {
li {
font-family: "Lato", sans-serif;
font-size: 19px;
font-size: 18px;
font-weight: $bold-weight;
line-height: 1.8em;
}
Expand Down
1 change: 0 additions & 1 deletion components/gc-most-requested/_screen-md-min.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

li {
display: inline-block;
font-size: $small-size;
line-height: 1.25em;
margin-bottom: 10px;
padding-left: 1.15em;
Expand Down
15 changes: 14 additions & 1 deletion components/gc-srvinfo/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,18 @@
*/

.gc-srvinfo, .gc-drmt {
@include subcomponent;
h2 {
font-size: 1.8125rem;
}

h3, h4, h5, h6 {
font-size: 20px;
margin-bottom: 5px;
margin-top: 23px;
}

p {
font-size: 18px;
line-height: 1.5;
}
}
10 changes: 0 additions & 10 deletions components/gc-srvinfo/_screen-sm-max.scss

This file was deleted.

4 changes: 1 addition & 3 deletions components/gc-subway/_screen-md-min.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
}

hgroup {
left: -.5em;
position: absolute;
top: -2em;
margin-left: -14px;

h1 {
clip: rect(1px, 1px, 1px, 1px);
Expand Down
18 changes: 9 additions & 9 deletions sites/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ $wbGray: #e1e4e7;
$button-blue: #284162;
$wbGrayLight: #eaebed;
$accent-blue: #26374a;
$border-red: #af3c43;
$border-red: #a62a1e;
$active-blue: #243850;
$search-gray: #e0e0e0;
$profile-gray: #eaebed;
$gray-light: #6f6f6f; // Light grey colour (Bootstrap override).

// Brand variables - Main page title
$main-page-title-rule-width: 71px;
$main-page-title-rule-thickness: .18em;
$main-page-title-rule-width: 72px;
$main-page-title-rule-thickness: 6px;
$main-page-title-rule-color: $border-red;

// Colours for the alert styles
Expand All @@ -37,12 +37,12 @@ $padding-base-vertical: 10px;
$padding-base-horizontal: 14px;

/* Headings font-sizes */
$font-size-h1: 1.9em; // expected 38px;
$font-size-h2: 1.8em; // expected 36px;
$font-size-h3: 1.2em; // expected 24px;
$font-size-h4: 1.1em; // expected 22px;
$font-size-h5: 1em; // expected 20px;
$font-size-h6: .95em; // expected 19px;
$font-size-h1: 2.5625rem; // expected 41px;
$font-size-h2: 2.4375rem; // expected 39px;
$font-size-h3: 1.8125rem; // expected 29px;
$font-size-h4: 1.6875rem; // expected 27px;
$font-size-h5: 1.5rem; // expected 24px;
$font-size-h6: 1.375rem; // expected 22px;

/* Small font-size */
$small-size: 87%;
Expand Down
14 changes: 2 additions & 12 deletions sites/baseline/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
*
*/

// scss-lint:disable QualifyingElement
input[placeholder],
[placeholder],
*[placeholder] {
color: $input-color-placeholder;
}

// Increase likelihood of side-by-side input/button having same height
.input-group {
.form-control,
Expand All @@ -29,15 +22,12 @@ input[placeholder],
* - Fieldflow is brought to speed with the visual update with a clearly defined temporary class .gc-font-2019, but the class can be tried out on other forms
*/
:not(#wb-srch) form, .checkbox, .checkbox-inline, .radio, .radio-inline, form .btn:not(.btn-call-to-action) {
font-size: 16px;
line-height: 23px;
font-size: 1rem;
line-height: 1.4375;
}
form .btn:not(.btn-call-to-action), .form-control {
padding: 6px 12px;
}
legend {
line-height: 1.65em;
}

// Apply the new font size to form, for early adopter
.gc-font-2019 {
Expand Down
17 changes: 0 additions & 17 deletions sites/baseline/_heading-screen-sm-max.scss

This file was deleted.

Loading