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

feat!: Refactor brand colour tokens #1820

Draft
wants to merge 18 commits into
base: develop
Choose a base branch
from
Draft

feat!: Refactor brand colour tokens #1820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
578f548
Use semantic colour tokens in brand level
VincentSmedinga Dec 20, 2024
2b86355
Use default text color token
VincentSmedinga Jan 7, 2025
68f44ad
Use inverse text color token
VincentSmedinga Jan 7, 2025
3769932
Introduce ‘contrast’ and ‘inverse’ interactive colours
VincentSmedinga Jan 7, 2025
a82e6aa
Use canvas color token
VincentSmedinga Jan 7, 2025
87b8cc4
Use separator color token
VincentSmedinga Jan 7, 2025
5ba949b
Use feedback colour tokens
VincentSmedinga Jan 9, 2025
4e5a2eb
Add and use logo colour token
VincentSmedinga Jan 9, 2025
1b27a2b
Use disabled colour token
VincentSmedinga Jan 9, 2025
b6e63e0
Use secondary text colour token
VincentSmedinga Jan 9, 2025
4b0c0e1
Add and use highlight colour token
VincentSmedinga Jan 9, 2025
b86b927
Use supplemental colour tokens
VincentSmedinga Jan 9, 2025
5fa5dab
Add and use visited interactive colour token
VincentSmedinga Jan 9, 2025
1f0f932
Add and use border colour token
VincentSmedinga Jan 10, 2025
2dffc45
Update our Color Palette component
VincentSmedinga Jan 16, 2025
ffec029
Split design tokens table into sections
VincentSmedinga Jan 17, 2025
ab2b414
Rename ‘supplemental’ colours to ‘highlight’
VincentSmedinga Jan 17, 2025
fe8631e
Use raw RGB values in brand tokens
VincentSmedinga Jan 17, 2025
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
92 changes: 77 additions & 15 deletions proprietary/tokens/src/brand/ams/color.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,83 @@
{
"ams": {
"color": {
"primary-black": { "value": "#000000" },
"primary-white": { "value": "#FFFFFF" },
"primary-blue": { "value": "#004699" },
"primary-red": { "value": "#EC0000" },
"dark-blue": { "value": "#102E62" },
"orange": { "value": "#FF9100" },
"yellow": { "value": "#FFE600" },
"green": { "value": "#BED200" },
"dark-green": { "value": "#00A03C" },
"blue": { "value": "#009DE6" },
"purple": { "value": "#A00078" },
"magenta": { "value": "#E50082" },
"neutral-grey1": { "value": "#E8E8E8" },
"neutral-grey2": { "value": "#BEBEBE" },
"neutral-grey3": { "value": "#767676" }
"border": {
"default": { "value": "#ffffff" }
},
"canvas": {
"default": { "value": "#000000" }
},
"feedback": {
"error": {
"default": { "value": "#ec0000" }
},
"info": {
"default": { "value": "#009de6" }
},
"success": {
"default": { "value": "#00a03c" }
},
"warning": {
"default": { "value": "#ff9100" }
}
},
"footer": {
"default": { "value": "#004699" }
},
"highlight": {
"azure": {
"default": { "value": "#009de6" }
},
"green": {
"default": { "value": "#00a03c" }
},
"lime": {
"default": { "value": "#bed200" }
},
"magenta": {
"default": { "value": "#e50082" }
},
"orange": {
"default": { "value": "#ff9100" }
},
"purple": {
"default": { "value": "#a00078" }
},
"yellow": {
"default": { "value": "#ffe600" }
}
},
"interactive": {
"default": { "value": "#004699" },
"hover": { "value": "#003677" },
"contrast": {
"default": { "value": "#ffffff" }
},
"disabled": {
"default": { "value": "#767676" }
},
"invalid": {
"default": { "value": "#ec0000" },
"hover": { "value": "#b70000" }
},
"inverse": {
"default": { "value": "#000000" }
},
"visited": {
"default": { "value": "#a00078" }
}
},
"logo": {
"default": { "value": "#ec0000" }
},
"separator": {
"default": { "value": "#d1d1d1" }
},
"text": {
"default": { "value": "#ffffff" },
"secondary": { "value": "#767676" },
"inverse": { "value": "#000000" }
}
}
}
}
19 changes: 11 additions & 8 deletions proprietary/tokens/src/common/ams/link-appearance.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"ams": {
"link-appearance": {
"color": { "value": "{ams.color.primary-blue}" },
"color": { "value": "{ams.color.interactive.default}" },
"text-decoration-thickness": { "value": "{ams.border.width.md}" },
"text-underline-offset": { "value": "0.3333em" },
"hover": {
"color": { "value": "{ams.color.dark-blue}" }
"color": { "value": "{ams.color.interactive.hover}" }
},
"visited": {
"color": { "value": "{ams.color.interactive.visited.default}" }
},
"regular": {
"text-decoration-line": { "value": "underline" },
Expand All @@ -21,21 +24,21 @@
}
},
"contrast": {
"color": { "value": "{ams.color.primary-black}" },
"color": { "value": "{ams.color.interactive.contrast.default}" },
"hover": {
"color": { "value": "{ams.color.primary-black}" }
"color": { "value": "{ams.color.interactive.contrast.default}" }
},
"visited": {
"color": { "value": "{ams.color.primary-black}" }
"color": { "value": "{ams.color.interactive.contrast.default}" }
}
},
"inverse": {
"color": { "value": "{ams.color.primary-white}" },
"color": { "value": "{ams.color.interactive.inverse.default}" },
"hover": {
"color": { "value": "{ams.color.primary-white}" }
"color": { "value": "{ams.color.interactive.inverse.default}" }
},
"visited": {
"color": { "value": "{ams.color.primary-white}" }
"color": { "value": "{ams.color.interactive.inverse.default}" }
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions proprietary/tokens/src/components/ams/accordion.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"accordion": {
"gap": { "value": "{ams.space.md}" },
"button": {
"color": { "value": "{ams.color.primary-blue}" },
"color": { "value": "{ams.color.interactive.default}" },
"font-family": { "value": "{ams.text.font-family}" },
"font-size": { "value": "{ams.text.level.5.font-size}" },
"font-weight": { "value": "{ams.text.font-weight.bold}" },
Expand All @@ -15,7 +15,7 @@
"outline-offset": { "value": "{ams.focus.outline-offset}" }
},
"hover": {
"color": { "value": "{ams.color.dark-blue}" }
"color": { "value": "{ams.color.interactive.hover}" }
}
},
"panel": {
Expand Down
10 changes: 5 additions & 5 deletions proprietary/tokens/src/components/ams/alert.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"ams": {
"alert": {
"background-color": { "value": "{ams.color.primary-white}" },
"background-color": { "value": "{ams.color.canvas.default}" },
"border-width": { "value": "{ams.border.width.xl}" },
"border-style": { "value": "solid" },
"gap": { "value": "{ams.space.sm}" },
"padding-block": { "value": "{ams.space.md}" },
"padding-inline": { "value": "{ams.space.lg}" },
"error": {
"border-color": { "value": "{ams.color.primary-red}" }
"border-color": { "value": "{ams.color.feedback.error.default}" }
},
"info": {
"border-color": { "value": "{ams.color.blue}" }
"border-color": { "value": "{ams.color.feedback.info.default}" }
},
"success": {
"border-color": { "value": "{ams.color.dark-green}" }
"border-color": { "value": "{ams.color.feedback.success.default}" }
},
"warning": {
"border-color": { "value": "{ams.color.orange}" }
"border-color": { "value": "{ams.color.feedback.warning.default}" }
},
"content": {
"gap": { "value": "{ams.space.sm}" }
Expand Down
80 changes: 42 additions & 38 deletions proprietary/tokens/src/components/ams/avatar.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,68 @@
"line-height": { "value": "{ams.text.level.6.line-height}" },
"padding-block": { "value": "{ams.space.xs}" },
"padding-inline": { "value": "{ams.space.xs}" },
"azure": {
"background-color": { "value": "{ams.color.highlight.azure.default}" },
"color": { "value": "{ams.color.text.default}" }
},
"black": {
"background-color": { "value": "{ams.color.primary-black}" },
"color": { "value": "{ams.color.primary-white}" }
"background-color": { "value": "{ams.brand.color.neutral.100}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"blue": {
"background-color": { "value": "{ams.color.primary-blue}" },
"color": { "value": "{ams.color.primary-white}" }
},
"dark-green": {
"background-color": { "value": "{ams.color.dark-green}" },
"color": { "value": "{ams.color.primary-white}" }
},
"forced-colors": {
"border-width": { "value": "{ams.border.width.md}" }
"background-color": { "value": "{ams.brand.color.blue.60}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"green": {
"background-color": { "value": "{ams.color.green}" },
"color": { "value": "{ams.color.primary-black}" }
"background-color": { "value": "{ams.color.highlight.green.default}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"grey-1": {
"background-color": { "value": "{ams.color.neutral-grey1}" },
"color": { "value": "{ams.color.primary-black}" }
"lime": {
"background-color": { "value": "{ams.color.highlight.lime.default}" },
"color": { "value": "{ams.color.text.default}" }
},
"grey-2": {
"background-color": { "value": "{ams.color.neutral-grey2}" },
"color": { "value": "{ams.color.primary-black}" }
"magenta": {
"background-color": { "value": "{ams.color.highlight.magenta.default}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"grey-3": {
"background-color": { "value": "{ams.color.neutral-grey3}" },
"color": { "value": "{ams.color.primary-white}" }
"neutral-20": {
"background-color": { "value": "{ams.brand.color.neutral.20}" },
"color": { "value": "{ams.color.text.default}" }
},
"light-blue": {
"background-color": { "value": "{ams.color.blue}" },
"color": { "value": "{ams.color.primary-black}" }
"neutral-40": {
"background-color": { "value": "{ams.brand.color.neutral.40}" },
"color": { "value": "{ams.color.text.default}" }
},
"magenta": {
"background-color": { "value": "{ams.color.magenta}" },
"color": { "value": "{ams.color.primary-white}" }
"neutral-60": {
"background-color": { "value": "{ams.brand.color.neutral.60}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"neutral-80": {
"background-color": { "value": "{ams.brand.color.neutral.80}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"orange": {
"background-color": { "value": "{ams.color.orange}" },
"color": { "value": "{ams.color.primary-black}" }
"background-color": { "value": "{ams.color.highlight.orange.default}" },
"color": { "value": "{ams.color.text.default}" }
},
"purple": {
"background-color": { "value": "{ams.color.purple}" },
"color": { "value": "{ams.color.primary-white}" }
"background-color": { "value": "{ams.color.highlight.purple.default}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"red": {
"background-color": { "value": "{ams.color.primary-red}" },
"color": { "value": "{ams.color.primary-white}" }
"background-color": { "value": "{ams.brand.color.red.60}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"white": {
"background-color": { "value": "{ams.color.primary-white}" },
"color": { "value": "{ams.color.primary-black}" }
"background-color": { "value": "{ams.color.text.inverse}" },
"color": { "value": "{ams.color.text.default}" }
},
"yellow": {
"background-color": { "value": "{ams.color.yellow}" },
"color": { "value": "{ams.color.primary-black}" }
"background-color": { "value": "{ams.color.highlight.yellow.default}" },
"color": { "value": "{ams.color.text.default}" }
},
"forced-colors": {
"border-width": { "value": "{ams.border.width.md}" }
}
}
}
Expand Down
74 changes: 39 additions & 35 deletions proprietary/tokens/src/components/ams/badge.tokens.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,61 +6,65 @@
"font-weight": { "value": "{ams.text.font-weight.bold}" },
"line-height": { "value": "{ams.text.level.5.line-height}" },
"padding-inline": { "value": "{ams.space.xs}" },
"azure": {
"background-color": { "value": "{ams.color.highlight.azure.default}" },
"color": { "value": "{ams.color.text.default}" }
},
"black": {
"background-color": { "value": "{ams.color.primary-black}" },
"color": { "value": "{ams.color.primary-white}" }
"background-color": { "value": "{ams.brand.color.neutral.100}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"blue": {
"background-color": { "value": "{ams.color.primary-blue}" },
"color": { "value": "{ams.color.primary-white}" }
},
"dark-green": {
"background-color": { "value": "{ams.color.dark-green}" },
"color": { "value": "{ams.color.primary-white}" }
"background-color": { "value": "{ams.brand.color.blue.60}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"green": {
"background-color": { "value": "{ams.color.green}" },
"color": { "value": "{ams.color.primary-black}" }
"background-color": { "value": "{ams.color.highlight.green.default}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"grey-1": {
"background-color": { "value": "{ams.color.neutral-grey1}" },
"color": { "value": "{ams.color.primary-black}" }
"lime": {
"background-color": { "value": "{ams.color.highlight.lime.default}" },
"color": { "value": "{ams.color.text.default}" }
},
"grey-2": {
"background-color": { "value": "{ams.color.neutral-grey2}" },
"color": { "value": "{ams.color.primary-black}" }
"magenta": {
"background-color": { "value": "{ams.color.highlight.magenta.default}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"grey-3": {
"background-color": { "value": "{ams.color.neutral-grey3}" },
"color": { "value": "{ams.color.primary-white}" }
"neutral-20": {
"background-color": { "value": "{ams.brand.color.neutral.20}" },
"color": { "value": "{ams.color.text.default}" }
},
"light-blue": {
"background-color": { "value": "{ams.color.blue}" },
"color": { "value": "{ams.color.primary-black}" }
"neutral-40": {
"background-color": { "value": "{ams.brand.color.neutral.40}" },
"color": { "value": "{ams.color.text.default}" }
},
"magenta": {
"background-color": { "value": "{ams.color.magenta}" },
"color": { "value": "{ams.color.primary-white}" }
"neutral-60": {
"background-color": { "value": "{ams.brand.color.neutral.60}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"neutral-80": {
"background-color": { "value": "{ams.brand.color.neutral.80}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"orange": {
"background-color": { "value": "{ams.color.orange}" },
"color": { "value": "{ams.color.primary-black}" }
"background-color": { "value": "{ams.color.highlight.orange.default}" },
"color": { "value": "{ams.color.text.default}" }
},
"purple": {
"background-color": { "value": "{ams.color.purple}" },
"color": { "value": "{ams.color.primary-white}" }
"background-color": { "value": "{ams.color.highlight.purple.default}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"red": {
"background-color": { "value": "{ams.color.primary-red}" },
"color": { "value": "{ams.color.primary-white}" }
"background-color": { "value": "{ams.brand.color.red.60}" },
"color": { "value": "{ams.color.text.inverse}" }
},
"white": {
"background-color": { "value": "{ams.color.primary-white}" },
"color": { "value": "{ams.color.primary-black}" }
"background-color": { "value": "{ams.color.text.inverse}" },
"color": { "value": "{ams.color.text.default}" }
},
"yellow": {
"background-color": { "value": "{ams.color.yellow}" },
"color": { "value": "{ams.color.primary-black}" }
"background-color": { "value": "{ams.color.highlight.yellow.default}" },
"color": { "value": "{ams.color.text.default}" }
}
}
}
Expand Down
Loading
Loading