Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

design updates to button, label, file uploader, footer #90

Merged
merged 2 commits into from
Feb 22, 2023
Merged

design updates to button, label, file uploader, footer #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48efe65
design updates to button, label, file uploader, footer
melaniebmn Feb 22, 2023
7a9bc12
add tokens for button text only
melaniebmn Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 57 additions & 51 deletions build/figma/figma.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,14 +858,14 @@
"font": {
"value": {
"fontFamily": "\"Noto Sans\", sans-serif",
"fontWeight": "400",
"fontWeight": "500",
"lineHeight": "120%",
"fontSize": "1.25rem"
},
"type": "typography"
},
"padding": {
"value": "1.125rem 0.75rem",
"value": "0.75rem",
"type": "spacing"
},
"primary": {
Expand Down Expand Up @@ -910,6 +910,24 @@
}
}
},
"textOnly": {
"default": {
"background": {
"value": "transparent",
"type": "color"
},
"text": {
"value": "#425A76",
"type": "color"
}
},
"hover": {
"text": {
"value": "#26374A",
"type": "color"
}
}
},
"shared": {
"active": {
"background": {
Expand Down Expand Up @@ -1101,13 +1119,13 @@
"value": {
"fontFamily": "\"Noto Sans\", sans-serif",
"fontWeight": "400",
"lineHeight": "120%",
"fontSize": "1.25rem"
"lineHeight": "135%",
"fontSize": "1.1111111111111112rem"
},
"type": "typography"
},
"margin": {
"value": "3rem 0 0",
"value": "3rem 0 1.5rem",
"type": "spacing"
},
"text": {
Expand Down Expand Up @@ -1339,8 +1357,12 @@
"type": "other"
}
},
"margin": {
"value": "0 0 1.125rem",
"type": "spacing"
},
"padding": {
"value": "1.125rem 0.75rem",
"value": "0.75rem",
"type": "spacing"
},
"text": {
Expand All @@ -1349,10 +1371,6 @@
}
},
"danger": {
"background": {
"value": "#FBDDDA",
"type": "color"
},
"text": {
"value": "#A62A1E",
"type": "color"
Expand Down Expand Up @@ -1384,64 +1402,52 @@
"type": "typography"
},
"file": {
"background": {
"value": "#D6D9DD",
"type": "color"
},
"border": {
"radius": {
"value": "3rem",
"type": "borderRadius"
"color": {
"value": "#7D828B",
"type": "color"
},
"width": {
"value": "0.125rem",
"type": "borderWidth"
}
},
"icon": {
"background": {
"default": {
"value": "#C24438",
"button": {
"default": {
"text": {
"value": "#A62A1E",
"type": "color"
},
"hover": {
}
},
"hover": {
"text": {
"value": "#822117",
"type": "color"
},
"active": {
"value": "#000",
"type": "color"
}
},
"text": {
"value": "#FFF",
"type": "color"
"margin": {
"value": "0 0 0 2.25rem",
"type": "spacing"
},
"padding": {
"value": "0.5625rem",
"value": "0.75rem 0.1875rem",
"type": "spacing"
}
},
"margin": {
"value": "0.75rem 0 0",
"type": "spacing"
},
"marginFirstOfType": {
"value": "1.125rem 0 0",
"type": "spacing"
"danger": {
"border": {
"color": {
"value": "#C24438",
"type": "color"
}
}
},
"maxWidth": {
"value": "30rem",
"type": "sizing"
},
"outline": {
"offset": {
"value": ".125rem",
"type": "other"
},
"width": {
"value": "0.1875rem",
"type": "other"
}
},
"padding": {
"value": "0.75rem 0.75rem 0.75rem 1.5rem",
"value": "0.75rem 1.125rem",
"type": "spacing"
}
},
Expand Down Expand Up @@ -1532,7 +1538,7 @@
"type": "border"
},
"width": {
"value": "0.375rem",
"value": "0.25rem",
"type": "borderWidth"
}
},
Expand Down Expand Up @@ -2053,7 +2059,7 @@
"font": {
"value": {
"fontFamily": "\"Noto Sans\", sans-serif",
"fontWeight": "500",
"fontWeight": "600",
"lineHeight": "120%",
"fontSize": "1.25rem"
},
Expand Down
41 changes: 20 additions & 21 deletions build/web/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Tue, 07 Feb 2023 16:08:15 GMT
// Generated on Wed, 22 Feb 2023 15:22:58 GMT

$gcds-color-blue-100: #d7e5f5;
$gcds-color-blue-500: #6584a6; // Must contrast 3:1 with white
Expand Down Expand Up @@ -170,15 +170,18 @@ $gcds-button-border-width: 0.125rem;
$gcds-button-danger-default-background: #a62a1e;
$gcds-button-danger-default-text: #ffffff;
$gcds-button-danger-hover-background: #822117;
$gcds-button-font: 400 1.25rem/120% "Noto Sans", sans-serif;
$gcds-button-padding: 1.125rem 0.75rem;
$gcds-button-font: 500 1.25rem/120% "Noto Sans", sans-serif;
$gcds-button-padding: 0.75rem;
$gcds-button-primary-default-background: #26374a;
$gcds-button-primary-default-text: #ffffff;
$gcds-button-primary-hover-background: #425a76;
$gcds-button-secondary-default-background: transparent;
$gcds-button-secondary-default-text: #425a76;
$gcds-button-secondary-hover-background: #d7e5f5;
$gcds-button-secondary-active-background: #d7e5f5;
$gcds-button-text-only-default-background: transparent;
$gcds-button-text-only-default-text: #425a76;
$gcds-button-text-only-hover-text: #26374a;
$gcds-button-shared-active-background: #000000;
$gcds-button-shared-active-text: #ffffff;
$gcds-button-shared-focus-background: #303fc3;
Expand Down Expand Up @@ -211,8 +214,8 @@ $gcds-checkbox-label-padding: 0 0 0 3.75rem;
$gcds-checkbox-margin: 2.25rem 0 1.5rem;
$gcds-checkbox-top: -0.75rem;
$gcds-date-modified-description-margin: 0 0 0 0.1875rem;
$gcds-date-modified-font: 400 1.25rem/120% "Noto Sans", sans-serif;
$gcds-date-modified-margin: 3rem 0 0;
$gcds-date-modified-font: 400 1.1111111111111112rem/135% "Noto Sans", sans-serif;
$gcds-date-modified-margin: 3rem 0 1.5rem;
$gcds-date-modified-text: #000000;
$gcds-details-default-text: #425a76;
$gcds-details-active-background: #000000;
Expand Down Expand Up @@ -253,27 +256,23 @@ $gcds-file-uploader-button-border-radius: 0.375rem;
$gcds-file-uploader-button-border-width: 0.125rem;
$gcds-file-uploader-button-font-weight: 500;
$gcds-file-uploader-button-outline-width: 0.1875rem;
$gcds-file-uploader-button-padding: 1.125rem 0.75rem;
$gcds-file-uploader-button-margin: 0 0 1.125rem;
$gcds-file-uploader-button-padding: 0.75rem;
$gcds-file-uploader-button-text: #425a76;
$gcds-file-uploader-danger-background: #fbddda;
$gcds-file-uploader-danger-text: #a62a1e;
$gcds-file-uploader-default-text: #000000;
$gcds-file-uploader-disabled-background: #d6d9dd;
$gcds-file-uploader-disabled-text: #7d828b;
$gcds-file-uploader-font: 400 1.25rem/120% "Noto Sans", sans-serif;
$gcds-file-uploader-file-background: #d6d9dd;
$gcds-file-uploader-file-border-radius: 3rem;
$gcds-file-uploader-file-icon-background-default: #c24438;
$gcds-file-uploader-file-icon-background-hover: #822117;
$gcds-file-uploader-file-icon-background-active: #000000;
$gcds-file-uploader-file-icon-text: #ffffff;
$gcds-file-uploader-file-icon-padding: 0.5625rem;
$gcds-file-uploader-file-margin: 0.75rem 0 0;
$gcds-file-uploader-file-margin-first-of-type: 1.125rem 0 0;
$gcds-file-uploader-file-border-color: #7d828b;
$gcds-file-uploader-file-border-width: 0.125rem;
$gcds-file-uploader-file-button-default-text: #a62a1e;
$gcds-file-uploader-file-button-hover-text: #822117;
$gcds-file-uploader-file-button-margin: 0 0 0 2.25rem;
$gcds-file-uploader-file-button-padding: 0.75rem 0.1875rem;
$gcds-file-uploader-file-danger-border-color: #c24438;
$gcds-file-uploader-file-max-width: 30rem;
$gcds-file-uploader-file-outline-offset: .125rem;
$gcds-file-uploader-file-outline-width: 0.1875rem;
$gcds-file-uploader-file-padding: 0.75rem 0.75rem 0.75rem 1.5rem;
$gcds-file-uploader-file-padding: 0.75rem 1.125rem;
$gcds-file-uploader-focus-button-background: #303fc3;
$gcds-file-uploader-focus-button-text: #ffffff;
$gcds-file-uploader-focus-text: #303fc3;
Expand All @@ -289,7 +288,7 @@ $gcds-footer-listitem-margin: 0 0 1.125rem;
$gcds-footer-main-background: #26374a;
$gcds-footer-main-govnav-padding: 1.125rem 0;
$gcds-footer-main-nav-first-after-border-color: #ffffff;
$gcds-footer-main-nav-first-after-border-width: 0.375rem;
$gcds-footer-main-nav-first-after-border-width: 0.25rem;
$gcds-footer-main-nav-first-after-width: 2.25rem;
$gcds-footer-main-text: #ffffff;
$gcds-footer-main-themenav-padding: 0.75rem 0 1.125rem;
Expand Down Expand Up @@ -396,7 +395,7 @@ $gcds-input-margin: 0 0 1.5rem;
$gcds-input-min-width-and-height: 3rem;
$gcds-input-outline-width: 0.1875rem;
$gcds-input-padding: 0.75rem;
$gcds-label-font: 500 1.25rem/120% "Noto Sans", sans-serif;
$gcds-label-font: 600 1.25rem/120% "Noto Sans", sans-serif;
$gcds-label-margin: 0 0 0.375rem;
$gcds-label-required-margin: 0 0 0 0.375rem;
$gcds-lang-toggle-active-background: #000000;
Expand Down
41 changes: 20 additions & 21 deletions build/web/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Tue, 07 Feb 2023 16:08:15 GMT
* Generated on Wed, 22 Feb 2023 15:22:58 GMT
*/

:root {
Expand Down Expand Up @@ -172,15 +172,18 @@
--gcds-button-danger-default-background: #a62a1e;
--gcds-button-danger-default-text: #ffffff;
--gcds-button-danger-hover-background: #822117;
--gcds-button-font: 400 1.25rem/120% "Noto Sans", sans-serif;
--gcds-button-padding: 1.125rem 0.75rem;
--gcds-button-font: 500 1.25rem/120% "Noto Sans", sans-serif;
--gcds-button-padding: 0.75rem;
--gcds-button-primary-default-background: #26374a;
--gcds-button-primary-default-text: #ffffff;
--gcds-button-primary-hover-background: #425a76;
--gcds-button-secondary-default-background: transparent;
--gcds-button-secondary-default-text: #425a76;
--gcds-button-secondary-hover-background: #d7e5f5;
--gcds-button-secondary-active-background: #d7e5f5;
--gcds-button-text-only-default-background: transparent;
--gcds-button-text-only-default-text: #425a76;
--gcds-button-text-only-hover-text: #26374a;
--gcds-button-shared-active-background: #000000;
--gcds-button-shared-active-text: #ffffff;
--gcds-button-shared-focus-background: #303fc3;
Expand Down Expand Up @@ -213,8 +216,8 @@
--gcds-checkbox-margin: 2.25rem 0 1.5rem;
--gcds-checkbox-top: -0.75rem;
--gcds-date-modified-description-margin: 0 0 0 0.1875rem;
--gcds-date-modified-font: 400 1.25rem/120% "Noto Sans", sans-serif;
--gcds-date-modified-margin: 3rem 0 0;
--gcds-date-modified-font: 400 1.1111111111111112rem/135% "Noto Sans", sans-serif;
--gcds-date-modified-margin: 3rem 0 1.5rem;
--gcds-date-modified-text: #000000;
--gcds-details-default-text: #425a76;
--gcds-details-active-background: #000000;
Expand Down Expand Up @@ -255,27 +258,23 @@
--gcds-file-uploader-button-border-width: 0.125rem;
--gcds-file-uploader-button-font-weight: 500;
--gcds-file-uploader-button-outline-width: 0.1875rem;
--gcds-file-uploader-button-padding: 1.125rem 0.75rem;
--gcds-file-uploader-button-margin: 0 0 1.125rem;
--gcds-file-uploader-button-padding: 0.75rem;
--gcds-file-uploader-button-text: #425a76;
--gcds-file-uploader-danger-background: #fbddda;
--gcds-file-uploader-danger-text: #a62a1e;
--gcds-file-uploader-default-text: #000000;
--gcds-file-uploader-disabled-background: #d6d9dd;
--gcds-file-uploader-disabled-text: #7d828b;
--gcds-file-uploader-font: 400 1.25rem/120% "Noto Sans", sans-serif;
--gcds-file-uploader-file-background: #d6d9dd;
--gcds-file-uploader-file-border-radius: 3rem;
--gcds-file-uploader-file-icon-background-default: #c24438;
--gcds-file-uploader-file-icon-background-hover: #822117;
--gcds-file-uploader-file-icon-background-active: #000000;
--gcds-file-uploader-file-icon-text: #ffffff;
--gcds-file-uploader-file-icon-padding: 0.5625rem;
--gcds-file-uploader-file-margin: 0.75rem 0 0;
--gcds-file-uploader-file-margin-first-of-type: 1.125rem 0 0;
--gcds-file-uploader-file-border-color: #7d828b;
--gcds-file-uploader-file-border-width: 0.125rem;
--gcds-file-uploader-file-button-default-text: #a62a1e;
--gcds-file-uploader-file-button-hover-text: #822117;
--gcds-file-uploader-file-button-margin: 0 0 0 2.25rem;
--gcds-file-uploader-file-button-padding: 0.75rem 0.1875rem;
--gcds-file-uploader-file-danger-border-color: #c24438;
--gcds-file-uploader-file-max-width: 30rem;
--gcds-file-uploader-file-outline-offset: .125rem;
--gcds-file-uploader-file-outline-width: 0.1875rem;
--gcds-file-uploader-file-padding: 0.75rem 0.75rem 0.75rem 1.5rem;
--gcds-file-uploader-file-padding: 0.75rem 1.125rem;
--gcds-file-uploader-focus-button-background: #303fc3;
--gcds-file-uploader-focus-button-text: #ffffff;
--gcds-file-uploader-focus-text: #303fc3;
Expand All @@ -291,7 +290,7 @@
--gcds-footer-main-background: #26374a;
--gcds-footer-main-govnav-padding: 1.125rem 0;
--gcds-footer-main-nav-first-after-border-color: #ffffff;
--gcds-footer-main-nav-first-after-border-width: 0.375rem;
--gcds-footer-main-nav-first-after-border-width: 0.25rem;
--gcds-footer-main-nav-first-after-width: 2.25rem;
--gcds-footer-main-text: #ffffff;
--gcds-footer-main-themenav-padding: 0.75rem 0 1.125rem;
Expand Down Expand Up @@ -398,7 +397,7 @@
--gcds-input-min-width-and-height: 3rem;
--gcds-input-outline-width: 0.1875rem;
--gcds-input-padding: 0.75rem;
--gcds-label-font: 500 1.25rem/120% "Noto Sans", sans-serif;
--gcds-label-font: 600 1.25rem/120% "Noto Sans", sans-serif;
--gcds-label-margin: 0 0 0.375rem;
--gcds-label-required-margin: 0 0 0 0.375rem;
--gcds-lang-toggle-active-background: #000000;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cdssnc/gcds-tokens",
"version": "1.0.0",
"version": "1.0.1",
"author": "Government of Canada | Gouvernement du Canada",
"description": "GC Design System Tokens",
"homepage": "https://cds-design-snc.netlify.app/",
Expand Down
Loading