From 239110fafe0c1fc8c559fc60b3b2971f422526d9 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 13 Mar 2025 23:49:55 -0400 Subject: [PATCH 01/20] fix: font-family-name-quotes --- components/gc-most-requested/_base.scss | 2 +- sites/baseline/_font.scss | 16 ++++++++-------- stylelint.config.js | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/components/gc-most-requested/_base.scss b/components/gc-most-requested/_base.scss index b3010ec0c..f451257af 100644 --- a/components/gc-most-requested/_base.scss +++ b/components/gc-most-requested/_base.scss @@ -15,7 +15,7 @@ ul { li { - font-family: "Lato", sans-serif; + font-family: Lato, sans-serif; font-size: 18px; font-weight: $bold-weight; line-height: 1.8em; diff --git a/sites/baseline/_font.scss b/sites/baseline/_font.scss index d07409ffe..2c954819c 100644 --- a/sites/baseline/_font.scss +++ b/sites/baseline/_font.scss @@ -98,7 +98,7 @@ /* latin-ext */ @font-face { font-display: optional; - font-family: "Lato"; + font-family: Lato; font-style: italic; font-weight: 400; src: url(https://fonts.gstatic.com/s/lato/v22/S6u8w4BMUTPHjxsAUi-qJCY.woff2) format("woff2"); @@ -107,7 +107,7 @@ /* latin */ @font-face { font-display: fallback; - font-family: "Lato"; + font-family: Lato; font-style: italic; font-weight: 400; src: url(https://fonts.gstatic.com/s/lato/v22/S6u8w4BMUTPHjxsAXC-q.woff2) format("woff2"); @@ -116,7 +116,7 @@ /* latin-ext */ @font-face { font-display: optional; - font-family: "Lato"; + font-family: Lato; font-style: italic; font-weight: 700; src: url(https://fonts.gstatic.com/s/lato/v22/S6u_w4BMUTPHjxsI5wq_FQft1dw.woff2) format("woff2"); @@ -125,7 +125,7 @@ /* latin */ @font-face { font-display: fallback; - font-family: "Lato"; + font-family: Lato; font-style: italic; font-weight: 700; src: url(https://fonts.gstatic.com/s/lato/v22/S6u_w4BMUTPHjxsI5wq_Gwft.woff2) format("woff2"); @@ -134,7 +134,7 @@ /* latin-ext */ @font-face { font-display: optional; - font-family: "Lato"; + font-family: Lato; font-style: normal; font-weight: 400; src: url(https://fonts.gstatic.com/s/lato/v22/S6uyw4BMUTPHjxAwXjeu.woff2) format("woff2"); @@ -143,7 +143,7 @@ /* latin */ @font-face { font-display: fallback; - font-family: "Lato"; + font-family: Lato; font-style: normal; font-weight: 400; src: url(https://fonts.gstatic.com/s/lato/v22/S6uyw4BMUTPHjx4wXg.woff2) format("woff2"); @@ -152,7 +152,7 @@ /* latin-ext */ @font-face { font-display: optional; - font-family: "Lato"; + font-family: Lato; font-style: normal; font-weight: 700; src: url(https://fonts.gstatic.com/s/lato/v22/S6u9w4BMUTPHh6UVSwaPGR_p.woff2) format("woff2"); @@ -161,7 +161,7 @@ /* latin */ @font-face { font-display: fallback; - font-family: "Lato"; + font-family: Lato; font-style: normal; font-weight: 700; src: url(https://fonts.gstatic.com/s/lato/v22/S6u9w4BMUTPHh6UVSwiPGQ.woff2) format("woff2"); diff --git a/stylelint.config.js b/stylelint.config.js index 0f3a2bdc2..df0b4b9fd 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -107,7 +107,6 @@ module.exports = { "comment-empty-line-before": null, "declaration-block-no-redundant-longhand-properties": null, "declaration-empty-line-before": null, - "font-family-name-quotes": null, "function-url-quotes": null, "hue-degree-notation": null, "keyframes-name-pattern": null, From 857ffafcb8b3c9bbf329059e1a035e1fa1383c95 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 13 Mar 2025 23:51:41 -0400 Subject: [PATCH 02/20] fix: function-url-quotes --- sites/baseline/_font.scss | 32 +++++++++---------- sites/footers/_base.scss | 2 +- stylelint.config.js | 1 - templates/home/_base.scss | 2 +- .../home/_screen-md-min-to-screen-md-max.scss | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/sites/baseline/_font.scss b/sites/baseline/_font.scss index 2c954819c..682a5ed38 100644 --- a/sites/baseline/_font.scss +++ b/sites/baseline/_font.scss @@ -20,7 +20,7 @@ font-family: "Noto Sans"; font-style: italic; font-weight: 400; - src: url(https://fonts.gstatic.com/s/notosans/v25/o-0OIpQlx3QUlC5A4PNr4ARMQ_m87A.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/notosans/v25/o-0OIpQlx3QUlC5A4PNr4ARMQ_m87A.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -29,7 +29,7 @@ font-family: "Noto Sans"; font-style: italic; font-weight: 400; - src: url(https://fonts.gstatic.com/s/notosans/v25/o-0OIpQlx3QUlC5A4PNr4ARCQ_k.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/notosans/v25/o-0OIpQlx3QUlC5A4PNr4ARCQ_k.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* latin-ext */ @@ -38,7 +38,7 @@ font-family: "Noto Sans"; font-style: italic; font-weight: 700; - src: url(https://fonts.gstatic.com/s/notosans/v25/o-0TIpQlx3QUlC5A4PNr4Az5ZuyNzW1aPQ.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/notosans/v25/o-0TIpQlx3QUlC5A4PNr4Az5ZuyNzW1aPQ.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -47,7 +47,7 @@ font-family: "Noto Sans"; font-style: italic; font-weight: 700; - src: url(https://fonts.gstatic.com/s/notosans/v25/o-0TIpQlx3QUlC5A4PNr4Az5ZuyDzW0.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/notosans/v25/o-0TIpQlx3QUlC5A4PNr4Az5ZuyDzW0.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @@ -57,7 +57,7 @@ font-family: "Noto Sans"; font-style: normal; font-weight: 400; - src: url(https://fonts.gstatic.com/s/notosans/v25/o-0IIpQlx3QUlC5A4PNr6zRAW_0.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/notosans/v25/o-0IIpQlx3QUlC5A4PNr6zRAW_0.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -66,7 +66,7 @@ font-family: "Noto Sans"; font-style: normal; font-weight: 400; - src: url(https://fonts.gstatic.com/s/notosans/v25/o-0IIpQlx3QUlC5A4PNr5TRA.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/notosans/v25/o-0IIpQlx3QUlC5A4PNr5TRA.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* latin-ext */ @@ -75,7 +75,7 @@ font-family: "Noto Sans"; font-style: normal; font-weight: 700; - src: url(https://fonts.gstatic.com/s/notosans/v25/o-0NIpQlx3QUlC5A4PNjXhFVatyB1Wk.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/notosans/v25/o-0NIpQlx3QUlC5A4PNjXhFVatyB1Wk.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -84,7 +84,7 @@ font-family: "Noto Sans"; font-style: normal; font-weight: 700; - src: url(https://fonts.gstatic.com/s/notosans/v25/o-0NIpQlx3QUlC5A4PNjXhFVZNyB.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/notosans/v25/o-0NIpQlx3QUlC5A4PNjXhFVZNyB.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @@ -101,7 +101,7 @@ font-family: Lato; font-style: italic; font-weight: 400; - src: url(https://fonts.gstatic.com/s/lato/v22/S6u8w4BMUTPHjxsAUi-qJCY.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/lato/v22/S6u8w4BMUTPHjxsAUi-qJCY.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -110,7 +110,7 @@ font-family: Lato; font-style: italic; font-weight: 400; - src: url(https://fonts.gstatic.com/s/lato/v22/S6u8w4BMUTPHjxsAXC-q.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/lato/v22/S6u8w4BMUTPHjxsAXC-q.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* latin-ext */ @@ -119,7 +119,7 @@ font-family: Lato; font-style: italic; font-weight: 700; - src: url(https://fonts.gstatic.com/s/lato/v22/S6u_w4BMUTPHjxsI5wq_FQft1dw.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/lato/v22/S6u_w4BMUTPHjxsI5wq_FQft1dw.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -128,7 +128,7 @@ font-family: Lato; font-style: italic; font-weight: 700; - src: url(https://fonts.gstatic.com/s/lato/v22/S6u_w4BMUTPHjxsI5wq_Gwft.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/lato/v22/S6u_w4BMUTPHjxsI5wq_Gwft.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* latin-ext */ @@ -137,7 +137,7 @@ font-family: Lato; font-style: normal; font-weight: 400; - src: url(https://fonts.gstatic.com/s/lato/v22/S6uyw4BMUTPHjxAwXjeu.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/lato/v22/S6uyw4BMUTPHjxAwXjeu.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -146,7 +146,7 @@ font-family: Lato; font-style: normal; font-weight: 400; - src: url(https://fonts.gstatic.com/s/lato/v22/S6uyw4BMUTPHjx4wXg.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/lato/v22/S6uyw4BMUTPHjx4wXg.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* latin-ext */ @@ -155,7 +155,7 @@ font-family: Lato; font-style: normal; font-weight: 700; - src: url(https://fonts.gstatic.com/s/lato/v22/S6u9w4BMUTPHh6UVSwaPGR_p.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/lato/v22/S6u9w4BMUTPHh6UVSwaPGR_p.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -164,6 +164,6 @@ font-family: Lato; font-style: normal; font-weight: 700; - src: url(https://fonts.gstatic.com/s/lato/v22/S6u9w4BMUTPHh6UVSwiPGQ.woff2) format("woff2"); + src: url("https://fonts.gstatic.com/s/lato/v22/S6u9w4BMUTPHh6UVSwiPGQ.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } diff --git a/sites/footers/_base.scss b/sites/footers/_base.scss index a0077b2c8..ea016a575 100644 --- a/sites/footers/_base.scss +++ b/sites/footers/_base.scss @@ -48,7 +48,7 @@ } .gc-main-footer, .landscape { // ".landscape" to support footer v2.0 - background: #26374a url(../assets/landscape.png) no-repeat right bottom; + background: #26374a url("../assets/landscape.png") no-repeat right bottom; color: #fff; /* Start: to support footer version 2.0 (with gcweb v4.0.22) */ diff --git a/stylelint.config.js b/stylelint.config.js index df0b4b9fd..f323cb341 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -107,7 +107,6 @@ module.exports = { "comment-empty-line-before": null, "declaration-block-no-redundant-longhand-properties": null, "declaration-empty-line-before": null, - "function-url-quotes": null, "hue-degree-notation": null, "keyframes-name-pattern": null, "length-zero-no-unit": null, diff --git a/templates/home/_base.scss b/templates/home/_base.scss index 2634ccb98..264032d4c 100644 --- a/templates/home/_base.scss +++ b/templates/home/_base.scss @@ -78,7 +78,7 @@ * - views/_screen-sm-max */ .home-your-gov { - background-image: url(https://www.canada.ca/content/dam/canada/carousel/bkg-home-yourgov.jpg), url(../assets/bkg-home-yourgov.jpg); + background-image: url("https://www.canada.ca/content/dam/canada/carousel/bkg-home-yourgov.jpg"), url("../assets/bkg-home-yourgov.jpg"); background-position: right center; background-repeat: no-repeat; background-size: 38%; diff --git a/templates/home/_screen-md-min-to-screen-md-max.scss b/templates/home/_screen-md-min-to-screen-md-max.scss index aef67cebe..c6e793433 100644 --- a/templates/home/_screen-md-min-to-screen-md-max.scss +++ b/templates/home/_screen-md-min-to-screen-md-max.scss @@ -4,5 +4,5 @@ */ .home .home-your-gov { - background-image: url(https://www.canada.ca/content/dam/canada/carousel/bkg-home-yourgov-md.jpg), url(../assets/bkg-home-yourgov-md.jpg); + background-image: url("https://www.canada.ca/content/dam/canada/carousel/bkg-home-yourgov-md.jpg"), url("../assets/bkg-home-yourgov-md.jpg"); } From 1ca7ecf7f198914b1095a0927f0a063ff7337ff3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 13 Mar 2025 23:53:06 -0400 Subject: [PATCH 03/20] fix: length-zero-no-unit --- components/baseline/_alert.scss | 2 +- components/gc-follow-us/_base.scss | 2 +- components/gc-subway/_screen-sm-max.scss | 2 +- sites/archived/_archived.scss | 2 +- sites/authentication/_base.scss | 2 +- sites/breadcrumbs/_breadcrumb.scss | 4 ++-- sites/gcweb-menu/_base.scss | 10 +++++----- sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss | 6 +++--- sites/gcweb-menu/_screen-md-min.scss | 2 +- sites/gcweb-menu/_screen-sm-max.scss | 6 +++--- sites/header/_base.scss | 2 +- stylelint.config.js | 1 - templates/_search.scss | 4 ++-- templates/home/_base.scss | 10 +++++----- 14 files changed, 27 insertions(+), 28 deletions(-) diff --git a/components/baseline/_alert.scss b/components/baseline/_alert.scss index 7fa53f7bc..0ed466e73 100644 --- a/components/baseline/_alert.scss +++ b/components/baseline/_alert.scss @@ -33,7 +33,7 @@ > { p, ul, ol { - margin-bottom: 0px; + margin-bottom: 0; } * { diff --git a/components/gc-follow-us/_base.scss b/components/gc-follow-us/_base.scss index e5dcb9466..864de91c4 100644 --- a/components/gc-follow-us/_base.scss +++ b/components/gc-follow-us/_base.scss @@ -83,7 +83,7 @@ $social-media-icons-size: 38px; .gc-followus { h2 { font-size: $font-size-h4; - margin-top: 0px; + margin-top: 0; } ul { diff --git a/components/gc-subway/_screen-sm-max.scss b/components/gc-subway/_screen-sm-max.scss index ba7da1a28..c65d48f42 100644 --- a/components/gc-subway/_screen-sm-max.scss +++ b/components/gc-subway/_screen-sm-max.scss @@ -16,7 +16,7 @@ margin-left: -.5em; margin-right: .5em; margin-top: -.75em; - padding: 0px 20px 10px 0px; + padding: 0 20px 10px 0; } ul { diff --git a/sites/archived/_archived.scss b/sites/archived/_archived.scss index 32b50c442..18abbbcd8 100644 --- a/sites/archived/_archived.scss +++ b/sites/archived/_archived.scss @@ -6,7 +6,7 @@ background-color: #ffd700 !important; box-shadow: 0 5px 15px rgba(0, 0, 0, .5); - padding: 25px 0px; + padding: 25px 0; h2 { margin-top: 0; diff --git a/sites/authentication/_base.scss b/sites/authentication/_base.scss index 3cacab0d3..1411eb583 100644 --- a/sites/authentication/_base.scss +++ b/sites/authentication/_base.scss @@ -5,7 +5,7 @@ #wb-so { .btn { - border-radius: 0px; + border-radius: 0; margin-top: 5px; } diff --git a/sites/breadcrumbs/_breadcrumb.scss b/sites/breadcrumbs/_breadcrumb.scss index 79df24761..9a7e62ba5 100644 --- a/sites/breadcrumbs/_breadcrumb.scss +++ b/sites/breadcrumbs/_breadcrumb.scss @@ -6,8 +6,8 @@ #wb-bc { ol { margin-top: 15px; - padding-left: 0px; - padding-right: 0px; + padding-left: 0; + padding-right: 0; } li { diff --git a/sites/gcweb-menu/_base.scss b/sites/gcweb-menu/_base.scss index eec5f6a26..bff588d6a 100644 --- a/sites/gcweb-menu/_base.scss +++ b/sites/gcweb-menu/_base.scss @@ -22,7 +22,7 @@ // This block is to only support GCWeb menu version 1 .home #wb-bnr + .gcweb-menu { - margin-left: 0px; + margin-left: 0; } /* @@ -44,7 +44,7 @@ margin-top: 5px; .container { - padding: 0px; + padding: 0; } } @@ -142,7 +142,7 @@ left:360px; margin-bottom: 25px; min-height: 815px; - padding: 0px 39px 24px 39px; + padding: 0 39px 24px 39px; top: 0; width: 810px; } @@ -193,7 +193,7 @@ /* SubSubMenu (MostRequested) for more interoperability, use CSS class */ [role=menu] [role=menu] li:last-child [role=menu] { list-style: disc; - padding-top: 0px; + padding-top: 0; } [role=menu] [role=menu] [role=menu] { box-shadow: none; @@ -210,7 +210,7 @@ width: 100%; } [role=menu] [role=menu] [role=menu] li:first-child { - margin-bottom: 0px; + margin-bottom: 0; } [role=menu] [role=menu] li:last-child { left: 400px; diff --git a/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss b/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss index 0fc3a8c3f..62b80cba3 100644 --- a/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss +++ b/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss @@ -26,11 +26,11 @@ top: auto; } [role=menu] [role=menu] [role=menu] li:last-child { - margin-top: 0px; + margin-top: 0; } [role=menu] [role=menu] [role=menu] { - margin-bottom: 0px; - padding-bottom: 0px; + margin-bottom: 0; + padding-bottom: 0; position: relative; } } diff --git a/sites/gcweb-menu/_screen-md-min.scss b/sites/gcweb-menu/_screen-md-min.scss index 40f906287..d8efcdd07 100644 --- a/sites/gcweb-menu/_screen-md-min.scss +++ b/sites/gcweb-menu/_screen-md-min.scss @@ -22,7 +22,7 @@ // This block is to only support GCWeb menu version 1 #wb-bnr + .gcweb-menu { - margin-left: 0px; + margin-left: 0; } // Open by default in basic HTML mode into 3 column diff --git a/sites/gcweb-menu/_screen-sm-max.scss b/sites/gcweb-menu/_screen-sm-max.scss index 0905060ff..bee14ff03 100644 --- a/sites/gcweb-menu/_screen-sm-max.scss +++ b/sites/gcweb-menu/_screen-sm-max.scss @@ -76,7 +76,7 @@ } [role="menu"] [role="menu"] li:first-child { - margin-bottom:0px; + margin-bottom:0; } [role="menu"] [role="menu"] li [role="menuitem"] { @@ -97,7 +97,7 @@ [aria-expanded=true]:not(button) + [role=menu] li:first-child, [aria-expanded=true]:not(button) + [role=menu] li:last-child { - margin-left: 0px; + margin-left: 0; } /* Arrow for menu item with submenu */ @@ -156,7 +156,7 @@ } [aria-expanded=true]:not(button) + [role=menu] li:last-child [role=menu] [role=menuitem] { - padding-left: 0px; + padding-left: 0; } [role=menu] [role=menu] [role=menu] li { diff --git a/sites/header/_base.scss b/sites/header/_base.scss index 7230dfd5a..f40eaf8fc 100644 --- a/sites/header/_base.scss +++ b/sites/header/_base.scss @@ -4,7 +4,7 @@ #wb-bnr + hr { border-top: 3px solid #38414d; - margin-bottom: 0px; + margin-bottom: 0; margin-top: 5px; + .container { diff --git a/stylelint.config.js b/stylelint.config.js index f323cb341..e56b1f839 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -109,7 +109,6 @@ module.exports = { "declaration-empty-line-before": null, "hue-degree-notation": null, "keyframes-name-pattern": null, - "length-zero-no-unit": null, "no-descending-specificity": null, // Extremely slow "no-duplicate-selectors": null, "no-invalid-position-at-import-rule": null, // Fixable, need to run sass migrator diff --git a/templates/_search.scss b/templates/_search.scss index 387427060..7ba609fe3 100644 --- a/templates/_search.scss +++ b/templates/_search.scss @@ -13,7 +13,7 @@ .location { color: #006621; - padding-left: 0px; + padding-left: 0; li { display: inline-block; @@ -31,7 +31,7 @@ .context-labels { font-size: .8em; list-style: none; - padding-left: 0px; + padding-left: 0; li { background-color: #5e738b; diff --git a/templates/home/_base.scss b/templates/home/_base.scss index 264032d4c..663e2ebd7 100644 --- a/templates/home/_base.scss +++ b/templates/home/_base.scss @@ -26,17 +26,17 @@ #wb-bnr + hr { border-top: 1px solid #ddd; color: #284162; - margin-left: 0px; + margin-left: 0; } // This block is to only support GCWeb menu version 1 #wb-bnr + .gcweb-menu { border-top: 1px solid #ddd; color: #284162; - margin-left: 0px; + margin-left: 0; .container { - padding: 0px; + padding: 0; } } @@ -47,7 +47,7 @@ /* Home page banner */ .header-rwd { - margin: 1em 0px; + margin: 1em 0; } /* Home page Most requested section @@ -61,7 +61,7 @@ font-size: 17px; font-weight: $bold-weight; line-height: 26px; - margin-top: 0px; + margin-top: 0; } } From de40ed964ba3318ea8a91953318a8fd7fbc9ff66 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 13 Mar 2025 23:54:06 -0400 Subject: [PATCH 04/20] fix: property-no-vendor-prefix --- components/wb-chtwzrd/_base.scss | 2 +- stylelint.config.js | 1 - templates/news/_base.scss | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/components/wb-chtwzrd/_base.scss b/components/wb-chtwzrd/_base.scss index a5d76031a..d0dcb5134 100644 --- a/components/wb-chtwzrd/_base.scss +++ b/components/wb-chtwzrd/_base.scss @@ -202,7 +202,7 @@ } .wb-chtwzrd-container .minimize, .wb-chtwzrd-container .reset { - -webkit-appearance: none; + appearance: none; background: transparent; border: 0; color: #fff; diff --git a/stylelint.config.js b/stylelint.config.js index e56b1f839..df56e3d83 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -113,7 +113,6 @@ module.exports = { "no-duplicate-selectors": null, "no-invalid-position-at-import-rule": null, // Fixable, need to run sass migrator "number-max-precision": null, - "property-no-vendor-prefix": null, "rule-empty-line-before": null, "scss/at-extend-no-missing-placeholder": null, "scss/at-mixin-argumentless-call-parentheses": null, diff --git a/templates/news/_base.scss b/templates/news/_base.scss index b43c4fb3f..2d9f1769e 100644 --- a/templates/news/_base.scss +++ b/templates/news/_base.scss @@ -53,8 +53,6 @@ table { } .nws-tbl .one-dot { background: #000; - -moz-border-radius: 50%; - -webkit-border-radius: 50%; border-radius: 50%; display: inline-block; height: .5em; From 7ddfa2ff2b07335dc6fb7a431ecf52c11247613a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 13 Mar 2025 23:55:02 -0400 Subject: [PATCH 05/20] fix: color-hex-length --- components/_provisional.scss | 6 +++--- stylelint.config.js | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/components/_provisional.scss b/components/_provisional.scss index 2144ce5c6..9e62926cd 100644 --- a/components/_provisional.scss +++ b/components/_provisional.scss @@ -77,8 +77,8 @@ // Home page Menu &.home .gcweb-menu { button[aria-haspopup=true] { - background-color: #ffffff; - border-color:#ffffff; + background-color: #fff; + border-color:#fff; } button[aria-haspopup=true] { color: #AD005F; @@ -87,7 +87,7 @@ button[aria-haspopup=true]:hover { background-color: #AD005F; border-color:#AD005F; - color: #ffffff; + color: #fff; } } diff --git a/stylelint.config.js b/stylelint.config.js index df56e3d83..60cbe6d1c 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -103,7 +103,6 @@ module.exports = { // Suppress stylelint-config-standard errors "at-rule-empty-line-before": null, - "color-hex-length": null, "comment-empty-line-before": null, "declaration-block-no-redundant-longhand-properties": null, "declaration-empty-line-before": null, From cfe9b90e336c868226cf6cd16e349dd0ca30dc99 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 13 Mar 2025 23:56:27 -0400 Subject: [PATCH 06/20] fix: comment-empty-line-before --- components/_provisional.scss | 4 +++- components/wb5-click-postback/_base.scss | 1 + sites/banner/_screen-xxs-max.scss | 1 - sites/baseline/_font.scss | 13 +++++++++++++ sites/baseline/_obselete.scss | 1 + sites/footers/_base.scss | 3 +++ sites/gcweb-menu/_base.scss | 2 +- .../gcweb-menu/_screen-md-min-to-screen-md-max.scss | 1 - sites/servermessage/_screen.scss | 1 + sites/theme-srv.scss | 2 ++ sites/theme.scss | 1 + sites/wet-boew.scss | 1 + stylelint.config.js | 1 - 13 files changed, 27 insertions(+), 5 deletions(-) diff --git a/components/_provisional.scss b/components/_provisional.scss index 9e62926cd..bb7b0d354 100644 --- a/components/_provisional.scss +++ b/components/_provisional.scss @@ -4,13 +4,13 @@ * wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html * */ + /* Global Provisional styling - Provisional CSSspecific for view port are defined in the "views/[view port]" theme CSS */ .provisional { - /* * * @@ -18,6 +18,7 @@ * * */ + /* ------------ * Background colour * @@ -108,6 +109,7 @@ &.icon-warning-light, .icon-warning-light { color: #DF7200; } + /* * * diff --git a/components/wb5-click-postback/_base.scss b/components/wb5-click-postback/_base.scss index 7c66e4a8b..abd221418 100644 --- a/components/wb5-click-postback/_base.scss +++ b/components/wb5-click-postback/_base.scss @@ -1,6 +1,7 @@ /* * CSS used for the legacy/obsolete code */ + /* Report a problem Thank you message */ .gc-rprt-prblm-thnk { padding-bottom: 25px; diff --git a/sites/banner/_screen-xxs-max.scss b/sites/banner/_screen-xxs-max.scss index 4ae2ad61b..6578067d3 100644 --- a/sites/banner/_screen-xxs-max.scss +++ b/sites/banner/_screen-xxs-max.scss @@ -4,7 +4,6 @@ header { .brand { - /* Solely for the purpose of having the previous header look decent */ &.col-xs-5 { @include brand-screen-xxs-max-override-grid; diff --git a/sites/baseline/_font.scss b/sites/baseline/_font.scss index 682a5ed38..fe50938b0 100644 --- a/sites/baseline/_font.scss +++ b/sites/baseline/_font.scss @@ -23,6 +23,7 @@ src: url("https://fonts.gstatic.com/s/notosans/v25/o-0OIpQlx3QUlC5A4PNr4ARMQ_m87A.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } + /* latin */ @font-face { font-display: fallback; @@ -32,6 +33,7 @@ src: url("https://fonts.gstatic.com/s/notosans/v25/o-0OIpQlx3QUlC5A4PNr4ARCQ_k.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } + /* latin-ext */ @font-face { font-display: optional; @@ -41,6 +43,7 @@ src: url("https://fonts.gstatic.com/s/notosans/v25/o-0TIpQlx3QUlC5A4PNr4Az5ZuyNzW1aPQ.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } + /* latin */ @font-face { font-display: optional; @@ -60,6 +63,7 @@ src: url("https://fonts.gstatic.com/s/notosans/v25/o-0IIpQlx3QUlC5A4PNr6zRAW_0.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } + /* latin */ @font-face { font-display: fallback; @@ -69,6 +73,7 @@ src: url("https://fonts.gstatic.com/s/notosans/v25/o-0IIpQlx3QUlC5A4PNr5TRA.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } + /* latin-ext */ @font-face { font-display: optional; @@ -78,6 +83,7 @@ src: url("https://fonts.gstatic.com/s/notosans/v25/o-0NIpQlx3QUlC5A4PNjXhFVatyB1Wk.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } + /* latin */ @font-face { font-display: fallback; @@ -104,6 +110,7 @@ src: url("https://fonts.gstatic.com/s/lato/v22/S6u8w4BMUTPHjxsAUi-qJCY.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } + /* latin */ @font-face { font-display: fallback; @@ -113,6 +120,7 @@ src: url("https://fonts.gstatic.com/s/lato/v22/S6u8w4BMUTPHjxsAXC-q.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } + /* latin-ext */ @font-face { font-display: optional; @@ -122,6 +130,7 @@ src: url("https://fonts.gstatic.com/s/lato/v22/S6u_w4BMUTPHjxsI5wq_FQft1dw.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } + /* latin */ @font-face { font-display: fallback; @@ -131,6 +140,7 @@ src: url("https://fonts.gstatic.com/s/lato/v22/S6u_w4BMUTPHjxsI5wq_Gwft.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } + /* latin-ext */ @font-face { font-display: optional; @@ -140,6 +150,7 @@ src: url("https://fonts.gstatic.com/s/lato/v22/S6uyw4BMUTPHjxAwXjeu.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } + /* latin */ @font-face { font-display: fallback; @@ -149,6 +160,7 @@ src: url("https://fonts.gstatic.com/s/lato/v22/S6uyw4BMUTPHjx4wXg.woff2") format("woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } + /* latin-ext */ @font-face { font-display: optional; @@ -158,6 +170,7 @@ src: url("https://fonts.gstatic.com/s/lato/v22/S6u9w4BMUTPHh6UVSwaPGR_p.woff2") format("woff2"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } + /* latin */ @font-face { font-display: fallback; diff --git a/sites/baseline/_obselete.scss b/sites/baseline/_obselete.scss index 64b99206e..e1eedaad6 100644 --- a/sites/baseline/_obselete.scss +++ b/sites/baseline/_obselete.scss @@ -82,6 +82,7 @@ main .force-style-gcweb-4-0-29, font-size: 16px; line-height: 23px; } + /* * END - Force GCWeb release 4.0.29 font style * diff --git a/sites/footers/_base.scss b/sites/footers/_base.scss index ea016a575..d70c30470 100644 --- a/sites/footers/_base.scss +++ b/sites/footers/_base.scss @@ -56,6 +56,7 @@ padding-bottom: 1em; padding-top: .6em; } + /* END */ h4 { @@ -136,6 +137,7 @@ top: .1875em; } } + /* END */ } @@ -206,6 +208,7 @@ } } } + /* END */ } } diff --git a/sites/gcweb-menu/_base.scss b/sites/gcweb-menu/_base.scss index bff588d6a..87675606b 100644 --- a/sites/gcweb-menu/_base.scss +++ b/sites/gcweb-menu/_base.scss @@ -34,7 +34,6 @@ // This block is to only support GCWeb menu version 1 #wb-bnr + .gcweb-menu { - /* * Level 0 - button menu */ @@ -181,6 +180,7 @@ font-weight: $bold-weight; text-decoration: underline; } + /* Undo for lower level */ [role=menu] [role=menu] [role=menu] li:first-child [role=menuitem] { font-size: 18px; diff --git a/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss b/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss index 62b80cba3..397436362 100644 --- a/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss +++ b/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss @@ -4,7 +4,6 @@ */ .gcweb-menu { - /* * Tablet mode * diff --git a/sites/servermessage/_screen.scss b/sites/servermessage/_screen.scss index 05b05aef2..94942d97b 100644 --- a/sites/servermessage/_screen.scss +++ b/sites/servermessage/_screen.scss @@ -4,6 +4,7 @@ * wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html * */ + /* @title: All screen views - Splash page */ diff --git a/sites/theme-srv.scss b/sites/theme-srv.scss index 7174491af..6c8df84d1 100644 --- a/sites/theme-srv.scss +++ b/sites/theme-srv.scss @@ -1,4 +1,5 @@ @charset "utf-8"; + /*! * * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW) @@ -16,6 +17,7 @@ /* Views */ + /* All screen views */ @media screen { @import "servermessage/screen"; diff --git a/sites/theme.scss b/sites/theme.scss index b7a664d16..fce687f1c 100644 --- a/sites/theme.scss +++ b/sites/theme.scss @@ -223,6 +223,7 @@ /* Views */ + /* All screen views */ @media screen { @import "wet-boew/src/base/views/screen"; diff --git a/sites/wet-boew.scss b/sites/wet-boew.scss index 7430baed0..941ca51c0 100644 --- a/sites/wet-boew.scss +++ b/sites/wet-boew.scss @@ -2,4 +2,5 @@ * 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 */ + /*! Deprecated */ diff --git a/stylelint.config.js b/stylelint.config.js index 60cbe6d1c..ce0012730 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -103,7 +103,6 @@ module.exports = { // Suppress stylelint-config-standard errors "at-rule-empty-line-before": null, - "comment-empty-line-before": null, "declaration-block-no-redundant-longhand-properties": null, "declaration-empty-line-before": null, "hue-degree-notation": null, From 48083bc38d1886a56a25d83e436ca7cf8ce5fa70 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 13 Mar 2025 23:57:54 -0400 Subject: [PATCH 07/20] fix: declaration-empty-line-before --- common/scaffolding/_base.scss | 1 + components/_fd-wdgt.scss | 1 + components/gc-follow-us/_base.scss | 10 ++++++++++ components/pagination/_base.scss | 1 - components/tabs/_carousel.scss | 1 - components/wb5-click-postback/_base.scss | 2 -- sites/baseline/_buttons.scss | 1 + sites/baseline/_scaffolding.scss | 1 - sites/fonts/_base.scss | 4 ++++ sites/secondary-menu/_base.scss | 2 ++ stylelint.config.js | 1 - templates/home/_base.scss | 1 + templates/mobile-centre/_base.scss | 3 +++ templates/social-media-centre/_base.scss | 1 + 14 files changed, 24 insertions(+), 6 deletions(-) diff --git a/common/scaffolding/_base.scss b/common/scaffolding/_base.scss index 509699ae4..d0d003564 100644 --- a/common/scaffolding/_base.scss +++ b/common/scaffolding/_base.scss @@ -11,6 +11,7 @@ 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; } diff --git a/components/_fd-wdgt.scss b/components/_fd-wdgt.scss index 231ad030f..3aa8627a4 100644 --- a/components/_fd-wdgt.scss +++ b/components/_fd-wdgt.scss @@ -55,6 +55,7 @@ &:after { content: ""; } + display: inline-block; float: none !important; padding-top: 10px; diff --git a/components/gc-follow-us/_base.scss b/components/gc-follow-us/_base.scss index 864de91c4..a7bbf8b4d 100644 --- a/components/gc-follow-us/_base.scss +++ b/components/gc-follow-us/_base.scss @@ -164,31 +164,37 @@ $social-media-icons-size: 38px; .facebook::before { @extend %social-media-icons-gc-followus-logo-properties; + background-image: url("../assets/gc-follow-us/facebook.svg"); } .twitter::before { @extend %social-media-icons-gc-followus-logo-properties; + background-image: url("../assets/gc-follow-us/x.svg"); } .x-social::before { @extend %social-media-icons-gc-followus-logo-properties; + background-image: url("../assets/gc-follow-us/x.svg"); } .youtube::before { @extend %social-media-icons-gc-followus-logo-properties; + background-image: url("../assets/gc-follow-us/youtube.svg"); } .instagram::before { @extend %social-media-icons-gc-followus-logo-properties; + background-image: url("../assets/gc-follow-us/instagram.svg"); } .linkedin::before { @extend %social-media-icons-gc-followus-logo-properties; + background-image: url("../assets/gc-follow-us/linkedin.svg"); } } @@ -245,6 +251,7 @@ $social-media-icons-size: 38px; .youtube { @extend %social-media-icons-followus-logo-properties; @extend %social-media-icons-logo-youtube; + min-width: 38px; } @@ -286,6 +293,7 @@ $social-media-icons-size: 38px; .googleplus { @extend %social-media-icons-followus-logo-properties; @extend %social-media-icons-logo-googleplus; + background-repeat: no-repeat; background-size: 35px 35px; } @@ -327,6 +335,7 @@ $social-media-icons-size: 38px; &.youtube { @extend %social-media-icons-logo-youtube; + padding-left: 45px; } @@ -360,6 +369,7 @@ $social-media-icons-size: 38px; &.googleplus { //This is deprecated and will be removed from later versions @extend %social-media-icons-logo-googleplus; + height: 45px; padding-left: 48px; } diff --git a/components/pagination/_base.scss b/components/pagination/_base.scss index 934e44075..6fae79641 100644 --- a/components/pagination/_base.scss +++ b/components/pagination/_base.scss @@ -3,7 +3,6 @@ */ .pagntn-prv-nxt { - margin-bottom: 15px; .glyphicon-chevron-left, diff --git a/components/tabs/_carousel.scss b/components/tabs/_carousel.scss index 86cbd7052..453577bb1 100644 --- a/components/tabs/_carousel.scss +++ b/components/tabs/_carousel.scss @@ -3,7 +3,6 @@ Carousel */ .carousel-s1, .carousel-s2 { - margin-bottom: 15px; .wb-mltmd { diff --git a/components/wb5-click-postback/_base.scss b/components/wb5-click-postback/_base.scss index abd221418..e5b480e44 100644 --- a/components/wb5-click-postback/_base.scss +++ b/components/wb5-click-postback/_base.scss @@ -22,7 +22,6 @@ .gc-rprt-prblm-frm { .form-group { - display:none !important } } @@ -30,7 +29,6 @@ .gc-rprt-prblm-frm { label[for=problem6] { - display:none !important } } diff --git a/sites/baseline/_buttons.scss b/sites/baseline/_buttons.scss index a34571b80..1d7a72848 100644 --- a/sites/baseline/_buttons.scss +++ b/sites/baseline/_buttons.scss @@ -16,6 +16,7 @@ body { /* Call-to-action button style - new with GCWeb v5 */ .btn-call-to-action { @include button-variant( #fff, #318000, #458259 ); + font-size: 1.1em; margin-bottom: 25px; margin-top: 15px; diff --git a/sites/baseline/_scaffolding.scss b/sites/baseline/_scaffolding.scss index bab4b53b4..bcd241470 100644 --- a/sites/baseline/_scaffolding.scss +++ b/sites/baseline/_scaffolding.scss @@ -91,7 +91,6 @@ a { /* Style only the figcaption as the link */ a.figcaption { - text-decoration: none; &:not( [class*="text-"] ) * :not( figcaption ) { diff --git a/sites/fonts/_base.scss b/sites/fonts/_base.scss index 2f5109e8c..e6d31bbce 100644 --- a/sites/fonts/_base.scss +++ b/sites/fonts/_base.scss @@ -4,6 +4,7 @@ style: normal; weight: normal; } + src: url("../fonts/gcweb_0c4a4eb7974d0a7287c93c02965f9b3f.eot"), url("../fonts/gcweb_0c4a4eb7974d0a7287c93c02965f9b3f.eot?#iefix") format("embedded-opentype"), url("../fonts/gcweb_0c4a4eb7974d0a7287c93c02965f9b3f.woff") format("woff"), @@ -37,6 +38,7 @@ &:before { @extend %basic-font-format; + position: relative; } } @@ -69,6 +71,7 @@ &:before, &:after { @extend %basic-font-format; + display: inline; position: relative; } @@ -80,6 +83,7 @@ &:after { @extend %basic-font-format; + color: #f00; content: "\f101"; left: -1em; diff --git a/sites/secondary-menu/_base.scss b/sites/secondary-menu/_base.scss index b70162bca..fb8f3b684 100644 --- a/sites/secondary-menu/_base.scss +++ b/sites/secondary-menu/_base.scss @@ -45,6 +45,7 @@ &.wb-navcurr { @extend %secmenu-canada-theme-menuitem-curr-hover-focus; + cursor: text; &[href]:hover { @@ -74,6 +75,7 @@ &.wb-navcurr { @extend %secmenu-canada-theme-menuitem-curr-hover-focus; + cursor: text; } } diff --git a/stylelint.config.js b/stylelint.config.js index ce0012730..fea92f8d6 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -104,7 +104,6 @@ module.exports = { // Suppress stylelint-config-standard errors "at-rule-empty-line-before": null, "declaration-block-no-redundant-longhand-properties": null, - "declaration-empty-line-before": null, "hue-degree-notation": null, "keyframes-name-pattern": null, "no-descending-specificity": null, // Extremely slow diff --git a/templates/home/_base.scss b/templates/home/_base.scss index 663e2ebd7..c955fb547 100644 --- a/templates/home/_base.scss +++ b/templates/home/_base.scss @@ -58,6 +58,7 @@ .home-most-requested { li { @include defaults-alternative-font-family(); + font-size: 17px; font-weight: $bold-weight; line-height: 26px; diff --git a/templates/mobile-centre/_base.scss b/templates/mobile-centre/_base.scss index b8c24bd37..cab55ab10 100644 --- a/templates/mobile-centre/_base.scss +++ b/templates/mobile-centre/_base.scss @@ -203,11 +203,13 @@ .product-shortdescription, .product-longdescription { @extend %data-block-no-border; + margin-top: 1em; } .product-department { @extend %data-block-no-border; + font-weight: bold; margin-top: 1em; } @@ -255,6 +257,7 @@ .record-close { @extend %data-hidden; + float: right; } diff --git a/templates/social-media-centre/_base.scss b/templates/social-media-centre/_base.scss index 4b087cf28..4820045d1 100644 --- a/templates/social-media-centre/_base.scss +++ b/templates/social-media-centre/_base.scss @@ -87,6 +87,7 @@ .product-language, .product-link-container { @extend %data-block-no-border; + margin-top: 1em; } From 99377b183e96a7686dd32202f5d8d7fb7b03d162 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 14 Mar 2025 00:00:14 -0400 Subject: [PATCH 08/20] fix: rule-empty-line-before --- common/list/_lists.scss | 2 +- common/spacing/_base.scss | 4 ++++ common/spacing/_screen-lg-min.scss | 4 ++++ common/spacing/_screen-md-min.scss | 4 ++++ common/spacing/_screen-sm-min.scss | 4 ++++ components/_base.scss | 9 --------- components/_base2.scss | 2 -- components/_provisional.scss | 8 ++++++++ components/_tbl-floatcolumn.scss | 4 ++++ components/bold-content/_base.scss | 1 + components/gc-chckbxrdio/_base.scss | 8 ++------ components/gc-dwnld/_base.scss | 1 - components/gc-follow-us/_base.scss | 2 ++ components/gc-subway/_base.scss | 1 + components/gc-table/_base.scss | 1 + components/gc-table/_screen-sm-max.scss | 12 ++++++++++++ components/tabs/_screen.scss | 1 - components/toc/_base.scss | 2 -- components/wb-chtwzrd/_base.scss | 13 +++++++++++++ components/wb5-click-postback/_base.scss | 4 ---- sites/authentication/_base.scss | 1 - sites/authentication/_screen-sm-max.scss | 1 - sites/baseline/_buttons.scss | 2 ++ sites/baseline/_forms.scss | 1 + sites/baseline/_obselete.scss | 3 ++- sites/baseline/_scaffolding.scss | 5 +++++ sites/breadcrumbs/_breadcrumb.scss | 3 ++- sites/gcweb-menu/_base.scss | 14 +++++++++++++- .../_screen-md-min-to-screen-md-max.scss | 3 +++ sites/gcweb-menu/_screen-md-min.scss | 3 +++ sites/gcweb-menu/_screen-sm-max.scss | 12 ++++++++++-- sites/gcweb-menu/_screen-xs-max.scss | 1 - sites/language/_language-bar.scss | 1 + sites/messages.scss | 1 - sites/page-details/_base.scss | 2 +- stylelint.config.js | 1 - templates/_search.scss | 1 - templates/campaign/_base.scss | 4 ---- templates/home/_base.scss | 1 - templates/home/_screen-sm-max.scss | 1 + templates/mobile-centre/_ie8.scss | 3 --- templates/news/_base.scss | 6 ++++-- templates/news/_screen-sm-min.scss | 2 -- templates/social-media-centre/_ie8.scss | 2 -- 44 files changed, 109 insertions(+), 52 deletions(-) diff --git a/common/list/_lists.scss b/common/list/_lists.scss index 3f04ee710..d496af339 100644 --- a/common/list/_lists.scss +++ b/common/list/_lists.scss @@ -15,7 +15,6 @@ * - views/_screen-xs-max */ .list-responsive { - > li { float: left; padding-right: 5px; @@ -30,6 +29,7 @@ content: " "; display: table; } + &:after { clear: both; } diff --git a/common/spacing/_base.scss b/common/spacing/_base.scss index c87f23aa8..e064fe4bd 100644 --- a/common/spacing/_base.scss +++ b/common/spacing/_base.scss @@ -35,18 +35,22 @@ // Auto margins .m-auto { margin: auto !important; } + .mt-auto, .my-auto { margin-top: auto !important; } + .mr-auto, .mx-auto { margin-right: auto !important; } + .mb-auto, .my-auto { margin-bottom: auto !important; } + .ml-auto, .mx-auto { margin-left: auto !important; diff --git a/common/spacing/_screen-lg-min.scss b/common/spacing/_screen-lg-min.scss index 8f0427b48..a99934289 100644 --- a/common/spacing/_screen-lg-min.scss +++ b/common/spacing/_screen-lg-min.scss @@ -29,18 +29,22 @@ // Auto margins .m-lg-auto { margin: auto !important; } + .mt-lg-auto, .my-lg-auto { margin-top: auto !important; } + .mr-lg-auto, .mx-lg-auto { margin-right: auto !important; } + .mb-lg-auto, .my-lg-auto { margin-bottom: auto !important; } + .ml-lg-auto, .mx-lg-auto { margin-left: auto !important; diff --git a/common/spacing/_screen-md-min.scss b/common/spacing/_screen-md-min.scss index 2f26ba3a6..cc0697c05 100644 --- a/common/spacing/_screen-md-min.scss +++ b/common/spacing/_screen-md-min.scss @@ -29,18 +29,22 @@ // Auto margins .m-md-auto { margin: auto !important; } + .mt-md-auto, .my-md-auto { margin-top: auto !important; } + .mr-md-auto, .mx-md-auto { margin-right: auto !important; } + .mb-md-auto, .my-md-auto { margin-bottom: auto !important; } + .ml-md-auto, .mx-md-auto { margin-left: auto !important; diff --git a/common/spacing/_screen-sm-min.scss b/common/spacing/_screen-sm-min.scss index 47764f2cd..c3f7ce52e 100644 --- a/common/spacing/_screen-sm-min.scss +++ b/common/spacing/_screen-sm-min.scss @@ -29,18 +29,22 @@ // Auto margins .m-sm-auto { margin: auto !important; } + .mt-sm-auto, .my-sm-auto { margin-top: auto !important; } + .mr-sm-auto, .mx-sm-auto { margin-right: auto !important; } + .mb-sm-auto, .my-sm-auto { margin-bottom: auto !important; } + .ml-sm-auto, .mx-sm-auto { margin-left: auto !important; diff --git a/components/_base.scss b/components/_base.scss index 0347c4dde..15c9ada9e 100644 --- a/components/_base.scss +++ b/components/_base.scss @@ -11,7 +11,6 @@ } ul { - >li { margin-bottom: 10px; } @@ -21,14 +20,12 @@ .lnkbx { //used on topics and theme for well in right column >ul { - >li { margin-bottom: 10px; } } dl { - a { overflow-wrap: break-word; word-break: break-all; @@ -51,7 +48,6 @@ .gc-crprt { ul { - &:nth-child(1) { list-style: outside none none; margin: 0; @@ -68,7 +64,6 @@ } .col-md-8 { - .col-md-4 { margin-bottom: 15px; } @@ -83,7 +78,6 @@ .gc-orgnztn { // Class added to main .gc-rms-lngth { - img { margin-bottom: 30px; } @@ -95,7 +89,6 @@ */ .gc-theme { - .profile { margin-bottom: 25px; } @@ -109,7 +102,6 @@ .lnkbx { // Contact definition list dl { - dt, dd { border: 0; @@ -122,7 +114,6 @@ */ .gc-advnc-srvc { - .col-md-8 { h2 { &:first-child { diff --git a/components/_base2.scss b/components/_base2.scss index 39ffe1188..5edef51f9 100644 --- a/components/_base2.scss +++ b/components/_base2.scss @@ -2,7 +2,6 @@ * Main content area */ main { - .subtitle { color: #555; font-size: 1em; @@ -26,7 +25,6 @@ main { } .gc-rms-lngth { - img { background-color: #fff; border: solid 1px $wbGray; diff --git a/components/_provisional.scss b/components/_provisional.scss index bb7b0d354..4217db725 100644 --- a/components/_provisional.scss +++ b/components/_provisional.scss @@ -64,12 +64,14 @@ background-color: #AD005F; border-color:#AD005F; } + .gcweb-menu button[aria-haspopup=true]:focus, .gcweb-menu button[aria-haspopup=true]:hover, #wb-srch button:focus, #wb-srch button:hover, .srchbox button:focus, .srchbox button:hover { background-color: #570030; color: #fff; } + .gcweb-menu, #wb-bnr + .gcweb-menu, &.home .gcweb-menu, #wb-bnr + hr { border-top-color: #AD005F; @@ -81,9 +83,11 @@ background-color: #fff; border-color:#fff; } + button[aria-haspopup=true] { color: #AD005F; } + button[aria-haspopup=true]:focus, button[aria-haspopup=true]:hover { background-color: #AD005F; @@ -130,12 +134,14 @@ border-color: #000; color: #fff; } + .gcweb-menu button[aria-haspopup=true]:focus, .gcweb-menu button[aria-haspopup=true]:hover, #wb-srch button:focus, #wb-srch button:hover, .srchbox button:focus, .srchbox button:hover { background-color: #000; color: #fff; } + .gcweb-menu, #wb-bnr + .gcweb-menu, &.home .gcweb-menu, #wb-bnr + hr { border-top-color: #000; @@ -147,9 +153,11 @@ background-color: #fff; border-color:#fff; } + button[aria-haspopup=true] { color: #000; } + button[aria-haspopup=true]:focus, button[aria-haspopup=true]:hover { background-color: #000; diff --git a/components/_tbl-floatcolumn.scss b/components/_tbl-floatcolumn.scss index c86a25d86..73aba9bf3 100644 --- a/components/_tbl-floatcolumn.scss +++ b/components/_tbl-floatcolumn.scss @@ -5,10 +5,12 @@ th:first-child { float: left; } + td:nth-of-type(1) { clear: left; float: left; } + thead th:nth-child(2) { clip: rect(1px, 1px, 1px, 1px); height: 1px; @@ -17,9 +19,11 @@ position: absolute; width: 1px; } + th:first-child, td:nth-of-type(1) { border: none; } + tr, th:not(:first-of-type), td { border-bottom: 1px solid #ddd; } diff --git a/components/bold-content/_base.scss b/components/bold-content/_base.scss index 360ef3e6f..c7e512e31 100644 --- a/components/bold-content/_base.scss +++ b/components/bold-content/_base.scss @@ -2,6 +2,7 @@ .bold-content, .well.well-bold { font-weight: $bold-weight; + strong { font-weight: $normal-weight; } diff --git a/components/gc-chckbxrdio/_base.scss b/components/gc-chckbxrdio/_base.scss index 8a809790d..acf168b10 100644 --- a/components/gc-chckbxrdio/_base.scss +++ b/components/gc-chckbxrdio/_base.scss @@ -21,7 +21,6 @@ fieldset.gc-chckbxrdio { } .gc-chckbxrdio { - label { cursor: pointer; display: block; @@ -86,7 +85,6 @@ fieldset.gc-chckbxrdio { } input[type="radio"] { - + { label::before { border-radius: 50%; @@ -94,7 +92,6 @@ fieldset.gc-chckbxrdio { } &:checked + { - label::before { background: #444; } @@ -102,9 +99,7 @@ fieldset.gc-chckbxrdio { } &.checkbox { - input[type="checkbox"] { - + label, + label + ul { font-size: 17px; @@ -129,7 +124,6 @@ fieldset.gc-chckbxrdio { } input[type="checkbox"] { - &:checked + label::after { border-color: #333; border-style: solid; @@ -162,6 +156,7 @@ fieldset.gc-chckbxrdio { } } } + input[type=radio] { &:focus+label { &::before { @@ -169,6 +164,7 @@ fieldset.gc-chckbxrdio { } } } + input[type="radio"] { &:checked { + { diff --git a/components/gc-dwnld/_base.scss b/components/gc-dwnld/_base.scss index eb18c0f35..b4a680650 100644 --- a/components/gc-dwnld/_base.scss +++ b/components/gc-dwnld/_base.scss @@ -1,6 +1,5 @@ // Download link box .gc-dwnld { - .gc-dwnld-txt { text-decoration: underline; diff --git a/components/gc-follow-us/_base.scss b/components/gc-follow-us/_base.scss index a7bbf8b4d..f7dad810f 100644 --- a/components/gc-follow-us/_base.scss +++ b/components/gc-follow-us/_base.scss @@ -107,6 +107,7 @@ $social-media-icons-size: 38px; &.more-ways { display: block; + a { text-decoration: underline; } @@ -141,6 +142,7 @@ $social-media-icons-size: 38px; &:first-child { margin-top: 0; } + a { border-radius: 100%; height: $social-media-icons-size; diff --git a/components/gc-subway/_base.scss b/components/gc-subway/_base.scss index c2b566ff8..4860724ce 100644 --- a/components/gc-subway/_base.scss +++ b/components/gc-subway/_base.scss @@ -107,6 +107,7 @@ } } } + &.gc-subway-index { h2 { position: static; diff --git a/components/gc-table/_base.scss b/components/gc-table/_base.scss index fb78cedcc..f93897dab 100644 --- a/components/gc-table/_base.scss +++ b/components/gc-table/_base.scss @@ -11,6 +11,7 @@ caption { text-align: left; } + td { ul { padding-inline-start: 20px; diff --git a/components/gc-table/_screen-sm-max.scss b/components/gc-table/_screen-sm-max.scss index 389e71b1b..466016559 100644 --- a/components/gc-table/_screen-sm-max.scss +++ b/components/gc-table/_screen-sm-max.scss @@ -8,6 +8,7 @@ $gc-tables-tr-margin-vertical: .625em; &.gc-table { &.table-bordered { border: 0; + > { thead, tbody, @@ -29,15 +30,18 @@ $gc-tables-tr-margin-vertical: .625em; } } } + &.dataTable { &.no-footer { border-bottom: 0; } } + .text-left { clear: both; display: block; } + >tbody, >tfoot { >tr { @@ -48,12 +52,14 @@ $gc-tables-tr-margin-vertical: .625em; } } } + tr { border: 1px solid #ddd; display: block; margin-bottom: $gc-tables-tr-margin-vertical; padding: .35em; } + > { :last-child { > { @@ -65,9 +71,11 @@ $gc-tables-tr-margin-vertical: .625em; } } } + caption { font-size: 1.1em; } + thead { border: none; clip: rect(0 0 0 0); @@ -78,6 +86,7 @@ $gc-tables-tr-margin-vertical: .625em; position: absolute; width: 1px; } + tbody { + { tbody { @@ -91,16 +100,19 @@ $gc-tables-tr-margin-vertical: .625em; } } } + td { display: flow-root; font-size: 1em; text-align: right; + &::before { content: attr(data-label); float: left; font-weight: bold; text-align: left; } + &:last-child { border-bottom: 0; } diff --git a/components/tabs/_screen.scss b/components/tabs/_screen.scss index 2aeb8c7d5..1a7928c84 100644 --- a/components/tabs/_screen.scss +++ b/components/tabs/_screen.scss @@ -7,7 +7,6 @@ .wb-tabs { &.carousel-s2 { - [role="tablist"] { li { &.plypause { diff --git a/components/toc/_base.scss b/components/toc/_base.scss index 6daf26e2b..8356029ab 100644 --- a/components/toc/_base.scss +++ b/components/toc/_base.scss @@ -2,13 +2,11 @@ * Table of Content styles for document navigation */ .toc { - li { display: inline; font-size: .85em; /* Expected 17px with 20px base font */ .list-group-item { - &:focus, &:hover { background-color: #f5f5f5; diff --git a/components/wb-chtwzrd/_base.scss b/components/wb-chtwzrd/_base.scss index d0dcb5134..dac764e36 100644 --- a/components/wb-chtwzrd/_base.scss +++ b/components/wb-chtwzrd/_base.scss @@ -14,9 +14,11 @@ 0% { transform: scale(0, 1); } + 95% { transform: scale(0, 1); } + 100% { transform: scale(1, 1); } @@ -26,15 +28,19 @@ 0% { transform: scale(1, 1); } + 15% { transform: scale(1.15, 1.15); } + 30% { transform: scale(1, 1); } + 65% { transform: scale(1.3, 1.3); } + 100% { transform: scale(1, 1); } @@ -383,6 +389,7 @@ .wb-chtwzrd-bubble-wrap { right: 10px; } + .wb-chtwzrd-container { bottom: 0; height: 100%; @@ -391,6 +398,7 @@ right: 0; width: 100%; } + .wb-chtwzrd-container .body { -webkit-box-direction: normal; -webkit-box-orient: vertical; @@ -401,6 +409,7 @@ padding-bottom: 75px; width: 100%; } + .wb-chtwzrd-container .conversation { -webkit-box-flex: 1; flex-grow: 1; @@ -408,14 +417,17 @@ max-height: none; min-height: 2em; } + .wb-chtwzrd-container .controls { -ms-flex-negative: 0; flex-shrink: 0; height: 75px; } + .wb-chtwzrd-noscroll { overflow: hidden !important; } + .wb-chtwzrd-bubble-wrap p .notif-close { font-size: 2em; height: 35px; @@ -423,6 +435,7 @@ right: 90%; width: 35px; } + .wb-chtwzrd-contained .body { padding-bottom: 10px; } diff --git a/components/wb5-click-postback/_base.scss b/components/wb5-click-postback/_base.scss index e5b480e44..3daa793cc 100644 --- a/components/wb5-click-postback/_base.scss +++ b/components/wb5-click-postback/_base.scss @@ -9,9 +9,7 @@ /* Report a problem temporary fix for toggle : GH issue #1336 */ .gc-rprt-prblm-frm { - &.gc-rprt-prblm-tggl { - &.show { display: none !important; } @@ -20,14 +18,12 @@ /* Hide RAP textarea and Other : GH issue #1336 */ .gc-rprt-prblm-frm { - .form-group { display:none !important } } .gc-rprt-prblm-frm { - label[for=problem6] { display:none !important } diff --git a/sites/authentication/_base.scss b/sites/authentication/_base.scss index 1411eb583..61500d693 100644 --- a/sites/authentication/_base.scss +++ b/sites/authentication/_base.scss @@ -3,7 +3,6 @@ */ #wb-so { - .btn { border-radius: 0; margin-top: 5px; diff --git a/sites/authentication/_screen-sm-max.scss b/sites/authentication/_screen-sm-max.scss index 7a3cf235e..d2905097c 100644 --- a/sites/authentication/_screen-sm-max.scss +++ b/sites/authentication/_screen-sm-max.scss @@ -3,7 +3,6 @@ */ #wb-bnr + hr + .container { - .col-md-8 { .gcweb-menu > [role=menu] { margin-bottom: 50px; diff --git a/sites/baseline/_buttons.scss b/sites/baseline/_buttons.scss index 1d7a72848..3a5ff6eac 100644 --- a/sites/baseline/_buttons.scss +++ b/sites/baseline/_buttons.scss @@ -23,9 +23,11 @@ body { padding: .58em 1em; text-shadow: 1px 2px #333; } + .btn-call-to-action:visited { color: #fff; } + input.btn.btn-call-to-action { padding-bottom: 2em; } diff --git a/sites/baseline/_forms.scss b/sites/baseline/_forms.scss index 7211e6940..c46ff9c34 100644 --- a/sites/baseline/_forms.scss +++ b/sites/baseline/_forms.scss @@ -25,6 +25,7 @@ font-size: 1rem; line-height: 1.4375; } + form .btn:not(.btn-call-to-action), .form-control { padding: 6px 12px; } diff --git a/sites/baseline/_obselete.scss b/sites/baseline/_obselete.scss index e1eedaad6..641251d3e 100644 --- a/sites/baseline/_obselete.scss +++ b/sites/baseline/_obselete.scss @@ -22,7 +22,6 @@ */ .force-style-gcweb-4-0-29 { - h1 { margin-top: 1.25em; } @@ -93,11 +92,13 @@ form .btn.btn-lg, // line-height: ensure even-numbered height of button next to large input @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $btn-border-radius-large); } + form .btn.btn-sm, .force-style-gcweb-4-0-29 .btn.btn-sm { // line-height: ensure proper height of button next to small input @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small); } + form .btn.btn-xs, .force-style-gcweb-4-0-29 .btn.btn-xs { @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small); diff --git a/sites/baseline/_scaffolding.scss b/sites/baseline/_scaffolding.scss index bcd241470..213c9c9fa 100644 --- a/sites/baseline/_scaffolding.scss +++ b/sites/baseline/_scaffolding.scss @@ -56,19 +56,24 @@ main .cnt-wdth-lmtd { h2 { max-width: 33ch; } + h3 { max-width: 50ch; } + h4 { max-width: 59ch; } + li { max-width: 63ch; } + p, h5, h6, dt, dd { max-width: 65ch; } } + main { position: relative; } diff --git a/sites/breadcrumbs/_breadcrumb.scss b/sites/breadcrumbs/_breadcrumb.scss index 9a7e62ba5..51ec8d2f2 100644 --- a/sites/breadcrumbs/_breadcrumb.scss +++ b/sites/breadcrumbs/_breadcrumb.scss @@ -9,8 +9,8 @@ padding-left: 0; padding-right: 0; } - li { + li { &:before { content: "\e080"; padding: 0 4px 0 0; @@ -21,6 +21,7 @@ padding-left: 0; } } + a { padding: 5px 0; } diff --git a/sites/gcweb-menu/_base.scss b/sites/gcweb-menu/_base.scss index 87675606b..73b40eff6 100644 --- a/sites/gcweb-menu/_base.scss +++ b/sites/gcweb-menu/_base.scss @@ -48,7 +48,6 @@ } .gcweb-menu { - button[aria-haspopup=true] { background-color: #26374a; border: 1px solid #26374a; @@ -93,12 +92,15 @@ [role=menu] > li { border-left: #444 solid 1px; } + [role=menu] > li:first-child { border-top: #444 solid 1px; } + [role=menu] > li:last-child { border-bottom: #444 solid 1px; } + [role=menu] > li [role=menu] > li { border:none; } @@ -170,6 +172,7 @@ padding: 6px 0; text-decoration:underline; } + [role=menu] [role=menu] li [role=menuitem]:hover { color: #0535d2; } @@ -195,6 +198,7 @@ list-style: disc; padding-top: 0; } + [role=menu] [role=menu] [role=menu] { box-shadow: none; width: auto; @@ -205,23 +209,28 @@ [role=menu] [role=menu] li { width: 45%; } + [role=menu] [role=menu] li:first-child { margin-bottom: 1.5em; width: 100%; } + [role=menu] [role=menu] [role=menu] li:first-child { margin-bottom: 0; } + [role=menu] [role=menu] li:last-child { left: 400px; position: absolute; top: 4.5em; } + [role=menu] [role=menu] [role=menu] li:last-child { left: auto; position: relative; top: auto; } + [role=menu] [role=menu] [role=menu] li { width: 100%; } @@ -232,6 +241,7 @@ [role=menu] { position: static; } + [aria-haspopup=true][aria-expanded=false] + [role=menu] { display: block; } @@ -245,6 +255,7 @@ &:nth-child(2n+2) { clear:right; } + &:nth-child(2n+3) { clear:left; } @@ -258,6 +269,7 @@ content: " "; display: table; } + &:after { clear: both; } diff --git a/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss b/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss index 397436362..7327bc6d7 100644 --- a/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss +++ b/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss @@ -18,15 +18,18 @@ [role=menu] [role=menu] li { width: 100%; } + [role=menu] [role=menu] li:last-child { left: auto; margin-top: 1em; position: relative; top: auto; } + [role=menu] [role=menu] [role=menu] li:last-child { margin-top: 0; } + [role=menu] [role=menu] [role=menu] { margin-bottom: 0; padding-bottom: 0; diff --git a/sites/gcweb-menu/_screen-md-min.scss b/sites/gcweb-menu/_screen-md-min.scss index d8efcdd07..52669e133 100644 --- a/sites/gcweb-menu/_screen-md-min.scss +++ b/sites/gcweb-menu/_screen-md-min.scss @@ -34,12 +34,15 @@ &:nth-child(3n+3) { clear:right; } + &:nth-child(3n+4) { clear:left; } + &:nth-child(2n+2) { clear:none; } + &:nth-child(2n+3) { clear:none; } diff --git a/sites/gcweb-menu/_screen-sm-max.scss b/sites/gcweb-menu/_screen-sm-max.scss index bee14ff03..557052b5f 100644 --- a/sites/gcweb-menu/_screen-sm-max.scss +++ b/sites/gcweb-menu/_screen-sm-max.scss @@ -5,14 +5,12 @@ // This block is to only support GCWeb menu version 1 #wb-bnr + .gcweb-menu { - button[aria-haspopup=true] { margin-left: calc( 50% - 360px ); } } .gcweb-menu { - .container { padding: 0; width: 100%; @@ -47,9 +45,11 @@ text-decoration: underline; width: auto; } + [role=menu] { width: auto; } + [role=menu] [role=menu] { border-top: none; box-shadow: none; @@ -62,14 +62,17 @@ [role="menu"] [role="menu"] li { width: auto; } + button:hover { text-decoration: underline; } + button + [role=menu] [role="menuitem"][aria-expanded=false]:hover, button + [role=menu] [role="menuitem"][aria-expanded=false]:focus { background: transparent; color:#fff; } + button + [role=menu] [role=menu] [role="menuitem"][aria-expanded=false]:hover, button + [role=menu] [role=menu] [role="menuitem"][aria-expanded=false]:focus { color:#000; @@ -105,6 +108,7 @@ [role=treegrid] > [role=row] > [role=rowheader]::before { content: "\25BA\a0"; } + [aria-haspopup][aria-expanded=true]:not(button)::before, [role=treegrid] > [role=row][aria-expanded=true] > [role=rowheader]::before { content: "\25BC\a0"; @@ -116,12 +120,14 @@ border-bottom: 1px solid #ccc; color: #000; } + [role=menu] [role=menu] [role=menuitem], [role=menu] [role=menu] li:last-child [role=menuitem], [role=menu] [role=menu] [role=menu] li:first-child [role=menuitem] { color: #284162; text-decoration: none; } + [role=menu] [role=menu] [role=menuitem]:hover, /* default style */ [role=menu] [role=menu] [role=menuitem]:focus, /* default style */ [role=menu] [role=menu] li:first-child [role=menuitem]:hover, /*this line is an override*/ @@ -131,6 +137,7 @@ color: #000; text-decoration: underline; } + [role=menu] [role=menu] li:first-child [role=menuitem], [role=menu] [role=menu] li:last-child [role=menuitem] { background-color: #e1e1e1; @@ -143,6 +150,7 @@ position: static; top: auto; } + [role="menu"] [role="menu"] li:last-child [role="menu"] { list-style: none; } diff --git a/sites/gcweb-menu/_screen-xs-max.scss b/sites/gcweb-menu/_screen-xs-max.scss index 7654cd00a..f66b9a4b2 100644 --- a/sites/gcweb-menu/_screen-xs-max.scss +++ b/sites/gcweb-menu/_screen-xs-max.scss @@ -4,7 +4,6 @@ */ .gcweb-menu { - > [role=menu] { margin-left: -15px; margin-right: -15px; diff --git a/sites/language/_language-bar.scss b/sites/language/_language-bar.scss index 34fbed1f5..8509e66b5 100644 --- a/sites/language/_language-bar.scss +++ b/sites/language/_language-bar.scss @@ -1,5 +1,6 @@ #wb-lng { padding-top: 10px; + li { padding-right: 0; } diff --git a/sites/messages.scss b/sites/messages.scss index 81dceda91..f1976bf25 100644 --- a/sites/messages.scss +++ b/sites/messages.scss @@ -4,7 +4,6 @@ @import "variables"; .splash { - object, img { height: auto; diff --git a/sites/page-details/_base.scss b/sites/page-details/_base.scss index b04ee93d7..fa7af0cc4 100644 --- a/sites/page-details/_base.scss +++ b/sites/page-details/_base.scss @@ -27,8 +27,8 @@ a { } } } -main { +main { .pagedetails { font-size: 16px; } diff --git a/stylelint.config.js b/stylelint.config.js index fea92f8d6..c66288ac0 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -110,7 +110,6 @@ module.exports = { "no-duplicate-selectors": null, "no-invalid-position-at-import-rule": null, // Fixable, need to run sass migrator "number-max-precision": null, - "rule-empty-line-before": null, "scss/at-extend-no-missing-placeholder": null, "scss/at-mixin-argumentless-call-parentheses": null, "scss/comment-no-empty": null, diff --git a/templates/_search.scss b/templates/_search.scss index 7ba609fe3..ab22b8269 100644 --- a/templates/_search.scss +++ b/templates/_search.scss @@ -2,7 +2,6 @@ // Search template // .page-type-search { - label { font-weight: normal; } diff --git a/templates/campaign/_base.scss b/templates/campaign/_base.scss index df74ec0a7..ad74472ea 100644 --- a/templates/campaign/_base.scss +++ b/templates/campaign/_base.scss @@ -29,20 +29,17 @@ // was: ".secondary" which are now deprecated .secondary, .page-type-nav { .infostripe { - .h1 { font-size: 1.5em; } &.dbl { - .h1 { min-height: 3.1em; } } &.trpl { - .h1 { min-height: 4em; } @@ -52,7 +49,6 @@ [lang=fr] { .infostripe { - .col-md-6 { min-height: 870px !important; } diff --git a/templates/home/_base.scss b/templates/home/_base.scss index c955fb547..5e9cc0117 100644 --- a/templates/home/_base.scss +++ b/templates/home/_base.scss @@ -10,7 +10,6 @@ // Exclusive home page style .home { - h1 { font-weight: 500; margin-top: 10px; diff --git a/templates/home/_screen-sm-max.scss b/templates/home/_screen-sm-max.scss index 58328f66b..d6ea8ce01 100644 --- a/templates/home/_screen-sm-max.scss +++ b/templates/home/_screen-sm-max.scss @@ -10,6 +10,7 @@ font-size: 19px; } } + .home-your-gov { background-image: none; } diff --git a/templates/mobile-centre/_ie8.scss b/templates/mobile-centre/_ie8.scss index 7403f5020..d305007c2 100644 --- a/templates/mobile-centre/_ie8.scss +++ b/templates/mobile-centre/_ie8.scss @@ -13,7 +13,6 @@ } #mobile-centre { - .record-close { display: none; } @@ -25,7 +24,6 @@ } .product-platforms { - .label { display: inline-block; } @@ -57,7 +55,6 @@ } img { - &:hover { cursor: default; } diff --git a/templates/news/_base.scss b/templates/news/_base.scss index 2d9f1769e..ae7fef58b 100644 --- a/templates/news/_base.scss +++ b/templates/news/_base.scss @@ -7,7 +7,6 @@ */ table { &.nws-tbl { - td { display: block; } @@ -25,7 +24,6 @@ table { } tbody { - tr { background-color: $body-bg; } @@ -48,9 +46,11 @@ table { .nws-tbl .tp-rail { display:inline-block; } + .nws-tbl details summary, .nws-tbl details[open] { border: 0; } + .nws-tbl .one-dot { background: #000; border-radius: 50%; @@ -59,12 +59,14 @@ table { vertical-align: middle; width: .5em; } + .nws-tbl .tp-rail.commit { font-size: 1.15em; font-weight: 600; max-width: 67%; min-width: 67%; } + .largeview .nws-tbl .tp-rail.commit, .xlargeview .nws-tbl .tp-rail.commit { max-width: 71%; min-width: 71%; diff --git a/templates/news/_screen-sm-min.scss b/templates/news/_screen-sm-min.scss index da2d15a1a..6052c850c 100644 --- a/templates/news/_screen-sm-min.scss +++ b/templates/news/_screen-sm-min.scss @@ -3,9 +3,7 @@ @title: Small view and over (screen only) */ table { - &.nws-tbl { - td { display: inline; margin-top: 10px; diff --git a/templates/social-media-centre/_ie8.scss b/templates/social-media-centre/_ie8.scss index 7461ae2df..6171dd3a6 100644 --- a/templates/social-media-centre/_ie8.scss +++ b/templates/social-media-centre/_ie8.scss @@ -13,7 +13,6 @@ } #mobile-centre { - .record-close { display: none; } @@ -25,7 +24,6 @@ } .product-platforms { - .label { display: inline-block; } From 6851bba626ab18f4e75d2791cdb4e1e9e434d2d5 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 14 Mar 2025 00:02:33 -0400 Subject: [PATCH 09/20] fix: scss/at-mixin-argumentless-call-parentheses --- common/scaffolding/_base.scss | 2 +- common/text-level-modifiers/_base.scss | 2 +- stylelint.config.js | 1 - templates/home/_base.scss | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/scaffolding/_base.scss b/common/scaffolding/_base.scss index d0d003564..2b7860da6 100644 --- a/common/scaffolding/_base.scss +++ b/common/scaffolding/_base.scss @@ -10,7 +10,7 @@ h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6 { - @include defaults-alternative-font-family(); + @include defaults-alternative-font-family; font-variant-ligatures: no-common-ligatures; font-weight: $bold-weight; diff --git a/common/text-level-modifiers/_base.scss b/common/text-level-modifiers/_base.scss index d96ca9607..816e496a4 100644 --- a/common/text-level-modifiers/_base.scss +++ b/common/text-level-modifiers/_base.scss @@ -6,7 +6,7 @@ // Font heading .fnt-hdng { - @include defaults-alternative-font-family(); + @include defaults-alternative-font-family; } .lead { diff --git a/stylelint.config.js b/stylelint.config.js index c66288ac0..860d0055a 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -111,7 +111,6 @@ module.exports = { "no-invalid-position-at-import-rule": null, // Fixable, need to run sass migrator "number-max-precision": null, "scss/at-extend-no-missing-placeholder": null, - "scss/at-mixin-argumentless-call-parentheses": null, "scss/comment-no-empty": null, "scss/dollar-variable-empty-line-before": null, "scss/dollar-variable-pattern": null, // Fixable diff --git a/templates/home/_base.scss b/templates/home/_base.scss index 5e9cc0117..b56c8a16b 100644 --- a/templates/home/_base.scss +++ b/templates/home/_base.scss @@ -56,7 +56,7 @@ */ .home-most-requested { li { - @include defaults-alternative-font-family(); + @include defaults-alternative-font-family; font-size: 17px; font-weight: $bold-weight; From 0a1e716cc30f5deed6a714700fe5ed2633b4de89 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 14 Mar 2025 00:04:07 -0400 Subject: [PATCH 10/20] fix: scss/dollar-variable-empty-line-before --- sites/_variables.scss | 1 - stylelint.config.js | 1 - 2 files changed, 2 deletions(-) diff --git a/sites/_variables.scss b/sites/_variables.scss index 304516696..7fb16f3ed 100644 --- a/sites/_variables.scss +++ b/sites/_variables.scss @@ -73,7 +73,6 @@ $menu-colour: #555; // Spaces variables $space-0: 0px; $space-md: 15px; - $input-color-placeholder: #5c5c5c !important; // Spacers diff --git a/stylelint.config.js b/stylelint.config.js index 860d0055a..755dca7a5 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -112,7 +112,6 @@ module.exports = { "number-max-precision": null, "scss/at-extend-no-missing-placeholder": null, "scss/comment-no-empty": null, - "scss/dollar-variable-empty-line-before": null, "scss/dollar-variable-pattern": null, // Fixable "scss/double-slash-comment-empty-line-before": null, "scss/double-slash-comment-whitespace-inside": null, From 522c316d6f8b32f6a0a7e91234af94a139f1779b Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 14 Mar 2025 00:06:06 -0400 Subject: [PATCH 11/20] fix: scss/double-slash-comment-empty-line-before --- components/_provisional.scss | 2 -- components/gc-follow-us/_base.scss | 2 ++ components/gc-subway/_screen-md-min.scss | 1 + stylelint.config.js | 1 - templates/_search.scss | 1 + templates/mobile-centre/_base.scss | 3 +++ 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/_provisional.scss b/components/_provisional.scss index 4217db725..66fa10b5d 100644 --- a/components/_provisional.scss +++ b/components/_provisional.scss @@ -56,7 +56,6 @@ * (with a contrast conforming to Level AAA) */ &.pnkDy-theme { - // Page header and Menu .gcweb-menu button[aria-haspopup=true], #wb-srch button, @@ -125,7 +124,6 @@ /* Dark theme */ &.dark-theme { - // Page header and Menu .gcweb-menu button[aria-haspopup=true], #wb-srch button, diff --git a/components/gc-follow-us/_base.scss b/components/gc-follow-us/_base.scss index f7dad810f..3898a6862 100644 --- a/components/gc-follow-us/_base.scss +++ b/components/gc-follow-us/_base.scss @@ -64,6 +64,7 @@ %social-media-icons-logo-email { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAWCAYAAABOm/V6AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4gQVECMqfCsMgwAAAshJREFUSMfF1s9P02AYwPFvyxwbHRuMrYOVVgS2BRNBDfHqxXDxz/Bq4sH/QA+e/B8MR+9e/QcUMk0IMBRho4R1g7LRbmPA6mFuqLAxfj9Jk6bv276fPHnep6+QnJ3xAq+Bl0CEm41PwBsX8AJ4y+3Ec2DYBbwCCClj7O1k6Q3KRO5OXNuqlVKRjVQSr6+PXSMDMCUCIwCylkCJTWHt5smuLV4LYL9ssZFK4g9GUMYnm8/Fvyd5fX1Exx7UIetXC6mWbTLLc/gHBpG1+D9jIuDUb51jyPgklpknu750NYBKifTSVwKhKOHhGCCcQJwIry+AEptizzQw0suXByx+oS+sEFLGEQThxByx1cseyc9w/BHFnSy5zAqO41wYEAgrDERHTwW0RQB4enpRE48pbG+S13/iOLVz1UADEIqOIoitlxLP+li314eWmKaQ09nWV3FqZ0P2Sxbp5TkC4SghZawtoCMEgNsroU1Ms5vTyW+uts1IpVQkk5rHHxxsWQMXQgC4PXVIIaeT11dPrZGKXUBPJekNRpC1eEeAcyGqlRJGOoUUCFHI6+QyKWpHh81xu7CNvvKd7h4fFbuImc10XD+uzgA2RjqFRwoQUkbZL9ts/vjG4UGVbq+PWu0Qy8zROxBBVuNU7CJGJgVAf0S9fCb+B9SLVUK7/wTXHTd2cYdq2SasxpDVeHN7y2qcPdNo/B8unoljgL8JaERXlwtZS9Cuz8hqrN5jgH5ZPX8mGjXgkfwMREcv1C09kp+wGsPaaZ8R8biRH1fywX4ZI71cBwzd67jKW2ZES7BnGpgtICJQBZpN6KBaIbu+hEfyExwaObPRdBLdPT5kLYFlGqfuGhGYB9haW+Do8ICtXwt1wKCGIAg4Tu1KLrenh7AaxzKzZNcWsXZzDUNJSM7OPPtz1nPf0hHvowv4DDwF3gEPAekGFnaADPABeP8bNrJaPIc3C6EAAAAASUVORK5CYII=") } + // END: Deprecated as of version 16.0.0 $social-media-li-margin-bottom: 15px; @@ -384,4 +385,5 @@ $social-media-icons-size: 38px; @extend %social-media-icons-logo-rss; } } + // END: Deprecated as of version 16.0.0 diff --git a/components/gc-subway/_screen-md-min.scss b/components/gc-subway/_screen-md-min.scss index 4e6797e9c..e1b25c96a 100644 --- a/components/gc-subway/_screen-md-min.scss +++ b/components/gc-subway/_screen-md-min.scss @@ -57,6 +57,7 @@ .gc-subway-wrapper { float: right; + //width: calc(33.33% - .5em); width: calc(33.33% - .5em - 5px); // Revert to line above when correctly implemented } diff --git a/stylelint.config.js b/stylelint.config.js index 755dca7a5..28239df07 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -113,7 +113,6 @@ module.exports = { "scss/at-extend-no-missing-placeholder": null, "scss/comment-no-empty": null, "scss/dollar-variable-pattern": null, // Fixable - "scss/double-slash-comment-empty-line-before": null, "scss/double-slash-comment-whitespace-inside": null, "scss/load-no-partial-leading-underscore": null, "scss/no-global-function-names": null, // Fixable, need to run sass migrator diff --git a/templates/_search.scss b/templates/_search.scss index ab22b8269..67c6e0ba5 100644 --- a/templates/_search.scss +++ b/templates/_search.scss @@ -57,6 +57,7 @@ margin-top: 5px; padding-left: 5px; padding-right: 5px; + //this should also include CSS to cut off and add an expand/collapse, when there are more labels than fit on 1 row } diff --git a/templates/mobile-centre/_base.scss b/templates/mobile-centre/_base.scss index cab55ab10..0dcdd0373 100644 --- a/templates/mobile-centre/_base.scss +++ b/templates/mobile-centre/_base.scss @@ -226,14 +226,17 @@ .product-link { display: block; + // Overrides for lack of specificity of main .btn-primary in theme.scss. // Remove when theme.scss has been fixed. padding: 6px 12px !important; text-align: left; text-decoration: none; + // Overrides for lack of specificity of main .btn-primary in theme.scss. // Remove when theme.scss has been fixed. text-transform: none !important; + // Override for bootstrap no-wrap on buttons white-space: normal; From a4f5464690ac00c36077a29d8159185661ea181f Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 14 Mar 2025 00:09:16 -0400 Subject: [PATCH 12/20] fix: scss/double-slash-comment-whitespace-inside --- components/_base.scss | 4 ++-- components/_provisional.scss | 2 +- components/gc-features/_base.scss | 4 ++-- components/gc-follow-us/_base.scss | 6 +++--- components/gc-subway/_screen-md-min.scss | 2 +- sites/_variables.scss | 4 ++-- sites/messages.scss | 2 +- stylelint.config.js | 1 - templates/_search.scss | 10 +++++----- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/components/_base.scss b/components/_base.scss index 15c9ada9e..5b43f12a1 100644 --- a/components/_base.scss +++ b/components/_base.scss @@ -2,7 +2,7 @@ * Template pages styles */ -.whtwedo { //used on the topics template +.whtwedo { // used on the topics template p { font-weight: 700; @@ -17,7 +17,7 @@ } } -.lnkbx { //used on topics and theme for well in right column +.lnkbx { // used on topics and theme for well in right column >ul { >li { diff --git a/components/_provisional.scss b/components/_provisional.scss index 66fa10b5d..21f0fb736 100644 --- a/components/_provisional.scss +++ b/components/_provisional.scss @@ -108,7 +108,7 @@ } - //This color will eventually be replaced by the new colours from the alert revamp PR. + // This color will eventually be replaced by the new colours from the alert revamp PR. &.icon-warning-light, .icon-warning-light { color: #DF7200; } diff --git a/components/gc-features/_base.scss b/components/gc-features/_base.scss index 91a309650..619806dfb 100644 --- a/components/gc-features/_base.scss +++ b/components/gc-features/_base.scss @@ -32,7 +32,7 @@ } aside { - //Related site links before the footer features and after the main + // Related site links before the footer features and after the main &.site-related { h2 { font-size: 28px; @@ -40,7 +40,7 @@ aside { } } - //Footer features + // Footer features &.features { background-color: $wbGrayLight; background-image: linear-gradient(to bottom, $wbGrayLight 0%, #eaebed 100%); diff --git a/components/gc-follow-us/_base.scss b/components/gc-follow-us/_base.scss index 3898a6862..c15689bfd 100644 --- a/components/gc-follow-us/_base.scss +++ b/components/gc-follow-us/_base.scss @@ -45,7 +45,7 @@ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAAJnElEQVRYw4WXbYxdR3nHf88zc17u3b3r9a6zydqO49hgzNoiJuEl1CFNEDhV1IQqEJQPjdSG8qI6kkHiS5MGiqClpbSAKlHaKpUQoR8AUUgrFWLUkDZOwFaICTVxTBySze7a3rXX6929b+ecmacfzl3XQg4daXTu3Hvn/P/zf56Z5z/CazcFuOu+p0eSpLkHZJuajTmLeRIt82aaRPBmuBDx0aKLse8CPR9s0VfxparoHP309/ctD94XLwcil/ty67Y7dO/Nf7YP1QMI7xKz1JnhYySxiI9GYoaPhosRH8FFwwfDRXCDp48UrrL/1Cp8+Wu/+MvHDi8cjP8fAb33/Y9v8Onwwwi/qxZRapDEIkk0klgT8LEeu2gDFawmYjW4RlADQQBF4N+LqvPBjx668+ylalxKQD98+8HNLmseFGyHmqGXrDqJoQYfEPEDJdyaEgZqhrMaUhBEBEEHMAoiJ4qq+54/fOr3ZtZIXCTwR3v/pdkamjykwp4aPOAtkMRApsYVm5uMrE/JUiVx4AQUQ22QLNGgMkI/0D/Xo/3qKgRBREEUQTEEQ44udM/s3f/MfR0Av7b69en4g66q9igRZ4HEAiMjjnf+wU6m3nM12ZBHRF4zY83s4u9mRrlaMv39lznx8DGqlaImgsNE9kzmYw8CDwFRAPb/1j+OrW9sfsUThz2BJFaMTWZ84G9voTXRJIbI2RMLtE+vUHULqCIYYIYYIINIe8U3EpqTLcbeMIE4pXOqzeH9P6R/pg/iAMVEVmc7p6750LP7Fz2gY9noXZkUw7XkFYkE7vzUbzNy5RAvP/kST3/+CcLZLqkIDnAWUbNaVAOJF9eCRSNYIJlosuehdzN50zbe/Jm9PPOhxwZhdxg6fFU2ehfwzwqQEm9LY0keC3Iref3bJpjYMc65Xy5w6IH/IDnXpSXGEJGmVTSoaFhJbhU5JbkUNFxBQwuGh5VdH72RK3dcwc8+9j1WTp5ldPcVbHjrBnys8FR4q0ix29YOG82IU7mVNKyiEQu2vn0SgBe/c5RmFcgHYJmVZFaSxpLECvI0kiWRJBYk1iel4Jp7drPtw2/nui/cQUON2W89i5kx/o6NeKtqEhZIzKYA9YDmFiYaGKmVOCtZt7mFmdE5fprcShIZ7G8M54WNH7ieK++8jsbm9QB0pxeZ/+5POfPNI6wc/RWhcyMXjk6ThB79508B0NzSwllJnTwATADqt4+83udWNnNizS4WZMMJIoIur5JaRUJ9JqTDKW/80j20dm+qM32pDUBj6zhbP76P8Vt38uKBb/DMLX+BRCETj3Q6iAh+OMVZhciAgklz19A276dGd2hulU8tkFiFtxKfuHpv9nqkVuDNUItsf+C9tHZvYvXELC995tt0j80iQGP3ZrZ98m5ae7ZwzZ/czqsPfhtEgYj2CwBcpjWBKJgKhvi3jOxUHXG5plZqRklmBakV9VwgiT1S+iTWp7VjjLFb30hxdpkXP/IPyPNzDKtjSB16bI6TH/kq5flV1t/2JhrXjuGswlmFhqo+clVwWqIEnAWcBR31TdVUjNwKzSjItU/uu6gYZkbu2+TpClm6wvq9WwFYfPQQWfsCiVR4AgkRTyQ932bx0Z8A0HrH63AElIBahZmBGCrlgEQ1IGL4VEsaSYeGliTaw9NHJSIiZHkHzduIGdkVOSKCnZoly7qIeYgeqxSLghmE6QVEhGR8CEfEALE4qAmgFhGpMBFc9OpF8Inv08xXaLgKL30cBaJ1scqyLpp3EDNs5ezFhAt5B8xDcJj3WKmEUsm3jAMQzl5ALQyq3VrhM5SA4IgSECFGq1BxXZp5J+b5KnmjTZa3EaknpY0+aaNH1uxRHTuCmdG6/VaSCU+SteueruKzNulVnnXvvREzo/f0L3DEAWCsQ2AgFhACSkS0IlChq2GZNG/HLO+QZV2yvAsWMDOSRknS6OEbffTMcbpHDqGj6xj780+R7tqCZl0065BddzUTf/cJdN0wq48dhlfmUGLd3Zofqsfyfz2er5ajPzz/akyzqSr1IfVSIhQQisHeNbTfR6Q+P7pf/zxu7HNkr9vF6F99AVtZrit/q4WI0P358yx/+WGSDGIhxABkWudOv0QxzCJIQEyrHy//En9scbFKsl4vSULTSYlYCb3axvl1ObLSRwdl1seCzpfup3/z+8hvuoNkcgtglDPTtA/+gP6/HSSNjphlCIb1E1wrrwVY6Q4S0ohmGKF3vHOq8kCUpDvvUxtzUm+ReG4auIHk2u3Y/HMXCWCCCyXxiUfo/PARAhmxUrRvuJCSuZSYpbVcFnExkk1tBKCcXkAwGIQgWpwHogKxkO4Jl/ZxWYnLS8LJJzEzspvehzZA0wLNyotPn5XkeaDpuzR9jyyvcFmBSwtc2q//l/TRZqR19811XTn0PCq1J8KMbuifuEhgqWw/7rIK16hwjQivPkk4/QJu4w7Se/8a2bAByQzJB71haB7QNODSEk0qNC2RpEB8gfo+brLF+s8dIL12I71jL1P85IWBArUK58vVx9dchB7Yu2nrQ7+z5eeNnKaqIRqpWhvJ7/573MhVWAzYmeOwfBorelBVEAyLBqEOjZkDScA3kPFJ3NbtiHMUc/PM3/832ExBtJQoCT2j88WZH+36p9OHptdMXvrsA9d/8Q2TjT92qSBeQKFMRtE330e6/d1oNnxZ//da49hepf34j1j92vfQcxD6TULZoMJxsnfhK/v+5ysfB4q1WfqunaObv7F/9w/Gx/KdkijiFFSJBmV02NAmSEdBMzAHEayy2h8WEesHrFMSl3uEhSXi9ALaS7F+Tug1Cb0hyl7OYhmO33/yu7c9tfLyDBDXjgn71dleW1N35IZdE/vyVnOd5DmSZ2iW4RspiXZJwhK+XMAXp/HdU/jOHH51Frc8i7swiz8/h1s6g1tdwYX69WYeM0cIjqWimv7q3JHf/9fFYy9QBw93qbV+6oWlM3NLxRPXT101NTQ6vEXzHMkySDMkySBNEZ8iPkGcB+8Q78E5UAeqay4PM8UqIUalqJSZdve/PvvSUx98ZP65owNwu+zVDFDnZOLhP73lznfecPW9ExuG35Z451WltuAWIUQoA1YGKEusX2HdEmtXxNWKsBypliP9RatOL4TDh2YvfP3ATw8/GszmB9Y4/sbL6YBICozd8tarN95z+9SbNk20rhluJqNeJFUxrzGqVaEmUlRYv4xVp6zKdlWsnC+WZk53XvnWz2ae+++Zc3PAIlBc7oYs/Oa2pqm/5Hnx6n6ZtgZQDT5Xv77iX2//CwOk7MFopqLgAAAAAElFTkSuQmCC"); } -%social-media-icons-logo-googleplus { //This is deprecated and will be removed from later versions +%social-media-icons-logo-googleplus { // This is deprecated and will be removed from later versions background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAuCAYAAABXuSs3AAAAAXNSR0IArs4c6QAAA9lJREFUaAXtmX9IU1EUx882tznnr0ynGREpFvRfkWZ/FCRSRGQWmEgU/VF/FNEPqD8LwiAoIUihfyMoSyywoP6oDCEtqUj6IWRIhKVu/pq2qU+39zrnuvt82x6Mt+3pgl04vHPPu+/cz/t6d3bvBPhPm0GFWy2mMmzJQ5JyRiUk+aaAka+8p3xmqX0CJvMHjL1AioLC9KayvCrPZm00GYyFiviyu35JHHTNzp3e/uLtU4TxEZAxQEXqmhMRmvhISEeqpYkY0dhKUIJbEk1pguYtwGbBfjg4H5TAV1Vw5XpPVHZiDFKcQFkgUYkDXDIjX+MJzhuOlwQP10TfSFJxffUNz55UPFwTfSMxfekY7HbIPlgH9i1bwZyP+zKssvPOIfB+6AZ36z2Qpqd1o48aPG1zGeSePAdmR0EQnHVtEZBl7KgAZ1MDCD0fg+7HqxMVuG1TKRRcvgYGw8IX2dyIC2a+9zIm24aNYMlzgOT3g2/wd7w4w/JoBjek2SHv1HkGLfp8MNZ8ByYfPwCDKLLkktEI6bv3wUx3J4jjo2ETxiugGTz7QK28PCYeNcNU6/2gTQ69gPd5W0S+4rZ2NqZ/f0XEsWoDNJdDe2k5yyPiB8/dclct55LENCtuLljNwISfP/AQRcfAxcZVXIwseJ7ODnBev8I6oWN4X6vymhWXJH7YlneYoZzhfROdwePbNCvuc/4B07oSsBaV4AkQj4Dz8zLRcGOD7JuysiDv6AnW942PyfG+qp3MX//kNbvyvilQoeSBERzNinvedbGURpsNcuqOBaX3vnwG3ExmOmUtNKH3C3fx4GtgxgOhfR6PdNWs+GRbC2RU7AJL/irIrj4EEpbEiYf4IcW6zVvm3mpYUXOYdYWBX+Dp6uC35Gu0SvMEmsGlmRlw3boBhfUNYMS1m1N7BDIr98Bsfx+AKOESKpbLpYilceT2zaCX4hNrXRr8OX7VDE4PCl97YPDSBXCcuciUT1mZC+loyuZzT4ALoYVvn5XhuPlRgdPsBD9w9jhkVtWAvWwbWAvXBDZZw+D99B4m8ctJ+jsVN9DQRFGDs0S4bKZwfZPxIglYLvkeJnSyePZjA1eQyFVdY1lTpNDkai6HmrLrODgJrqO4qqmTiqvKomMwqbiO4qqmTiquKouOQaXioiD6XTrOFVPqANvCTwmYiYPTVsPXPjR6VfD7R2KaQYeHienV8Fg9MaKxbRHfYtALpKPlo+WgpaLxe+guayPQWbRxNCeaB03kmyy6KaC5KYhG5y7+10B3WRvxzKHRHpkYgxTHPgOlf4ASNL1QIilOS4Tg6WTO1vk/yrUG/vk8ZeYAAAAASUVORK5CYII="); } @@ -204,7 +204,7 @@ $social-media-icons-size: 38px; } // START: Deprecated as of version 16.0.0 -//removes the icon to the share widget +// removes the icon to the share widget .shr-pg { a { background-image: none; @@ -370,7 +370,7 @@ $social-media-icons-size: 38px; @extend %social-media-icons-logo-instagram; } - &.googleplus { //This is deprecated and will be removed from later versions + &.googleplus { // This is deprecated and will be removed from later versions @extend %social-media-icons-logo-googleplus; height: 45px; diff --git a/components/gc-subway/_screen-md-min.scss b/components/gc-subway/_screen-md-min.scss index e1b25c96a..0ccf320cd 100644 --- a/components/gc-subway/_screen-md-min.scss +++ b/components/gc-subway/_screen-md-min.scss @@ -58,7 +58,7 @@ .gc-subway-wrapper { float: right; - //width: calc(33.33% - .5em); + // width: calc(33.33% - .5em); width: calc(33.33% - .5em - 5px); // Revert to line above when correctly implemented } diff --git a/sites/_variables.scss b/sites/_variables.scss index 7fb16f3ed..6c9a35e71 100644 --- a/sites/_variables.scss +++ b/sites/_variables.scss @@ -51,7 +51,7 @@ $small-size: 87%; $normal-weight: 400; $bold-weight: 700; -//Breadcrumb +// Breadcrumb $breadcrumb-bg: transparent; // Inner background colour (Bootstrap override). $wb-bc-separator-content: ">"; // GCWeb v5 $wb-bc-separator-content-rtl: "<"; // GCWeb v5 @@ -60,7 +60,7 @@ $wb-bc-separator-font-size: .7em; // GCWeb v5 // Forms $wb-forms-asterisk-width: .87em; // Asterisk offset for required field labels. -//Heading links on landing pages +// Heading links on landing pages $heading-link: 20px; // same as h5 $heading-link-mrgn-tp: 23px; diff --git a/sites/messages.scss b/sites/messages.scss index f1976bf25..81be924c4 100644 --- a/sites/messages.scss +++ b/sites/messages.scss @@ -1,6 +1,6 @@ // Welcome page styles -//Variables +// Variables @import "variables"; .splash { diff --git a/stylelint.config.js b/stylelint.config.js index 28239df07..cde857a37 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -113,7 +113,6 @@ module.exports = { "scss/at-extend-no-missing-placeholder": null, "scss/comment-no-empty": null, "scss/dollar-variable-pattern": null, // Fixable - "scss/double-slash-comment-whitespace-inside": null, "scss/load-no-partial-leading-underscore": null, "scss/no-global-function-names": null, // Fixable, need to run sass migrator "selector-attribute-quotes": null, diff --git a/templates/_search.scss b/templates/_search.scss index 67c6e0ba5..4d5c06376 100644 --- a/templates/_search.scss +++ b/templates/_search.scss @@ -52,18 +52,18 @@ .label li { background-color: #5e738b; color: white; - font-size: .8em; //16px + font-size: .8em; // 16px font-weight: bold; margin-top: 5px; padding-left: 5px; padding-right: 5px; - //this should also include CSS to cut off and add an expand/collapse, when there are more labels than fit on 1 row + // this should also include CSS to cut off and add an expand/collapse, when there are more labels than fit on 1 row } .expand-collapse-buttons { color: white; - font-size: .8em; //16px + font-size: .8em; // 16px font-weight: bold; padding-left: 5px; padding-right: 5px; @@ -72,11 +72,11 @@ cite a { color: #006621; display: inline-block; - font-size: 1em; //20px + font-size: 1em; // 20px margin-top: 10px; } - .search-description { //should be in noto sans, 20px, like standard p tag + .search-description { // should be in noto sans, 20px, like standard p tag line-height: 34px; padding-bottom: 8px; padding-top: 8px; From b5323691965892363caecebe14163535b9f96962 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 14 Mar 2025 00:10:12 -0400 Subject: [PATCH 13/20] fix: scss/load-no-partial-leading-underscore --- sites/theme.scss | 2 +- stylelint.config.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sites/theme.scss b/sites/theme.scss index fce687f1c..43d7f3aa7 100644 --- a/sites/theme.scss +++ b/sites/theme.scss @@ -317,7 +317,7 @@ @import "../templates/campaign/screen-sm-min"; @import "wet-boew/src/base/proximity/screen-sm-min"; - @import "wet-boew/src/base/views/_bootstrap-4-screen-sm-min"; + @import "wet-boew/src/base/views/bootstrap-4-screen-sm-min"; @import "../common/spacing/screen-sm-min"; } diff --git a/stylelint.config.js b/stylelint.config.js index cde857a37..567220ba4 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -113,7 +113,6 @@ module.exports = { "scss/at-extend-no-missing-placeholder": null, "scss/comment-no-empty": null, "scss/dollar-variable-pattern": null, // Fixable - "scss/load-no-partial-leading-underscore": null, "scss/no-global-function-names": null, // Fixable, need to run sass migrator "selector-attribute-quotes": null, "selector-class-pattern": null, From 6ab38908b4f60519b0b3e25b65c6dbf2076356f0 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 14 Mar 2025 00:10:57 -0400 Subject: [PATCH 14/20] fix: selector-attribute-quotes --- common/list/_lists.scss | 2 +- components/_provisional.scss | 24 +++--- components/baseline/_wb-tables.scss | 2 +- components/gc-chckbxrdio/_base.scss | 4 +- components/gc-features/_screen.scss | 2 +- components/header-rwd/_screen-xs-max.scss | 2 +- components/wb-chtwzrd/_base.scss | 2 +- components/wb5-click-postback/_base.scss | 2 +- sites/authentication/_screen-sm-max.scss | 2 +- sites/banner/_base.scss | 2 +- sites/footers/_base.scss | 8 +- sites/gcweb-menu/_base.scss | 78 +++++++++---------- .../_screen-md-min-to-screen-md-max.scss | 10 +-- sites/gcweb-menu/_screen-md-min.scss | 6 +- sites/gcweb-menu/_screen-sm-max.scss | 74 +++++++++--------- sites/gcweb-menu/_screen-xs-max.scss | 4 +- sites/language/_language-bar.scss | 2 +- sites/search/_base.scss | 2 +- sites/secondary-menu/_base.scss | 2 +- stylelint.config.js | 1 - templates/campaign/_base.scss | 2 +- wet-boew/formvalid/_base.scss | 2 +- 22 files changed, 117 insertions(+), 118 deletions(-) diff --git a/common/list/_lists.scss b/common/list/_lists.scss index d496af339..fae22b4bb 100644 --- a/common/list/_lists.scss +++ b/common/list/_lists.scss @@ -42,7 +42,7 @@ * - _screen-md-min * - _screen-lg-min */ -ul[class*=list-col] { +ul[class*="list-col"] { display: flex; flex-wrap: wrap; list-style: none; diff --git a/components/_provisional.scss b/components/_provisional.scss index 21f0fb736..95d645afa 100644 --- a/components/_provisional.scss +++ b/components/_provisional.scss @@ -57,14 +57,14 @@ */ &.pnkDy-theme { // Page header and Menu - .gcweb-menu button[aria-haspopup=true], + .gcweb-menu button[aria-haspopup="true"], #wb-srch button, .srchbox button { background-color: #AD005F; border-color:#AD005F; } - .gcweb-menu button[aria-haspopup=true]:focus, .gcweb-menu button[aria-haspopup=true]:hover, + .gcweb-menu button[aria-haspopup="true"]:focus, .gcweb-menu button[aria-haspopup="true"]:hover, #wb-srch button:focus, #wb-srch button:hover, .srchbox button:focus, .srchbox button:hover { background-color: #570030; @@ -78,17 +78,17 @@ // Home page Menu &.home .gcweb-menu { - button[aria-haspopup=true] { + button[aria-haspopup="true"] { background-color: #fff; border-color:#fff; } - button[aria-haspopup=true] { + button[aria-haspopup="true"] { color: #AD005F; } - button[aria-haspopup=true]:focus, - button[aria-haspopup=true]:hover { + button[aria-haspopup="true"]:focus, + button[aria-haspopup="true"]:hover { background-color: #AD005F; border-color:#AD005F; color: #fff; @@ -125,7 +125,7 @@ */ &.dark-theme { // Page header and Menu - .gcweb-menu button[aria-haspopup=true], + .gcweb-menu button[aria-haspopup="true"], #wb-srch button, .srchbox button { background-color: #000; @@ -133,7 +133,7 @@ color: #fff; } - .gcweb-menu button[aria-haspopup=true]:focus, .gcweb-menu button[aria-haspopup=true]:hover, + .gcweb-menu button[aria-haspopup="true"]:focus, .gcweb-menu button[aria-haspopup="true"]:hover, #wb-srch button:focus, #wb-srch button:hover, .srchbox button:focus, .srchbox button:hover { background-color: #000; @@ -147,17 +147,17 @@ // Home page Menu &.home .gcweb-menu { - button[aria-haspopup=true] { + button[aria-haspopup="true"] { background-color: #fff; border-color:#fff; } - button[aria-haspopup=true] { + button[aria-haspopup="true"] { color: #000; } - button[aria-haspopup=true]:focus, - button[aria-haspopup=true]:hover { + button[aria-haspopup="true"]:focus, + button[aria-haspopup="true"]:hover { background-color: #000; border-color:#000; color: #fff; diff --git a/components/baseline/_wb-tables.scss b/components/baseline/_wb-tables.scss index 0a72091b2..90a6a5cf1 100644 --- a/components/baseline/_wb-tables.scss +++ b/components/baseline/_wb-tables.scss @@ -11,6 +11,6 @@ font-size: 17px; // To ensure the controls don't overflow on a second row in a col-md-8 } -.dataTables_wrapper .top [type=search]{ +.dataTables_wrapper .top [type="search"]{ max-width: 205px; } diff --git a/components/gc-chckbxrdio/_base.scss b/components/gc-chckbxrdio/_base.scss index acf168b10..564edbb47 100644 --- a/components/gc-chckbxrdio/_base.scss +++ b/components/gc-chckbxrdio/_base.scss @@ -149,7 +149,7 @@ fieldset.gc-chckbxrdio { } @media (prefers-contrast: more) { .gc-chckbxrdio { - input[type=checkbox] { + input[type="checkbox"] { &:focus+label { &::before { border: 5px double #000; @@ -157,7 +157,7 @@ fieldset.gc-chckbxrdio { } } - input[type=radio] { + input[type="radio"] { &:focus+label { &::before { border: 5px double #000; diff --git a/components/gc-features/_screen.scss b/components/gc-features/_screen.scss index ce884a8f9..016f29de5 100644 --- a/components/gc-features/_screen.scss +++ b/components/gc-features/_screen.scss @@ -28,7 +28,7 @@ } } -[dir=rtl] { +[dir="rtl"] { .gc-nttvs { h3 { float: right; diff --git a/components/header-rwd/_screen-xs-max.scss b/components/header-rwd/_screen-xs-max.scss index b85e370fc..8d1374209 100644 --- a/components/header-rwd/_screen-xs-max.scss +++ b/components/header-rwd/_screen-xs-max.scss @@ -6,7 +6,7 @@ /* * Well header responsive */ -[class*=col-] .well.header-rwd[class*=pstn-] { +[class*="col-"] .well.header-rwd[class*="pstn-"] { left: 15px; right: 15px; width: inherit; diff --git a/components/wb-chtwzrd/_base.scss b/components/wb-chtwzrd/_base.scss index dac764e36..31948ce1d 100644 --- a/components/wb-chtwzrd/_base.scss +++ b/components/wb-chtwzrd/_base.scss @@ -275,7 +275,7 @@ margin-bottom: 0; } -.wb-chtwzrd-container .choices input[type=radio]:checked + span { +.wb-chtwzrd-container .choices input[type="radio"]:checked + span { color: #333; } diff --git a/components/wb5-click-postback/_base.scss b/components/wb5-click-postback/_base.scss index 3daa793cc..3690956a3 100644 --- a/components/wb5-click-postback/_base.scss +++ b/components/wb5-click-postback/_base.scss @@ -24,7 +24,7 @@ } .gc-rprt-prblm-frm { - label[for=problem6] { + label[for="problem6"] { display:none !important } } diff --git a/sites/authentication/_screen-sm-max.scss b/sites/authentication/_screen-sm-max.scss index d2905097c..bd176e1dd 100644 --- a/sites/authentication/_screen-sm-max.scss +++ b/sites/authentication/_screen-sm-max.scss @@ -4,7 +4,7 @@ #wb-bnr + hr + .container { .col-md-8 { - .gcweb-menu > [role=menu] { + .gcweb-menu > [role="menu"] { margin-bottom: 50px; } } diff --git a/sites/banner/_base.scss b/sites/banner/_base.scss index c32301c15..5beb88a5b 100644 --- a/sites/banner/_base.scss +++ b/sites/banner/_base.scss @@ -57,7 +57,7 @@ header { } } -[dir=rtl] { +[dir="rtl"] { header { .brand { float: right; diff --git a/sites/footers/_base.scss b/sites/footers/_base.scss index d70c30470..ffc2a0fb8 100644 --- a/sites/footers/_base.scss +++ b/sites/footers/_base.scss @@ -144,7 +144,7 @@ .wtrmrk { text-align: right; - [dir=rtl] & { + [dir="rtl"] & { text-align: left; } } @@ -161,7 +161,7 @@ display: inline-block; margin-right: .5em; - [dir=rtl] & { + [dir="rtl"] & { margin-left: .5em; margin-right: 0; } @@ -170,7 +170,7 @@ content: "\2022"; margin-right: .75em; - [dir=rtl] & { + [dir="rtl"] & { margin-left: .75em; margin-right: 0; } @@ -199,7 +199,7 @@ } } - [dir=rtl] & { + [dir="rtl"] & { float: right; a span { diff --git a/sites/gcweb-menu/_base.scss b/sites/gcweb-menu/_base.scss index 73b40eff6..95dcfee1d 100644 --- a/sites/gcweb-menu/_base.scss +++ b/sites/gcweb-menu/_base.scss @@ -8,7 +8,7 @@ .home .gcweb-menu { color: #284162; - button[aria-haspopup=true] { + button[aria-haspopup="true"] { background-color: #fff; border-color: #fff; color: #284162; @@ -48,7 +48,7 @@ } .gcweb-menu { - button[aria-haspopup=true] { + button[aria-haspopup="true"] { background-color: #26374a; border: 1px solid #26374a; color: #fff; @@ -57,31 +57,31 @@ text-transform: uppercase; } - button[aria-haspopup=true]:hover, - button[aria-haspopup=true][aria-expanded=true] { + button[aria-haspopup="true"]:hover, + button[aria-haspopup="true"][aria-expanded="true"] { background-color: #444; border-color: #444; color: #fff; } - button[aria-haspopup=true]:focus { + button[aria-haspopup="true"]:focus { background-color: #fff; border: 1px dotted #555; color: #333; } - [aria-haspopup=true][aria-expanded=false] + [role=menu] { + [aria-haspopup="true"][aria-expanded="false"] + [role="menu"] { display: none; } - button[aria-haspopup=true][aria-expanded=true] + [role=menu] { + button[aria-haspopup="true"][aria-expanded="true"] + [role="menu"] { z-index: 9999; } /* * Level 1 */ - [role=menu] { + [role="menu"] { background-color: #444; color: #fff; list-style: none; @@ -89,30 +89,30 @@ position: absolute; } - [role=menu] > li { + [role="menu"] > li { border-left: #444 solid 1px; } - [role=menu] > li:first-child { + [role="menu"] > li:first-child { border-top: #444 solid 1px; } - [role=menu] > li:last-child { + [role="menu"] > li:last-child { border-bottom: #444 solid 1px; } - [role=menu] > li [role=menu] > li { + [role="menu"] > li [role="menu"] > li { border:none; } - [role=menuitem] { + [role="menuitem"] { display: block; padding: 14px 30px; width: 360px; } - [role=menuitem], - [role=menuitem]:visited { + [role="menuitem"], + [role="menuitem"]:visited { border-bottom: 1px solid #555; color: #fff; font-size:18px; @@ -120,13 +120,13 @@ } - li:last-child [role=menuitem] { + li:last-child [role="menuitem"] { border-bottom: none; } - [role=menuitem]:hover, - [role=menuitem][aria-expanded=true] + [role=menu] [role=menuitem]:focus, - [role=menuitem][aria-expanded=true] { + [role="menuitem"]:hover, + [role="menuitem"][aria-expanded="true"] + [role="menu"] [role="menuitem"]:focus, + [role="menuitem"][aria-expanded="true"] { background-color: #fff; color: #333; } @@ -135,7 +135,7 @@ * Level 2 */ - [role=menu] [role=menu] { + [role="menu"] [role="menu"] { background-color: #fff; border-top: #eee solid 1px; box-shadow: 10px 10px 10px 5px rgba(0, 0, 0, .1); @@ -148,44 +148,44 @@ width: 810px; } - [role=menu] [role=menu] [role=menu] { + [role="menu"] [role="menu"] [role="menu"] { border-top: none; min-height: auto; } - [role=menu] [role=menu] [role=menuitem] { + [role="menu"] [role="menu"] [role="menuitem"] { border-bottom: none; color: #000; width: auto; } - [role=menu] [role=menu] [role=menu] { + [role="menu"] [role="menu"] [role="menu"] { left: auto; top: auto; } /* The rest of items */ - [role=menu] [role=menu] li [role=menuitem] { + [role="menu"] [role="menu"] li [role="menuitem"] { color: #284162; padding: 6px 0; text-decoration:underline; } - [role=menu] [role=menu] li [role=menuitem]:hover { + [role="menu"] [role="menu"] li [role="menuitem"]:hover { color: #0535d2; } /* First menu item (represent the home link */ - [role=menu] [role=menu] li:first-child [role=menuitem] { + [role="menu"] [role="menu"] li:first-child [role="menuitem"] { font-size: 32px; font-weight: $bold-weight; text-decoration: underline; } /* Undo for lower level */ - [role=menu] [role=menu] [role=menu] li:first-child [role=menuitem] { + [role="menu"] [role="menu"] [role="menu"] li:first-child [role="menuitem"] { font-size: 18px; font-weight: 400; text-decoration: underline; @@ -194,59 +194,59 @@ /* SubSubMenu (MostRequested) for more interoperability, use CSS class */ - [role=menu] [role=menu] li:last-child [role=menu] { + [role="menu"] [role="menu"] li:last-child [role="menu"] { list-style: disc; padding-top: 0; } - [role=menu] [role=menu] [role=menu] { + [role="menu"] [role="menu"] [role="menu"] { box-shadow: none; width: auto; } /* Grid of the submenu panel */ - [role=menu] [role=menu] li { + [role="menu"] [role="menu"] li { width: 45%; } - [role=menu] [role=menu] li:first-child { + [role="menu"] [role="menu"] li:first-child { margin-bottom: 1.5em; width: 100%; } - [role=menu] [role=menu] [role=menu] li:first-child { + [role="menu"] [role="menu"] [role="menu"] li:first-child { margin-bottom: 0; } - [role=menu] [role=menu] li:last-child { + [role="menu"] [role="menu"] li:last-child { left: 400px; position: absolute; top: 4.5em; } - [role=menu] [role=menu] [role=menu] li:last-child { + [role="menu"] [role="menu"] [role="menu"] li:last-child { left: auto; position: relative; top: auto; } - [role=menu] [role=menu] [role=menu] li { + [role="menu"] [role="menu"] [role="menu"] li { width: 100%; } } // Open by default in basic HTML mode .wb-disable .gcweb-menu { - [role=menu] { + [role="menu"] { position: static; } - [aria-haspopup=true][aria-expanded=false] + [role=menu] { + [aria-haspopup="true"][aria-expanded="false"] + [role="menu"] { display: block; } - [role=menu] { + [role="menu"] { > li { float: left; padding-right: 5px; @@ -595,7 +595,7 @@ } } -[dir=rtl] { +[dir="rtl"] { #wb-sm { .menu { > { diff --git a/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss b/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss index 7327bc6d7..737a2fe0c 100644 --- a/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss +++ b/sites/gcweb-menu/_screen-md-min-to-screen-md-max.scss @@ -11,26 +11,26 @@ */ // avoid horizontal scroll on medium breakpoint - [role=menu] [role=menu] { + [role="menu"] [role="menu"] { width: 610px; } - [role=menu] [role=menu] li { + [role="menu"] [role="menu"] li { width: 100%; } - [role=menu] [role=menu] li:last-child { + [role="menu"] [role="menu"] li:last-child { left: auto; margin-top: 1em; position: relative; top: auto; } - [role=menu] [role=menu] [role=menu] li:last-child { + [role="menu"] [role="menu"] [role="menu"] li:last-child { margin-top: 0; } - [role=menu] [role=menu] [role=menu] { + [role="menu"] [role="menu"] [role="menu"] { margin-bottom: 0; padding-bottom: 0; position: relative; diff --git a/sites/gcweb-menu/_screen-md-min.scss b/sites/gcweb-menu/_screen-md-min.scss index 52669e133..e302e42aa 100644 --- a/sites/gcweb-menu/_screen-md-min.scss +++ b/sites/gcweb-menu/_screen-md-min.scss @@ -10,8 +10,8 @@ * * Todo: check to use this CSS selector: [data-keep-expanded=md-min][role=menuitem][aria-haspopup=true] */ - [role=menu] [role=menu] [role=menuitem][aria-haspopup=true], - [role=menu] [role=menu] [role=menuitem][aria-haspopup=true]:hover { + [role="menu"] [role="menu"] [role="menuitem"][aria-haspopup="true"], + [role="menu"] [role="menu"] [role="menuitem"][aria-haspopup="true"]:hover { color: #000; font-size: 20px; font-weight: $bold-weight; @@ -26,7 +26,7 @@ } // Open by default in basic HTML mode into 3 column -.wb-disable .gcweb-menu [role=menu] > li { +.wb-disable .gcweb-menu [role="menu"] > li { float: left; padding-right: 5px; width: 30%; diff --git a/sites/gcweb-menu/_screen-sm-max.scss b/sites/gcweb-menu/_screen-sm-max.scss index 557052b5f..6c88d423e 100644 --- a/sites/gcweb-menu/_screen-sm-max.scss +++ b/sites/gcweb-menu/_screen-sm-max.scss @@ -5,7 +5,7 @@ // This block is to only support GCWeb menu version 1 #wb-bnr + .gcweb-menu { - button[aria-haspopup=true] { + button[aria-haspopup="true"] { margin-left: calc( 50% - 360px ); } } @@ -20,17 +20,17 @@ * Mobile - first level */ - [role=menu] { + [role="menu"] { position: static; } - button[aria-haspopup=true] { - &[aria-expanded=true] + [role=menu] { + button[aria-haspopup="true"] { + &[aria-expanded="true"] + [role="menu"] { border-right: #eee solid 1px; } } - [role=menuitem] { + [role="menuitem"] { width: auto; } @@ -39,18 +39,18 @@ */ /* Reset the style set by the panel */ - [role=menu] [role=menu] li:first-child [role=menuitem] { + [role="menu"] [role="menu"] li:first-child [role="menuitem"] { font-size: 18px; font-weight: 400; text-decoration: underline; width: auto; } - [role=menu] { + [role="menu"] { width: auto; } - [role=menu] [role=menu] { + [role="menu"] [role="menu"] { border-top: none; box-shadow: none; margin-bottom: 0; @@ -67,14 +67,14 @@ text-decoration: underline; } - button + [role=menu] [role="menuitem"][aria-expanded=false]:hover, - button + [role=menu] [role="menuitem"][aria-expanded=false]:focus { + button + [role="menu"] [role="menuitem"][aria-expanded="false"]:hover, + button + [role="menu"] [role="menuitem"][aria-expanded="false"]:focus { background: transparent; color:#fff; } - button + [role=menu] [role=menu] [role="menuitem"][aria-expanded=false]:hover, - button + [role=menu] [role=menu] [role="menuitem"][aria-expanded=false]:focus { + button + [role="menu"] [role="menu"] [role="menuitem"][aria-expanded="false"]:hover, + button + [role="menu"] [role="menu"] [role="menuitem"][aria-expanded="false"]:focus { color:#000; } @@ -89,57 +89,57 @@ padding-top: 14px; } - [aria-expanded=true]:not(button) + [role=menu] li { + [aria-expanded="true"]:not(button) + [role="menu"] li { margin-left: 65px; } - [aria-expanded=true]:not(button) + [role=menu] li:first-child [role=menuitem], - [aria-expanded=true]:not(button) + [role=menu] li:last-child [role=menuitem] { + [aria-expanded="true"]:not(button) + [role="menu"] li:first-child [role="menuitem"], + [aria-expanded="true"]:not(button) + [role="menu"] li:last-child [role="menuitem"] { padding-left: 65px; } - [aria-expanded=true]:not(button) + [role=menu] li:first-child, - [aria-expanded=true]:not(button) + [role=menu] li:last-child { + [aria-expanded="true"]:not(button) + [role="menu"] li:first-child, + [aria-expanded="true"]:not(button) + [role="menu"] li:last-child { margin-left: 0; } /* Arrow for menu item with submenu */ [aria-haspopup]:not(button)::before, - [role=treegrid] > [role=row] > [role=rowheader]::before { + [role="treegrid"] > [role="row"] > [role="rowheader"]::before { content: "\25BA\a0"; } - [aria-haspopup][aria-expanded=true]:not(button)::before, - [role=treegrid] > [role=row][aria-expanded=true] > [role=rowheader]::before { + [aria-haspopup][aria-expanded="true"]:not(button)::before, + [role="treegrid"] > [role="row"][aria-expanded="true"] > [role="rowheader"]::before { content: "\25BC\a0"; } /* Menu text style */ - [role=menu] [role=menu] [role=menuitem], /* default style */ - [role=menu] [role=menu] li:first-child [role=menuitem] /*this line is an override*/ { + [role="menu"] [role="menu"] [role="menuitem"], /* default style */ + [role="menu"] [role="menu"] li:first-child [role="menuitem"] /*this line is an override*/ { border-bottom: 1px solid #ccc; color: #000; } - [role=menu] [role=menu] [role=menuitem], - [role=menu] [role=menu] li:last-child [role=menuitem], - [role=menu] [role=menu] [role=menu] li:first-child [role=menuitem] { + [role="menu"] [role="menu"] [role="menuitem"], + [role="menu"] [role="menu"] li:last-child [role="menuitem"], + [role="menu"] [role="menu"] [role="menu"] li:first-child [role="menuitem"] { color: #284162; text-decoration: none; } - [role=menu] [role=menu] [role=menuitem]:hover, /* default style */ - [role=menu] [role=menu] [role=menuitem]:focus, /* default style */ - [role=menu] [role=menu] li:first-child [role=menuitem]:hover, /*this line is an override*/ - [role=menu] [role=menu] li:first-child [role=menuitem]:focus, /*this line is an override*/ - [role=menu] [role=menu] li:last-child [role=menuitem]:hover, - [role=menu] [role=menu] li:last-child [role=menuitem]:focus { + [role="menu"] [role="menu"] [role="menuitem"]:hover, /* default style */ + [role="menu"] [role="menu"] [role="menuitem"]:focus, /* default style */ + [role="menu"] [role="menu"] li:first-child [role="menuitem"]:hover, /*this line is an override*/ + [role="menu"] [role="menu"] li:first-child [role="menuitem"]:focus, /*this line is an override*/ + [role="menu"] [role="menu"] li:last-child [role="menuitem"]:hover, + [role="menu"] [role="menu"] li:last-child [role="menuitem"]:focus { color: #000; text-decoration: underline; } - [role=menu] [role=menu] li:first-child [role=menuitem], - [role=menu] [role=menu] li:last-child [role=menuitem] { + [role="menu"] [role="menu"] li:first-child [role="menuitem"], + [role="menu"] [role="menu"] li:last-child [role="menuitem"] { background-color: #e1e1e1; } @@ -155,19 +155,19 @@ list-style: none; } - [aria-expanded=true] + [role=menu] [role=menu] [role=menu] { + [aria-expanded="true"] + [role="menu"] [role="menu"] [role="menu"] { background-color: #e1e1e1; } - [aria-expanded=true]:not(button) + [role=menu] [role=menu] li { + [aria-expanded="true"]:not(button) + [role="menu"] [role="menu"] li { margin-left: 100px; } - [aria-expanded=true]:not(button) + [role=menu] li:last-child [role=menu] [role=menuitem] { + [aria-expanded="true"]:not(button) + [role="menu"] li:last-child [role="menu"] [role="menuitem"] { padding-left: 0; } - [role=menu] [role=menu] [role=menu] li { + [role="menu"] [role="menu"] [role="menu"] li { width: auto; } } diff --git a/sites/gcweb-menu/_screen-xs-max.scss b/sites/gcweb-menu/_screen-xs-max.scss index f66b9a4b2..c24116456 100644 --- a/sites/gcweb-menu/_screen-xs-max.scss +++ b/sites/gcweb-menu/_screen-xs-max.scss @@ -4,7 +4,7 @@ */ .gcweb-menu { - > [role=menu] { + > [role="menu"] { margin-left: -15px; margin-right: -15px; } @@ -16,7 +16,7 @@ margin-left: 15px !important; } - > [role=menu] { + > [role="menu"] { margin-left: 0; margin-right: 0; } diff --git a/sites/language/_language-bar.scss b/sites/language/_language-bar.scss index 8509e66b5..b24f3d2a5 100644 --- a/sites/language/_language-bar.scss +++ b/sites/language/_language-bar.scss @@ -12,7 +12,7 @@ } } -[dir=rtl] { +[dir="rtl"] { #wb-lng { text-align: left; diff --git a/sites/search/_base.scss b/sites/search/_base.scss index 484aabc48..3f466979f 100644 --- a/sites/search/_base.scss +++ b/sites/search/_base.scss @@ -56,7 +56,7 @@ margin-left: 5px; } -[dir=rtl] { +[dir="rtl"] { #wb-srch { text-align: left; diff --git a/sites/secondary-menu/_base.scss b/sites/secondary-menu/_base.scss index fb8f3b684..6e79da61c 100644 --- a/sites/secondary-menu/_base.scss +++ b/sites/secondary-menu/_base.scss @@ -84,7 +84,7 @@ } } -[dir=rtl] { +[dir="rtl"] { #wb-sec { .list-group { .list-group { diff --git a/stylelint.config.js b/stylelint.config.js index 567220ba4..a5573b53a 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -114,7 +114,6 @@ module.exports = { "scss/comment-no-empty": null, "scss/dollar-variable-pattern": null, // Fixable "scss/no-global-function-names": null, // Fixable, need to run sass migrator - "selector-attribute-quotes": null, "selector-class-pattern": null, "selector-id-pattern": null, "selector-not-notation": null, diff --git a/templates/campaign/_base.scss b/templates/campaign/_base.scss index ad74472ea..d08a99648 100644 --- a/templates/campaign/_base.scss +++ b/templates/campaign/_base.scss @@ -47,7 +47,7 @@ } } -[lang=fr] { +[lang="fr"] { .infostripe { .col-md-6 { min-height: 870px !important; diff --git a/wet-boew/formvalid/_base.scss b/wet-boew/formvalid/_base.scss index 7c82bf1f2..f867267ec 100644 --- a/wet-boew/formvalid/_base.scss +++ b/wet-boew/formvalid/_base.scss @@ -8,7 +8,7 @@ */ .wb-frmvld { - section[id^=errors-] { + section[id^="errors-"] { h2 { font-size: 1.75em; } From cd967e306cb8ee256dcf3c87d0481253cb132623 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 14 Mar 2025 00:14:52 -0400 Subject: [PATCH 15/20] fix: selector-type-no-unknown --- "m\303\251li-m\303\251lo/@sample/wb-bonjour.scss" | 5 +---- stylelint.config.js | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git "a/m\303\251li-m\303\251lo/@sample/wb-bonjour.scss" "b/m\303\251li-m\303\251lo/@sample/wb-bonjour.scss" index 013944203..37d9182a9 100644 --- "a/m\303\251li-m\303\251lo/@sample/wb-bonjour.scss" +++ "b/m\303\251li-m\303\251lo/@sample/wb-bonjour.scss" @@ -1,9 +1,6 @@ ---- ---- - // Increase the font-size inside the em p { em.wb-bonjour { font-size: 200%; } -} \ No newline at end of file +} diff --git a/stylelint.config.js b/stylelint.config.js index a5573b53a..e0bd4a0bc 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -118,7 +118,6 @@ module.exports = { "selector-id-pattern": null, "selector-not-notation": null, "selector-pseudo-element-colon-notation": null, - "selector-type-no-unknown": null, "shorthand-property-no-redundant-values": null, "value-keyword-case": null } From 13e294497f80ee202ee64f654ba86c2d3d02c7f8 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 14 Mar 2025 00:15:34 -0400 Subject: [PATCH 16/20] fix: shorthand-property-no-redundant-values --- sites/gcweb-menu/_base.scss | 2 +- stylelint.config.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sites/gcweb-menu/_base.scss b/sites/gcweb-menu/_base.scss index 95dcfee1d..185b795f1 100644 --- a/sites/gcweb-menu/_base.scss +++ b/sites/gcweb-menu/_base.scss @@ -143,7 +143,7 @@ left:360px; margin-bottom: 25px; min-height: 815px; - padding: 0 39px 24px 39px; + padding: 0 39px 24px; top: 0; width: 810px; } diff --git a/stylelint.config.js b/stylelint.config.js index e0bd4a0bc..74609ac07 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -118,7 +118,6 @@ module.exports = { "selector-id-pattern": null, "selector-not-notation": null, "selector-pseudo-element-colon-notation": null, - "shorthand-property-no-redundant-values": null, "value-keyword-case": null } } From 1f024c156fe07c0bf8f6c2544a1cfa0bba769e59 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 10:49:40 -0400 Subject: [PATCH 17/20] build: add CI job for CSS/SCSS linting --- .github/workflows/lint-css.yml | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/lint-css.yml diff --git a/.github/workflows/lint-css.yml b/.github/workflows/lint-css.yml new file mode 100644 index 000000000..aacc312d2 --- /dev/null +++ b/.github/workflows/lint-css.yml @@ -0,0 +1,43 @@ +name: CSS Linting +on: + push: + branches-ignore: + - "dependabot/**" + paths: + - "package*.json" + - "Gruntfile.coffee" + - "stylelint.config.js" + - "**/*.css" + - "**/*.scss" + - ".github/workflows/lint-css.yml" + + pull_request: + paths: + - "package*.json" + - "Gruntfile.coffee" + - "stylelint.config.js" + - "**/*.css" + - "**/*.scss" + - ".github/workflows/lint-css.yml" + +jobs: + lint-css: + runs-on: ubuntu-latest + + steps: + - name: Clone repository + uses: actions/checkout@v4 + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + cache: npm + + - name: Install Grunt + run: npm i -g grunt-cli --force + + - name: Install npm dependencies + run: npm ci + + - name: Stylelint + run: grunt stylelint From cbedc487f0a9cefb36cb6546f2867a2ed6567dc7 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 13 May 2025 14:34:06 -0400 Subject: [PATCH 18/20] build: bump stylelint-config-standard-scss --- package-lock.json | 85 +++++++++++++++++++++------------------------ package.json | 2 +- stylelint.config.js | 3 ++ 3 files changed, 43 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e31c7a83..619d8b6e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "postcss": "^8.4.47", "sass": "^1.88.0", "stylelint": "^16.19.1", - "stylelint-config-standard-scss": "^14.0.0", + "stylelint-config-standard-scss": "^15.0.1", "stylelint-order": "^7.0.0", "time-grunt": "^2.0.0" } @@ -3914,6 +3914,13 @@ "node": ">=0.10.0" } }, + "node_modules/known-css-properties": { + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.36.0.tgz", + "integrity": "sha512-A+9jP+IUmuQsNdsLdcg6Yt7voiMF/D4K83ew0OpJtpu+l34ef7LaohWV0Rc6KNvzw6ZDizkqfyB5JznZnzuKQA==", + "dev": true, + "license": "MIT" + }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -5664,9 +5671,9 @@ } }, "node_modules/stylelint-config-recommended": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz", - "integrity": "sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-16.0.0.tgz", + "integrity": "sha512-4RSmPjQegF34wNcK1e1O3Uz91HN8P1aFdFzio90wNK9mjgAI19u5vsU868cVZboKzCaa5XbpvtTzAAGQAxpcXA==", "dev": true, "funding": [ { @@ -5683,26 +5690,26 @@ "node": ">=18.12.0" }, "peerDependencies": { - "stylelint": "^16.1.0" + "stylelint": "^16.16.0" } }, "node_modules/stylelint-config-recommended-scss": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-14.1.0.tgz", - "integrity": "sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==", + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-15.0.1.tgz", + "integrity": "sha512-V24bxkNkFGggqPVJlP9iXaBabwSGEG7QTz+PyxrRtjPkcF+/NsWtB3tKYvFYEmczRkWiIEfuFMhGpJFj9Fxe6Q==", "dev": true, "license": "MIT", "dependencies": { "postcss-scss": "^4.0.9", - "stylelint-config-recommended": "^14.0.1", - "stylelint-scss": "^6.4.0" + "stylelint-config-recommended": "^16.0.0", + "stylelint-scss": "^6.12.0" }, "engines": { - "node": ">=18.12.0" + "node": ">=20" }, "peerDependencies": { "postcss": "^8.3.3", - "stylelint": "^16.6.1" + "stylelint": "^16.16.0" }, "peerDependenciesMeta": { "postcss": { @@ -5711,9 +5718,9 @@ } }, "node_modules/stylelint-config-standard": { - "version": "36.0.1", - "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-36.0.1.tgz", - "integrity": "sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==", + "version": "38.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-38.0.0.tgz", + "integrity": "sha512-uj3JIX+dpFseqd/DJx8Gy3PcRAJhlEZ2IrlFOc4LUxBX/PNMEQ198x7LCOE2Q5oT9Vw8nyc4CIL78xSqPr6iag==", "dev": true, "funding": [ { @@ -5727,31 +5734,31 @@ ], "license": "MIT", "dependencies": { - "stylelint-config-recommended": "^14.0.1" + "stylelint-config-recommended": "^16.0.0" }, "engines": { "node": ">=18.12.0" }, "peerDependencies": { - "stylelint": "^16.1.0" + "stylelint": "^16.18.0" } }, "node_modules/stylelint-config-standard-scss": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-14.0.0.tgz", - "integrity": "sha512-6Pa26D9mHyi4LauJ83ls3ELqCglU6VfCXchovbEqQUiEkezvKdv6VgsIoMy58i00c854wVmOw0k8W5FTpuaVqg==", + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-15.0.1.tgz", + "integrity": "sha512-8pmmfutrMlPHukLp+Th9asmk21tBXMVGxskZCzkRVWt1d8Z0SrXjUUQ3vn9KcBj1bJRd5msk6yfEFM0UYHBRdg==", "dev": true, "license": "MIT", "dependencies": { - "stylelint-config-recommended-scss": "^14.1.0", - "stylelint-config-standard": "^36.0.1" + "stylelint-config-recommended-scss": "^15.0.1", + "stylelint-config-standard": "^38.0.0" }, "engines": { - "node": ">=18.12.0" + "node": ">=20" }, "peerDependencies": { "postcss": "^8.3.3", - "stylelint": "^16.11.0" + "stylelint": "^16.18.0" }, "peerDependenciesMeta": { "postcss": { @@ -5777,16 +5784,16 @@ } }, "node_modules/stylelint-scss": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.11.1.tgz", - "integrity": "sha512-e4rYo0UY+BIMtGeGanghrvHTjcryxgZbyFxUedp8dLFqC4P70aawNdYjRrQxbnKhu3BNr4+lt5e/53tcKXiwFA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.12.0.tgz", + "integrity": "sha512-U7CKhi1YNkM1pXUXl/GMUXi8xKdhl4Ayxdyceie1nZ1XNIdaUgMV6OArpooWcDzEggwgYD0HP/xIgVJo9a655w==", "dev": true, "license": "MIT", "dependencies": { "css-tree": "^3.0.1", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.35.0", - "mdn-data": "^2.15.0", + "known-css-properties": "^0.36.0", + "mdn-data": "^2.21.0", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.6", "postcss-selector-parser": "^7.1.0", @@ -5809,17 +5816,10 @@ "node": ">=0.10.0" } }, - "node_modules/stylelint-scss/node_modules/known-css-properties": { - "version": "0.35.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.35.0.tgz", - "integrity": "sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==", - "dev": true, - "license": "MIT" - }, "node_modules/stylelint-scss/node_modules/mdn-data": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.18.0.tgz", - "integrity": "sha512-gtCy1yim/vpHF/tq3B4Z43x3zKWpYeb4IM3d/Mf4oMYcNuoXOYEaqtoFlLHw9zd7+WNN3jNh6/WXyUrD3OIiwQ==", + "version": "2.21.0", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.21.0.tgz", + "integrity": "sha512-+ZKPQezM5vYJIkCxaC+4DTnRrVZR1CgsKLu5zsQERQx6Tea8Y+wMx5A24rq8A8NepCeatIQufVAekKNgiBMsGQ==", "dev": true, "license": "CC0-1.0" }, @@ -5917,13 +5917,6 @@ "node": ">=0.10.0" } }, - "node_modules/stylelint/node_modules/known-css-properties": { - "version": "0.36.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.36.0.tgz", - "integrity": "sha512-A+9jP+IUmuQsNdsLdcg6Yt7voiMF/D4K83ew0OpJtpu+l34ef7LaohWV0Rc6KNvzw6ZDizkqfyB5JznZnzuKQA==", - "dev": true, - "license": "MIT" - }, "node_modules/stylelint/node_modules/resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", diff --git a/package.json b/package.json index 77790e762..a6c77da51 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "postcss": "^8.4.47", "sass": "^1.88.0", "stylelint": "^16.19.1", - "stylelint-config-standard-scss": "^14.0.0", + "stylelint-config-standard-scss": "^15.0.1", "stylelint-order": "^7.0.0", "time-grunt": "^2.0.0" } diff --git a/stylelint.config.js b/stylelint.config.js index 74609ac07..17ddeb1c1 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -53,6 +53,8 @@ module.exports = { rules: { "at-rule-empty-line-before": null, "at-rule-no-vendor-prefix": null, + "at-rule-prelude-no-invalid": null, + "color-function-alias-notation": null, "color-hex-length": null, "comment-empty-line-before": null, "comment-whitespace-inside": null, @@ -125,6 +127,7 @@ module.exports = { ignoreFiles: [ "**/*.min.css", "méli-mélo/compilation-gelé/**", + "méli-mélo/deprecated/**", "node_modules/**", "~sites/**", "dist/**" From 2448c3f07e2ee307ef4a1dfc846a7f849313746b Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 13 May 2025 14:44:41 -0400 Subject: [PATCH 19/20] fix: color-function-alias-notation --- components/wb-chtwzrd/_base.scss | 12 ++++++------ sites/archived/_archived.scss | 2 +- sites/fonts/_base.scss | 2 +- sites/gcweb-menu/_base.scss | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/components/wb-chtwzrd/_base.scss b/components/wb-chtwzrd/_base.scss index 31948ce1d..a38137cf8 100644 --- a/components/wb-chtwzrd/_base.scss +++ b/components/wb-chtwzrd/_base.scss @@ -117,7 +117,7 @@ background: #335075; border-bottom-left-radius: 25px; border-top-left-radius: 25px; - box-shadow: 0 1px 3px rgba(0, 0, 0, .45); + box-shadow: 0 1px 3px rgb(0, 0, 0, .45); color: #fff; font-size: 14px; line-height: 20px; @@ -152,7 +152,7 @@ background: #fff url("../assets/wb-chtwzrd/default-avatar.png") center no-repeat; border-radius: 50%; bottom: 0; - box-shadow: 0 2px 4px rgba(0, 0, 0, .45); + box-shadow: 0 2px 4px rgb(0, 0, 0, .45); height: 100%; overflow: hidden; position: absolute; @@ -164,8 +164,8 @@ } .wb-chtwzrd-bubble-wrap .bubble:focus { - border: 1px solid rgba(0, 0, 0, .5); - box-shadow: 0 2px 3px rgba(0, 0, 0, .7); + border: 1px solid rgb(0, 0, 0, .5); + box-shadow: 0 2px 3px rgb(0, 0, 0, .7); } .wb-chtwzrd-btn-extrnl + .wb-chtwzrd-bubble-wrap { @@ -251,8 +251,8 @@ } .wb-chtwzrd-container .history::before { - background: -webkit-gradient(linear, left top, left bottom, color-stop(20%, #fff), to(rgba(255, 255, 255, 0))); - background: linear-gradient(to bottom, #fff 20%, rgba(255, 255, 255, 0) 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(20%, #fff), to(rgb(255, 255, 255, 0))); + background: linear-gradient(to bottom, #fff 20%, rgb(255, 255, 255, 0) 100%); content: ""; height: 40px; left: 0; diff --git a/sites/archived/_archived.scss b/sites/archived/_archived.scss index 18abbbcd8..f20c076c0 100644 --- a/sites/archived/_archived.scss +++ b/sites/archived/_archived.scss @@ -5,7 +5,7 @@ } background-color: #ffd700 !important; - box-shadow: 0 5px 15px rgba(0, 0, 0, .5); + box-shadow: 0 5px 15px rgb(0, 0, 0, .5); padding: 25px 0; h2 { diff --git a/sites/fonts/_base.scss b/sites/fonts/_base.scss index e6d31bbce..969cb3407 100644 --- a/sites/fonts/_base.scss +++ b/sites/fonts/_base.scss @@ -17,7 +17,7 @@ -webkit-font-smoothing: antialiased; line-height: 1; text-decoration: none; - text-shadow: 0 0 1px rgba(0, 0, 0, .3); + text-shadow: 0 0 1px rgb(0, 0, 0, .3); -webkit-text-stroke: 1px transparent; text-transform: none; transform: rotate(0); diff --git a/sites/gcweb-menu/_base.scss b/sites/gcweb-menu/_base.scss index 185b795f1..21dd928af 100644 --- a/sites/gcweb-menu/_base.scss +++ b/sites/gcweb-menu/_base.scss @@ -138,7 +138,7 @@ [role="menu"] [role="menu"] { background-color: #fff; border-top: #eee solid 1px; - box-shadow: 10px 10px 10px 5px rgba(0, 0, 0, .1); + box-shadow: 10px 10px 10px 5px rgb(0, 0, 0, .1); color: #000; left:360px; margin-bottom: 25px; @@ -392,7 +392,7 @@ .modal-header { background: #2e5274; border-bottom: 1px solid #2e5274; - box-shadow: 0 3px 3px -2px rgba(0, 0, 0, .3), 3px 3px 3px -2px rgba(0, 0, 0, .3), -3px 3px 3px -2px rgba(0, 0, 0, .3); + box-shadow: 0 3px 3px -2px rgb(0, 0, 0, .3), 3px 3px 3px -2px rgb(0, 0, 0, .3), -3px 3px 3px -2px rgb(0, 0, 0, .3); color: #fff; margin-left: 0; padding: 0 44px 0 1em; @@ -404,7 +404,7 @@ &:before { border-bottom: 1.45em solid #2e5274; - border-left: 1em solid rgba(0, 0, 0, 0); + border-left: 1em solid rgb(0, 0, 0, 0); border-top: 1.45em solid #2e5274; content: ""; left: -1em; @@ -633,7 +633,7 @@ &:before { border-left: 0; - border-right: 1em solid rgba(0, 0, 0, 0); + border-right: 1em solid rgb(0, 0, 0, 0); left: auto; right: -1em; } From 33ab8c67089334f4e3e8f2cc784d50b57574e492 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 13 May 2025 14:50:43 -0400 Subject: [PATCH 20/20] chore: ignore break-word issue --- stylelint.config.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/stylelint.config.js b/stylelint.config.js index 17ddeb1c1..8f4d9fdcd 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -8,6 +8,14 @@ module.exports = { "color-function-notation": "legacy", // Suppress stylelint-config-recommended errors + "declaration-property-value-keyword-no-deprecated": [ + true, + { + ignoreKeywords: [ + "break-word" // word-break: break-word; is depreciated but used upstream as well + ] + } + ], "font-family-no-duplicate-names": [ true, {