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

Jump to bottom

Add border to container component #134

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Add border to container component #134

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
204bd2b
add border token for container component
melaniebmn Jul 6, 2023
2cbd18a
update version
melaniebmn Jul 6, 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
10 changes: 7 additions & 3 deletions build/figma/figma.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,10 @@
"value": "100%",
"type": "sizing"
},
"border": {
"value": "0.0625rem solid #7D828B",
"type": "border"
},
"size": {
"xs": {
"value": "20rem",
Expand All @@ -269,11 +273,11 @@
"type": "sizing"
},
"lg": {
"value": "64rem",
"value": "62rem",
"type": "sizing"
},
"xl": {
"value": "75rem",
"value": "71.25rem",
"type": "sizing"
},
"full": {
Expand Down Expand Up @@ -1118,7 +1122,7 @@
"type": "color"
},
"border": {
"value": "0.0625rem solid #7D828B",
"value": "0.125rem solid #7D828B",
"type": "border"
},
"borderRadius": {
Expand Down
7 changes: 4 additions & 3 deletions build/web/css/.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, 04 Jul 2023 12:42:15 GMT
* Generated on Thu, 06 Jul 2023 22:12:42 GMT
*/

:root {
Expand Down Expand Up @@ -60,11 +60,12 @@
--gcds-container-lg: 62rem;
--gcds-container-xl: 71.25rem;
--gcds-container-full: 100%;
--gcds-container-border: 0.0625rem solid #7d828b;
--gcds-container-size-xs: 20rem;
--gcds-container-size-sm: 30rem;
--gcds-container-size-md: 48rem;
--gcds-container-size-lg: 64rem;
--gcds-container-size-xl: 75rem;
--gcds-container-size-lg: 62rem;
--gcds-container-size-xl: 71.25rem;
--gcds-container-size-full: 100%;
--gcds-container-spacing-0: 0;
--gcds-container-spacing-50: 0.1875rem;
Expand Down
7 changes: 4 additions & 3 deletions build/web/css/components.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
/**
* Do not edit directly
* Generated on Tue, 04 Jul 2023 12:42:15 GMT
* Generated on Thu, 06 Jul 2023 22:12:42 GMT
*/

:root {
--gcds-container-border: 0.0625rem solid #7d828b;
--gcds-container-size-xs: 20rem;
--gcds-container-size-sm: 30rem;
--gcds-container-size-md: 48rem;
--gcds-container-size-lg: 64rem;
--gcds-container-size-xl: 75rem;
--gcds-container-size-lg: 62rem;
--gcds-container-size-xl: 71.25rem;
--gcds-container-size-full: 100%;
--gcds-container-spacing-0: 0;
--gcds-container-spacing-50: 0.1875rem;
Expand Down
7 changes: 4 additions & 3 deletions build/web/css/components/container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
/**
* Do not edit directly
* Generated on Thu, 29 Jun 2023 20:51:42 GMT
* Generated on Thu, 06 Jul 2023 22:12:42 GMT
*/

:root {
--gcds-container-border: 0.0625rem solid #7d828b;
--gcds-container-size-xs: 20rem;
--gcds-container-size-sm: 30rem;
--gcds-container-size-md: 48rem;
--gcds-container-size-lg: 64rem;
--gcds-container-size-xl: 75rem;
--gcds-container-size-lg: 62rem;
--gcds-container-size-xl: 71.25rem;
--gcds-container-size-full: 100%;
--gcds-container-spacing-0: 0;
--gcds-container-spacing-50: 0.1875rem;
Expand Down
7 changes: 4 additions & 3 deletions build/web/css/tokens.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, 04 Jul 2023 12:42:15 GMT
* Generated on Thu, 06 Jul 2023 22:12:42 GMT
*/

:root {
Expand Down Expand Up @@ -60,11 +60,12 @@
--gcds-container-lg: 62rem;
--gcds-container-xl: 71.25rem;
--gcds-container-full: 100%;
--gcds-container-border: 0.0625rem solid #7d828b;
--gcds-container-size-xs: 20rem;
--gcds-container-size-sm: 30rem;
--gcds-container-size-md: 48rem;
--gcds-container-size-lg: 64rem;
--gcds-container-size-xl: 75rem;
--gcds-container-size-lg: 62rem;
--gcds-container-size-xl: 71.25rem;
--gcds-container-size-full: 100%;
--gcds-container-spacing-0: 0;
--gcds-container-spacing-50: 0.1875rem;
Expand Down
9 changes: 5 additions & 4 deletions build/web/scss/.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, 04 Jul 2023 12:42:15 GMT
// Generated on Thu, 06 Jul 2023 22:12:42 GMT

$gcds-color-blue-100: #d7e5f5;
$gcds-color-blue-500: #6584a6; // Must contrast 3:1 with white
Expand Down Expand Up @@ -58,11 +58,12 @@ $gcds-container-md: 48rem;
$gcds-container-lg: 62rem;
$gcds-container-xl: 71.25rem;
$gcds-container-full: 100%;
$gcds-container-border: 0.0625rem solid #7d828b;
$gcds-container-size-xs: 20rem;
$gcds-container-size-sm: 30rem;
$gcds-container-size-md: 48rem;
$gcds-container-size-lg: 64rem;
$gcds-container-size-xl: 75rem;
$gcds-container-size-lg: 62rem;
$gcds-container-size-xl: 71.25rem;
$gcds-container-size-full: 100%;
$gcds-container-spacing-0: 0;
$gcds-container-spacing-50: 0.1875rem;
Expand Down Expand Up @@ -657,4 +658,4 @@ $gcds-verify-banner-summary-padding: 0.75rem;
$gcds-verify-banner-summary-content-margin: 0 1.125rem 0 0;
$gcds-verify-banner-text: #333333;
$gcds-verify-banner-toggle-text: #2b4380;
$gcds-verify-banner-toggle-font-weight: 700;
$gcds-verify-banner-toggle-font-weight: 700;
9 changes: 5 additions & 4 deletions build/web/scss/components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@

// Do not edit directly
// Generated on Tue, 04 Jul 2023 12:42:15 GMT
// Generated on Thu, 06 Jul 2023 22:12:42 GMT

$gcds-container-border: 0.0625rem solid #7d828b;
$gcds-container-size-xs: 20rem;
$gcds-container-size-sm: 30rem;
$gcds-container-size-md: 48rem;
$gcds-container-size-lg: 64rem;
$gcds-container-size-xl: 75rem;
$gcds-container-size-lg: 62rem;
$gcds-container-size-xl: 71.25rem;
$gcds-container-size-full: 100%;
$gcds-container-spacing-0: 0;
$gcds-container-spacing-50: 0.1875rem;
Expand Down Expand Up @@ -546,4 +547,4 @@ $gcds-verify-banner-summary-padding: 0.75rem;
$gcds-verify-banner-summary-content-margin: 0 1.125rem 0 0;
$gcds-verify-banner-text: #333333;
$gcds-verify-banner-toggle-text: #2b4380;
$gcds-verify-banner-toggle-font-weight: 700;
$gcds-verify-banner-toggle-font-weight: 700;
7 changes: 4 additions & 3 deletions build/web/scss/components/container.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@

// Do not edit directly
// Generated on Thu, 29 Jun 2023 20:51:42 GMT
// Generated on Thu, 06 Jul 2023 22:12:42 GMT

$gcds-container-border: 0.0625rem solid #7d828b;
$gcds-container-size-xs: 20rem;
$gcds-container-size-sm: 30rem;
$gcds-container-size-md: 48rem;
$gcds-container-size-lg: 64rem;
$gcds-container-size-xl: 75rem;
$gcds-container-size-lg: 62rem;
$gcds-container-size-xl: 71.25rem;
$gcds-container-size-full: 100%;
$gcds-container-spacing-0: 0;
$gcds-container-spacing-50: 0.1875rem;
Expand Down
9 changes: 5 additions & 4 deletions build/web/scss/tokens.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, 04 Jul 2023 12:42:15 GMT
// Generated on Thu, 06 Jul 2023 22:12:42 GMT

$gcds-color-blue-100: #d7e5f5;
$gcds-color-blue-500: #6584a6; // Must contrast 3:1 with white
Expand Down Expand Up @@ -58,11 +58,12 @@ $gcds-container-md: 48rem;
$gcds-container-lg: 62rem;
$gcds-container-xl: 71.25rem;
$gcds-container-full: 100%;
$gcds-container-border: 0.0625rem solid #7d828b;
$gcds-container-size-xs: 20rem;
$gcds-container-size-sm: 30rem;
$gcds-container-size-md: 48rem;
$gcds-container-size-lg: 64rem;
$gcds-container-size-xl: 75rem;
$gcds-container-size-lg: 62rem;
$gcds-container-size-xl: 71.25rem;
$gcds-container-size-full: 100%;
$gcds-container-spacing-0: 0;
$gcds-container-spacing-50: 0.1875rem;
Expand Down Expand Up @@ -657,4 +658,4 @@ $gcds-verify-banner-summary-padding: 0.75rem;
$gcds-verify-banner-summary-content-margin: 0 1.125rem 0 0;
$gcds-verify-banner-text: #333333;
$gcds-verify-banner-toggle-text: #2b4380;
$gcds-verify-banner-toggle-font-weight: 700;
$gcds-verify-banner-toggle-font-weight: 700;
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.4.0",
"version": "1.4.1",
"author": "Government of Canada | Gouvernement du Canada",
"description": "GC Design System Tokens",
"homepage": "https://design-system.alpha.canada.ca/",
Expand Down
4 changes: 4 additions & 0 deletions tokens/components/container/tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"container": {
"border": {
"value": "{border.width.sm.value} solid {border.default.value}",
"type": "border"
},
"size": {
"xs": {
"value": "{container.xs.value}",
Expand Down