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

V 1.1.2 #122

Merged
merged 10 commits into from
May 31, 2023
Merged

V 1.1.2 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ba0e4d6
move global tokens for container, spacing, and typography into global…
melaniebmn May 29, 2023
64150fd
change focus colour from #303fc3 to #0535d2 to be compliant with cana…
melaniebmn May 29, 2023
c333478
change primary text colour from #000 to #333 to be compliant with can…
melaniebmn May 29, 2023
a7899ed
change link hover colour from #26374a to #0535d2 to be compliant with…
melaniebmn May 29, 2023
b461ea5
change link colour from #425a76 to #2b4380 to be compliant with canad…
melaniebmn May 31, 2023
5098a50
ensure canada signature uses black text
melaniebmn May 31, 2023
9081e0c
update footer contextual background colour with canada.ca colour
melaniebmn May 31, 2023
4d42cc5
reorganize blue colour tokens from light to dark
melaniebmn May 31, 2023
b616eaa
change danger & error border colour from #c24438 to #d3080c to be com…
melaniebmn May 31, 2023
f1fef31
update version
melaniebmn May 31, 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
408 changes: 199 additions & 209 deletions build/figma/figma.tokens.json
View file
Open in desktop

Large diffs are not rendered by default.

204 changes: 101 additions & 103 deletions build/web/_variables.scss
View file
Open in desktop

Large diffs are not rendered by default.

202 changes: 100 additions & 102 deletions build/web/variables.css
View file
Open in desktop

Large diffs are not rendered by default.

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.1.1",
"version": "1.1.2",
"author": "Government of Canada | Gouvernement du Canada",
"description": "GC Design System Tokens",
"homepage": "https://design-system.alpha.canada.ca/",
Expand Down
20 changes: 11 additions & 9 deletions tokens/base/color/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"color": {
"blue": {
"focus": {
"value": "#303FC3",
"type": "color"
},
"100": {
"value": "#D7E5F5",
"type": "color"
Expand All @@ -15,14 +11,19 @@
"comment": "Must contrast 3:1 with white"
},
"700": {
"value": "#425A76",
"value": "#33465c",
"type": "color",
"comment": "Must contrast 7:1 with white"
},
"800": {
"value": "#31455C",
"value": "#2b4380",
"type": "color"
},
"850": {
"value": "#0535d2",
"type": "color",
"comment": "Focus and hover colour"
},
"900": {
"value": "#26374A",
"type": "color"
Expand Down Expand Up @@ -60,7 +61,7 @@
"type": "color"
},
"900": {
"value": "#2F3238",
"value": "#333333",
"type": "color"
},
"1000": {
Expand All @@ -87,14 +88,15 @@
"red": {
"flag": {
"value": "#FF0000",
"type": "color"
"type": "color",
"comment": "Signature flag colour"
},
"100": {
"value": "#FBDDDA",
"type": "color"
},
"500": {
"value": "#C24438",
"value": "#d3080c",
"type": "color",
"comment": "Must contrast 3:1 with white"
},
Expand Down
2 changes: 1 addition & 1 deletion tokens/components/button/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
},
"hover": {
"background": {
"value": "{color.blue.700.value}",
"value": "{color.blue.800.value}",
"type": "color"
}
}
Expand Down
14 changes: 2 additions & 12 deletions tokens/components/footer/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"contextual": {
"background": {
"value": "{color.blue.800.value}",
"value": "{color.blue.700.value}",
"type": "color"
},
"padding": {
Expand Down Expand Up @@ -92,16 +92,6 @@
}
},
"sub": {
"active": {
"background": {
"value": "{active.background.value}",
"type": "color"
},
"text": {
"value": "{active.text.value}",
"type": "color"
}
},
"background": {
"value": "{color.grayscale.50.value}",
"type": "color"
Expand Down Expand Up @@ -169,7 +159,7 @@
}
},
"text": {
"value": "{color.blue.800.value}",
"value": "{link.default.value}",
"type": "color"
}
},
Expand Down
2 changes: 1 addition & 1 deletion tokens/components/icon/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { lineHeights } = require('../../base/typography/base');
const { lineHeights } = require('../../global/typography/base');

const font = {
family: {
Expand Down
2 changes: 1 addition & 1 deletion tokens/components/signature/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "color"
},
"text": {
"value": "{text.primary.value}",
"value": "{color.grayscale.1000.value}",
"type": "color"
}
},
Expand Down
10 changes: 5 additions & 5 deletions tokens/global/color/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
"focus": {
"background": {
"value": "{color.blue.focus.value}",
"value": "{color.blue.850.value}",
"type": "color",
"comment": "Global color: focus background"
},
Expand All @@ -59,19 +59,19 @@
"comment": "Global color: focus text"
},
"textForm": {
"value": "{color.blue.focus.value}",
"value": "{color.blue.850.value}",
"type": "color",
"comment": "Global color: focus text form elements"
}
},
"link": {
"default": {
"value": "{color.blue.700.value}",
"value": "{color.blue.800.value}",
"type": "color",
"comment": "Global color: link default"
},
"hover": {
"value": "{color.blue.900.value}",
"value": "{color.blue.850.value}",
"type": "color",
"comment": "Global color: link hover"
},
Expand All @@ -88,7 +88,7 @@
"comment": "Global color: text light"
},
"primary": {
"value": "{color.grayscale.1000.value}",
"value": "{color.grayscale.900.value}",
"type": "color",
"comment": "Global color: text primary"
},
Expand Down
0 tokens/base/container/base.json → tokens/global/container/base.json
View file
Open in desktop
File renamed without changes.
0 tokens/base/spacing/base.js → tokens/global/spacing/base.js
View file
Open in desktop
File renamed without changes.
0 tokens/base/typography/base.js → tokens/global/typography/base.js
View file
Open in desktop
File renamed without changes.