Skip to content

Commit

Permalink
Merge pull request #146 from cds-snc/smaller-updates
Browse files Browse the repository at this point in the history
V 1.5.5
  • Loading branch information
melaniebmn authored Aug 23, 2023
2 parents 8bc5596 + 90d9c7e commit bda920d
Show file tree
Hide file tree
Showing 20 changed files with 75 additions and 103 deletions.
26 changes: 10 additions & 16 deletions build/figma/figma.tokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -2048,12 +2048,12 @@
"type": "sizing"
},
"margin": {
"value": "0 0 0 auto",
"value": "2.25rem 0 2.25rem auto",
"type": "spacing"
}
},
"margin": {
"value": "0 0 1.5rem auto",
"value": "2.25rem 0 3.75rem auto",
"type": "spacing"
}
},
Expand Down Expand Up @@ -2197,6 +2197,12 @@
"value": "0 0 0.375rem",
"type": "spacing"
},
"signature": {
"margin": {
"value": "0 0 0.375rem",
"type": "spacing"
}
},
"toggle": {
"padding": {
"value": "0 1.125rem",
Expand All @@ -2214,7 +2220,7 @@
"value": "0 0 0.75rem",
"type": "spacing"
},
"topnav": {
"skiptonav": {
"top": {
"value": "1.5rem",
"type": "spacing"
Expand Down Expand Up @@ -2895,7 +2901,7 @@
"font": {
"value": {
"fontFamily": "\"Noto Sans\", sans-serif",
"fontWeight": "500",
"fontWeight": "600",
"lineHeight": "126.41975308641975%",
"fontSize": "1.58203125rem"
},
Expand Down Expand Up @@ -3382,15 +3388,7 @@
"type": "color"
}
},
"margin": {
"value": "0 0 0.375rem",
"type": "spacing"
},
"signature": {
"margin": {
"value": "0 0 0.375rem",
"type": "spacing"
},
"height": {
"value": "1.6875rem",
"type": "sizing"
Expand All @@ -3403,10 +3401,6 @@
}
},
"wordmark": {
"margin": {
"value": "2.25rem 0",
"type": "spacing"
},
"height": {
"value": "3rem",
"type": "sizing"
Expand Down
14 changes: 6 additions & 8 deletions build/web/css/.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Wed, 16 Aug 2023 12:29:55 GMT
* Generated on Wed, 23 Aug 2023 01:41:47 GMT
*/

:root {
Expand Down Expand Up @@ -391,8 +391,8 @@
--gcds-footer-sub-nav-padding: 3rem 0;
--gcds-footer-sub-signature-lg-width: 10.937rem;
--gcds-footer-sub-signature-lg-min-width: auto;
--gcds-footer-sub-signature-lg-margin: 0 0 0 auto;
--gcds-footer-sub-signature-margin: 0 0 1.5rem auto;
--gcds-footer-sub-signature-lg-margin: 2.25rem 0 2.25rem auto;
--gcds-footer-sub-signature-margin: 2.25rem 0 3.75rem auto;
--gcds-footer-sub-md-width: 7rem;
--gcds-footer-sub-sm-width: 100%;
--gcds-footer-sub-text: #2b4380;
Expand Down Expand Up @@ -423,10 +423,11 @@
--gcds-header-brand-grid-gap: 0.75rem;
--gcds-header-brand-margin: 1.125rem 0 0;
--gcds-header-brand-padding: 0 0 0.375rem;
--gcds-header-brand-signature-margin: 0 0 0.375rem;
--gcds-header-brand-toggle-padding: 0 1.125rem;
--gcds-header-container-max-width: 71.25rem;
--gcds-header-margin: 0 0 0.75rem;
--gcds-header-topnav-top: 1.5rem;
--gcds-header-skiptonav-top: 1.5rem;
--gcds-hint-font: 400 1.25rem/120% "Noto Sans", sans-serif;
--gcds-hint-margin: 0 0 0.75rem;
--gcds-icon-font-family: "Font Awesome 6 Free", FontAwesome;
Expand Down Expand Up @@ -558,7 +559,7 @@
--gcds-nav-link-side-nav-hover-background: #f1f2f3;
--gcds-nav-link-side-nav-padding: 0.9375rem 0.75rem;
--gcds-nav-link-top-nav-hover-background: #d6d9dd;
--gcds-nav-link-top-nav-home-font: 500 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
--gcds-nav-link-top-nav-home-font: 600 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
--gcds-nav-link-top-nav-home-padding: 0.9375rem 0.1875rem;
--gcds-nav-link-top-nav-padding: 1.125rem;
--gcds-nav-link-top-nav-text: #333333;
Expand Down Expand Up @@ -643,11 +644,8 @@
--gcds-side-nav-max-width: 20rem;
--gcds-signature-color-flag: #ff0000;
--gcds-signature-color-text: #000000;
--gcds-signature-margin: 0 0 0.375rem;
--gcds-signature-signature-margin: 0 0 0.375rem;
--gcds-signature-signature-height: 1.6875rem;
--gcds-signature-white-default: #ffffff;
--gcds-signature-wordmark-margin: 2.25rem 0;
--gcds-signature-wordmark-height: 3rem;
--gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif;
--gcds-stepper-margin: 0 0 1.125rem;
Expand Down
14 changes: 6 additions & 8 deletions build/web/css/components.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Wed, 16 Aug 2023 12:29:55 GMT
* Generated on Wed, 23 Aug 2023 01:41:47 GMT
*/

:root {
Expand Down Expand Up @@ -280,8 +280,8 @@
--gcds-footer-sub-nav-padding: 3rem 0;
--gcds-footer-sub-signature-lg-width: 10.937rem;
--gcds-footer-sub-signature-lg-min-width: auto;
--gcds-footer-sub-signature-lg-margin: 0 0 0 auto;
--gcds-footer-sub-signature-margin: 0 0 1.5rem auto;
--gcds-footer-sub-signature-lg-margin: 2.25rem 0 2.25rem auto;
--gcds-footer-sub-signature-margin: 2.25rem 0 3.75rem auto;
--gcds-footer-sub-md-width: 7rem;
--gcds-footer-sub-sm-width: 100%;
--gcds-footer-sub-text: #2b4380;
Expand Down Expand Up @@ -312,10 +312,11 @@
--gcds-header-brand-grid-gap: 0.75rem;
--gcds-header-brand-margin: 1.125rem 0 0;
--gcds-header-brand-padding: 0 0 0.375rem;
--gcds-header-brand-signature-margin: 0 0 0.375rem;
--gcds-header-brand-toggle-padding: 0 1.125rem;
--gcds-header-container-max-width: 71.25rem;
--gcds-header-margin: 0 0 0.75rem;
--gcds-header-topnav-top: 1.5rem;
--gcds-header-skiptonav-top: 1.5rem;
--gcds-hint-font: 400 1.25rem/120% "Noto Sans", sans-serif;
--gcds-hint-margin: 0 0 0.75rem;
--gcds-icon-font-family: "Font Awesome 6 Free", FontAwesome;
Expand Down Expand Up @@ -447,7 +448,7 @@
--gcds-nav-link-side-nav-hover-background: #f1f2f3;
--gcds-nav-link-side-nav-padding: 0.9375rem 0.75rem;
--gcds-nav-link-top-nav-hover-background: #d6d9dd;
--gcds-nav-link-top-nav-home-font: 500 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
--gcds-nav-link-top-nav-home-font: 600 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
--gcds-nav-link-top-nav-home-padding: 0.9375rem 0.1875rem;
--gcds-nav-link-top-nav-padding: 1.125rem;
--gcds-nav-link-top-nav-text: #333333;
Expand Down Expand Up @@ -532,11 +533,8 @@
--gcds-side-nav-max-width: 20rem;
--gcds-signature-color-flag: #ff0000;
--gcds-signature-color-text: #000000;
--gcds-signature-margin: 0 0 0.375rem;
--gcds-signature-signature-margin: 0 0 0.375rem;
--gcds-signature-signature-height: 1.6875rem;
--gcds-signature-white-default: #ffffff;
--gcds-signature-wordmark-margin: 2.25rem 0;
--gcds-signature-wordmark-height: 3rem;
--gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif;
--gcds-stepper-margin: 0 0 1.125rem;
Expand Down
6 changes: 3 additions & 3 deletions build/web/css/components/footer.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Tue, 27 Jun 2023 23:49:41 GMT
* Generated on Wed, 23 Aug 2023 00:58:38 GMT
*/

:root {
Expand Down Expand Up @@ -28,8 +28,8 @@
--gcds-footer-sub-nav-padding: 3rem 0;
--gcds-footer-sub-signature-lg-width: 10.937rem;
--gcds-footer-sub-signature-lg-min-width: auto;
--gcds-footer-sub-signature-lg-margin: 0 0 0 auto;
--gcds-footer-sub-signature-margin: 0 0 1.5rem auto;
--gcds-footer-sub-signature-lg-margin: 2.25rem 0 2.25rem auto;
--gcds-footer-sub-signature-margin: 2.25rem 0 3.75rem auto;
--gcds-footer-sub-md-width: 7rem;
--gcds-footer-sub-sm-width: 100%;
--gcds-footer-sub-text: #2b4380;
Expand Down
5 changes: 3 additions & 2 deletions build/web/css/components/header.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Thu, 03 Aug 2023 12:54:09 GMT
* Generated on Wed, 23 Aug 2023 01:41:47 GMT
*/

:root {
Expand All @@ -9,8 +9,9 @@
--gcds-header-brand-grid-gap: 0.75rem;
--gcds-header-brand-margin: 1.125rem 0 0;
--gcds-header-brand-padding: 0 0 0.375rem;
--gcds-header-brand-signature-margin: 0 0 0.375rem;
--gcds-header-brand-toggle-padding: 0 1.125rem;
--gcds-header-container-max-width: 71.25rem;
--gcds-header-margin: 0 0 0.75rem;
--gcds-header-topnav-top: 1.5rem;
--gcds-header-skiptonav-top: 1.5rem;
}
4 changes: 2 additions & 2 deletions build/web/css/components/nav-link.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Thu, 10 Aug 2023 15:16:26 GMT
* Generated on Wed, 23 Aug 2023 01:07:09 GMT
*/

:root {
Expand All @@ -27,7 +27,7 @@
--gcds-nav-link-side-nav-hover-background: #f1f2f3;
--gcds-nav-link-side-nav-padding: 0.9375rem 0.75rem;
--gcds-nav-link-top-nav-hover-background: #d6d9dd;
--gcds-nav-link-top-nav-home-font: 500 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
--gcds-nav-link-top-nav-home-font: 600 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
--gcds-nav-link-top-nav-home-padding: 0.9375rem 0.1875rem;
--gcds-nav-link-top-nav-padding: 1.125rem;
--gcds-nav-link-top-nav-text: #333333;
Expand Down
5 changes: 1 addition & 4 deletions build/web/css/components/signature.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
/**
* Do not edit directly
* Generated on Mon, 19 Jun 2023 20:28:18 GMT
* Generated on Wed, 23 Aug 2023 00:58:38 GMT
*/

:root {
--gcds-signature-color-flag: #ff0000;
--gcds-signature-color-text: #000000;
--gcds-signature-margin: 0 0 0.375rem;
--gcds-signature-signature-margin: 0 0 0.375rem;
--gcds-signature-signature-height: 1.6875rem;
--gcds-signature-white-default: #ffffff;
--gcds-signature-wordmark-margin: 2.25rem 0;
--gcds-signature-wordmark-height: 3rem;
}
14 changes: 6 additions & 8 deletions build/web/css/tokens.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Wed, 16 Aug 2023 12:29:55 GMT
* Generated on Wed, 23 Aug 2023 01:41:47 GMT
*/

:root {
Expand Down Expand Up @@ -391,8 +391,8 @@
--gcds-footer-sub-nav-padding: 3rem 0;
--gcds-footer-sub-signature-lg-width: 10.937rem;
--gcds-footer-sub-signature-lg-min-width: auto;
--gcds-footer-sub-signature-lg-margin: 0 0 0 auto;
--gcds-footer-sub-signature-margin: 0 0 1.5rem auto;
--gcds-footer-sub-signature-lg-margin: 2.25rem 0 2.25rem auto;
--gcds-footer-sub-signature-margin: 2.25rem 0 3.75rem auto;
--gcds-footer-sub-md-width: 7rem;
--gcds-footer-sub-sm-width: 100%;
--gcds-footer-sub-text: #2b4380;
Expand Down Expand Up @@ -423,10 +423,11 @@
--gcds-header-brand-grid-gap: 0.75rem;
--gcds-header-brand-margin: 1.125rem 0 0;
--gcds-header-brand-padding: 0 0 0.375rem;
--gcds-header-brand-signature-margin: 0 0 0.375rem;
--gcds-header-brand-toggle-padding: 0 1.125rem;
--gcds-header-container-max-width: 71.25rem;
--gcds-header-margin: 0 0 0.75rem;
--gcds-header-topnav-top: 1.5rem;
--gcds-header-skiptonav-top: 1.5rem;
--gcds-hint-font: 400 1.25rem/120% "Noto Sans", sans-serif;
--gcds-hint-margin: 0 0 0.75rem;
--gcds-icon-font-family: "Font Awesome 6 Free", FontAwesome;
Expand Down Expand Up @@ -558,7 +559,7 @@
--gcds-nav-link-side-nav-hover-background: #f1f2f3;
--gcds-nav-link-side-nav-padding: 0.9375rem 0.75rem;
--gcds-nav-link-top-nav-hover-background: #d6d9dd;
--gcds-nav-link-top-nav-home-font: 500 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
--gcds-nav-link-top-nav-home-font: 600 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
--gcds-nav-link-top-nav-home-padding: 0.9375rem 0.1875rem;
--gcds-nav-link-top-nav-padding: 1.125rem;
--gcds-nav-link-top-nav-text: #333333;
Expand Down Expand Up @@ -643,11 +644,8 @@
--gcds-side-nav-max-width: 20rem;
--gcds-signature-color-flag: #ff0000;
--gcds-signature-color-text: #000000;
--gcds-signature-margin: 0 0 0.375rem;
--gcds-signature-signature-margin: 0 0 0.375rem;
--gcds-signature-signature-height: 1.6875rem;
--gcds-signature-white-default: #ffffff;
--gcds-signature-wordmark-margin: 2.25rem 0;
--gcds-signature-wordmark-height: 3rem;
--gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif;
--gcds-stepper-margin: 0 0 1.125rem;
Expand Down
14 changes: 6 additions & 8 deletions build/web/scss/.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Wed, 16 Aug 2023 12:29:55 GMT
// Generated on Wed, 23 Aug 2023 01:41:47 GMT

$gcds-color-blue-100: #d7e5f5;
$gcds-color-blue-500: #6584a6; // Must contrast 3:1 with white
Expand Down Expand Up @@ -389,8 +389,8 @@ $gcds-footer-sub-listitem-before-margin: 0 1.125rem;
$gcds-footer-sub-nav-padding: 3rem 0;
$gcds-footer-sub-signature-lg-width: 10.937rem;
$gcds-footer-sub-signature-lg-min-width: auto;
$gcds-footer-sub-signature-lg-margin: 0 0 0 auto;
$gcds-footer-sub-signature-margin: 0 0 1.5rem auto;
$gcds-footer-sub-signature-lg-margin: 2.25rem 0 2.25rem auto;
$gcds-footer-sub-signature-margin: 2.25rem 0 3.75rem auto;
$gcds-footer-sub-md-width: 7rem;
$gcds-footer-sub-sm-width: 100%;
$gcds-footer-sub-text: #2b4380;
Expand Down Expand Up @@ -421,10 +421,11 @@ $gcds-header-brand-border-width: 0.1875rem;
$gcds-header-brand-grid-gap: 0.75rem;
$gcds-header-brand-margin: 1.125rem 0 0;
$gcds-header-brand-padding: 0 0 0.375rem;
$gcds-header-brand-signature-margin: 0 0 0.375rem;
$gcds-header-brand-toggle-padding: 0 1.125rem;
$gcds-header-container-max-width: 71.25rem;
$gcds-header-margin: 0 0 0.75rem;
$gcds-header-topnav-top: 1.5rem;
$gcds-header-skiptonav-top: 1.5rem;
$gcds-hint-font: 400 1.25rem/120% "Noto Sans", sans-serif;
$gcds-hint-margin: 0 0 0.75rem;
$gcds-icon-font-family: "Font Awesome 6 Free", FontAwesome;
Expand Down Expand Up @@ -556,7 +557,7 @@ $gcds-nav-link-padding: 0.9375rem;
$gcds-nav-link-side-nav-hover-background: #f1f2f3;
$gcds-nav-link-side-nav-padding: 0.9375rem 0.75rem;
$gcds-nav-link-top-nav-hover-background: #d6d9dd;
$gcds-nav-link-top-nav-home-font: 500 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
$gcds-nav-link-top-nav-home-font: 600 1.58203125rem/126.41975308641975% "Noto Sans", sans-serif;
$gcds-nav-link-top-nav-home-padding: 0.9375rem 0.1875rem;
$gcds-nav-link-top-nav-padding: 1.125rem;
$gcds-nav-link-top-nav-text: #333333;
Expand Down Expand Up @@ -641,11 +642,8 @@ $gcds-side-nav-heading-padding: 0.9375rem;
$gcds-side-nav-max-width: 20rem;
$gcds-signature-color-flag: #ff0000;
$gcds-signature-color-text: #000000;
$gcds-signature-margin: 0 0 0.375rem;
$gcds-signature-signature-margin: 0 0 0.375rem;
$gcds-signature-signature-height: 1.6875rem;
$gcds-signature-white-default: #ffffff;
$gcds-signature-wordmark-margin: 2.25rem 0;
$gcds-signature-wordmark-height: 3rem;
$gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif;
$gcds-stepper-margin: 0 0 1.125rem;
Expand Down
Loading

0 comments on commit bda920d

Please sign in to comment.