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

Fix for elevation, alias border-radius token, launch button tokens #61

Merged
merged 16 commits into from
Sep 13, 2024
+14,154 −6,522
Merged

Fix for elevation, alias border-radius token, launch button tokens #61

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
210eebe
fix: expand composite objects and convert rem to px (#55)
jaalah-akamai Jul 31, 2024
c6902e1
Shadow blur value fix
davyd-akamai Aug 21, 2024
8c552fd
Launch button tokens
davyd-akamai Aug 21, 2024
9926ed3
Launch split menu button tokens
davyd-akamai Aug 22, 2024
de5f3b3
New "rangeHover" and "activeDateHover" interaction tokens, calendar t…
davyd-akamai Aug 22, 2024
64192e9
New global gradient token and new component tokens for the Appbar and…
davyd-akamai Aug 22, 2024
ba63245
Add descriptions
jaalah Aug 23, 2024
af9d052
Remove extensions from linear gradient
jaalah Aug 23, 2024
cb81093
Merge remote-tracking branch 'origin/staging' into features
jaalah Aug 23, 2024
897cb66
Merge remote-tracking branch 'upstream/staging' into features
jaalah Aug 23, 2024
be207c8
Update branch with latest and fix border radius and linear gradient
jaalah Aug 23, 2024
c97db1d
Numeric spinner text color property fix
davyd-akamai Aug 26, 2024
ac5dc42
Horizontal stepper structure update
davyd-akamai Sep 11, 2024
d61c702
New tokens for KPI bar: background token, disabled state for KPIs
davyd-akamai Sep 11, 2024
b4a0a72
Update BorderRadius to Radius
jaalah Sep 13, 2024
a8253e4
Update BorderRadius to Radius
jaalah Sep 13, 2024
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
16 changes: 8 additions & 8 deletions tokens/$themes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,6 @@
"component.calendar.border": "5ec91dccd162d8a00dcdce33e32be5745a4b7b7d",
"component.calendar.icon": "d65f2396f09f79e5d294db3bf6c58a2a19a1a32f",
"component.calendar.selectedItem.text": "ced254d26a11d9fcefd4270d255f053bed36d342",
"component.calendar.selectedItem.background": "30c1fba78f48c8b10623f20796104e9ff11913b0",
"component.calendar.hoverItem.background": "064b4925c17995fa3b6d48dcccebfaf40eea9da2",
"component.calendar.hoverItem.text": "cdb70bec5834e382331afe4c1c7f01283e67583a",
"component.calendar.presetArea.background": "a09ecdebf160c7045c5ffc26ee80a751dd072c7c",
Expand Down Expand Up @@ -1427,7 +1426,8 @@
"global.spacing.60": "6666b8e43bf3acd2074fc625f082f833994c5ad7",
"global.spacing.70": "fcfd1090d30c71d7c647a1048f49a9b240f08bb4",
"global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d",
"component.badge.subtle.info.background": "53dd68ea94bea64a5e0dc03b47f1ff14db210c17"
"component.badge.subtle.info.background": "53dd68ea94bea64a5e0dc03b47f1ff14db210c17",
"component.calendar.selectedItem.background.default": "30c1fba78f48c8b10623f20796104e9ff11913b0"
},
"group": "CDS"
},
Expand Down Expand Up @@ -2349,7 +2349,6 @@
"component.calendar.border": "5ec91dccd162d8a00dcdce33e32be5745a4b7b7d",
"component.calendar.icon": "d65f2396f09f79e5d294db3bf6c58a2a19a1a32f",
"component.calendar.selectedItem.text": "ced254d26a11d9fcefd4270d255f053bed36d342",
"component.calendar.selectedItem.background": "30c1fba78f48c8b10623f20796104e9ff11913b0",
"component.calendar.hoverItem.background": "064b4925c17995fa3b6d48dcccebfaf40eea9da2",
"component.calendar.hoverItem.text": "cdb70bec5834e382331afe4c1c7f01283e67583a",
"component.calendar.presetArea.background": "a09ecdebf160c7045c5ffc26ee80a751dd072c7c",
Expand Down Expand Up @@ -2861,7 +2860,8 @@
"global.spacing.70": "fcfd1090d30c71d7c647a1048f49a9b240f08bb4",
"global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d",
"component.calendar.text.default": "db3b28b40f83fe091f9990f3e4037b852d039297",
"component.badge.subtle.info.background": "53dd68ea94bea64a5e0dc03b47f1ff14db210c17"
"component.badge.subtle.info.background": "53dd68ea94bea64a5e0dc03b47f1ff14db210c17",
"component.calendar.selectedItem.background.default": "30c1fba78f48c8b10623f20796104e9ff11913b0"
},
"group": "CDS"
},
Expand Down Expand Up @@ -3783,7 +3783,6 @@
"component.calendar.border": "5ec91dccd162d8a00dcdce33e32be5745a4b7b7d",
"component.calendar.icon": "d65f2396f09f79e5d294db3bf6c58a2a19a1a32f",
"component.calendar.selectedItem.text": "ced254d26a11d9fcefd4270d255f053bed36d342",
"component.calendar.selectedItem.background": "30c1fba78f48c8b10623f20796104e9ff11913b0",
"component.calendar.hoverItem.background": "064b4925c17995fa3b6d48dcccebfaf40eea9da2",
"component.calendar.hoverItem.text": "cdb70bec5834e382331afe4c1c7f01283e67583a",
"component.calendar.presetArea.background": "a09ecdebf160c7045c5ffc26ee80a751dd072c7c",
Expand Down Expand Up @@ -4295,7 +4294,8 @@
"global.spacing.70": "fcfd1090d30c71d7c647a1048f49a9b240f08bb4",
"global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d",
"component.calendar.text.default": "db3b28b40f83fe091f9990f3e4037b852d039297",
"component.badge.subtle.info.background": "53dd68ea94bea64a5e0dc03b47f1ff14db210c17"
"component.badge.subtle.info.background": "53dd68ea94bea64a5e0dc03b47f1ff14db210c17",
"component.calendar.selectedItem.background.default": "30c1fba78f48c8b10623f20796104e9ff11913b0"
},
"group": "CDS"
},
Expand Down Expand Up @@ -5218,7 +5218,6 @@
"component.calendar.border": "5ec91dccd162d8a00dcdce33e32be5745a4b7b7d",
"component.calendar.icon": "d65f2396f09f79e5d294db3bf6c58a2a19a1a32f",
"component.calendar.selectedItem.text": "ced254d26a11d9fcefd4270d255f053bed36d342",
"component.calendar.selectedItem.background": "30c1fba78f48c8b10623f20796104e9ff11913b0",
"component.calendar.hoverItem.background": "064b4925c17995fa3b6d48dcccebfaf40eea9da2",
"component.calendar.hoverItem.text": "cdb70bec5834e382331afe4c1c7f01283e67583a",
"component.calendar.presetArea.background": "a09ecdebf160c7045c5ffc26ee80a751dd072c7c",
Expand Down Expand Up @@ -5730,7 +5729,8 @@
"global.spacing.70": "fcfd1090d30c71d7c647a1048f49a9b240f08bb4",
"global.spacing.80": "d36813c2828b1cf7511a16bb09c9fbf3efd21d5d",
"component.calendar.text.default": "db3b28b40f83fe091f9990f3e4037b852d039297",
"component.badge.subtle.info.background": "53dd68ea94bea64a5e0dc03b47f1ff14db210c17"
"component.badge.subtle.info.background": "53dd68ea94bea64a5e0dc03b47f1ff14db210c17",
"component.calendar.selectedItem.background.default": "30c1fba78f48c8b10623f20796104e9ff11913b0"
},
"group": "CDS"
}
Expand Down
10 changes: 10 additions & 0 deletions tokens/alias/dark.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,16 @@
"disabled": {
"value": "{global.color.neutrals.80}",
"type": "color"
},
"rangeHover": {
"value": "{global.color.neutrals.70}",
"type": "color",
"description": "Hover color for a calendar date range"
},
"activeDateHover": {
"value": "{global.color.brand.50}",
"type": "color",
"description": "Hover color for an active calendar date"
}
}
},
Expand Down
21 changes: 19 additions & 2 deletions tokens/alias/light.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,16 @@
"disabled": {
"value": "{global.color.neutrals.10}",
"type": "color"
},
"rangeHover": {
"value": "{global.color.brand.30}",
"type": "color",
"description": "Hover color for a calendar date range"
},
"activeDateHover": {
"value": "{global.color.brand.80}",
"type": "color",
"description": "Hover color for an active calendar date"
}
}
},
Expand All @@ -363,7 +373,7 @@
"value": {
"x": "0",
"y": "2",
"blur": "6",
"blur": "8",
"spread": "0",
"color": "rgba(58,59,63,0.18)",
"type": "dropShadow"
Expand All @@ -375,7 +385,7 @@
"value": {
"x": "0",
"y": "-2",
"blur": "6",
"blur": "8",
"spread": "0",
"color": "rgba(58,59,63,0.18)",
"type": "dropShadow"
Expand Down Expand Up @@ -1435,6 +1445,13 @@
"type": "color"
}
}
},
"borderRadius": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davyd-akamai We can't have this be the same name as the global token. Maybe we rename this radius? Or can we just put this under border.borderRadius?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved it under border, but let's talk about it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose "border" will not work, since in a Tokens Studio this property is for a border-width (as far as I remember). But let's talk about it

"default": {
"value": "{global.borderRadius.none}",
"type": "borderRadius",
"description": "Default border radius value"
}
}
}
}
4 changes: 4 additions & 0 deletions tokens/components/bars/appbar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
"icon": {
"value": "{alias.content.icon.primary.default}",
"type": "color"
},
"topGradient": {
"value": "{global.color.gradient.default}",
"type": "color"
}
}
}
Expand Down
77 changes: 77 additions & 0 deletions tokens/components/button/button.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,83 @@
"type": "color"
}
}
},
"launch": {
"default": {
"background": {
"value": "{global.color.neutrals.black}",
"type": "color",
"description": "This component token is considered unstable and in development."
},
"text": {
"value": "{global.color.neutrals.white}",
"type": "color",
"description": "This component token is considered unstable and in development."
},
"icon": {
"value": "{global.color.neutrals.white}",
"type": "color",
"description": "This component token is considered unstable and in development."
}
},
"hover": {
"background": {
"value": "{global.color.neutrals.100}",
"type": "color",
"description": "This component token is considered unstable and in development."
},
"text": {
"value": "{global.color.neutrals.white}",
"type": "color",
"description": "This component token is considered unstable and in development."
},
"icon": {
"value": "{global.color.neutrals.white}",
"type": "color",
"description": "This component token is considered unstable and in development."
}
},
"pressed": {
"background": {
"value": "{global.color.neutrals.black}",
"type": "color",
"description": "This component token is considered unstable and in development."
},
"text": {
"value": "{global.color.neutrals.white}",
"type": "color",
"description": "This component token is considered unstable and in development."
},
"icon": {
"value": "{global.color.neutrals.white}",
"type": "color",
"description": "This component token is considered unstable and in development."
}
},
"disabled": {
"background": {
"value": "{global.color.neutrals.20}",
"type": "color",
"description": "This component token is considered unstable and in development."
},
"text": {
"value": "{global.color.neutrals.50}",
"type": "color",
"description": "This component token is considered unstable and in development."
},
"icon": {
"value": "{global.color.neutrals.50}",
"type": "color",
"description": "This component token is considered unstable and in development."
}
},
"loading": {
"background": {
"value": "{global.color.neutrals.black}",
"type": "color",
"description": "This component token is considered unstable and in development."
}
}
}
}
}
Expand Down
118 changes: 118 additions & 0 deletions tokens/components/button/splitMenuButton.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,124 @@
"type": "color"
}
}
},
"launch": {
"default": {
"background": {
"value": "{global.color.neutrals.black}",
"type": "color"
},
"border": {
"value": "{alias.action.base}",
"type": "color"
},
"text": {
"value": "{global.color.neutrals.white}",
"type": "color"
},
"icon": {
"value": "{global.color.neutrals.white}",
"type": "color"
}
},
"hoverLeft": {
"backgroundLeft": {
"value": "{global.color.neutrals.100}",
"type": "color"
},
"backgroundRight": {
"value": "{global.color.neutrals.black}",
"type": "color"
},
"border": {
"value": "{alias.action.base}",
"type": "color"
},
"text": {
"value": "{global.color.neutrals.white}",
"type": "color"
},
"icon": {
"value": "{global.color.neutrals.white}",
"type": "color"
}
},
"hoverRight": {
"backgroundLeft": {
"value": "{global.color.neutrals.black}",
"type": "color"
},
"backgroundRight": {
"value": "{global.color.neutrals.100}",
"type": "color"
},
"border": {
"value": "{alias.action.base}",
"type": "color"
},
"text": {
"value": "{global.color.neutrals.white}",
"type": "color"
},
"icon": {
"value": "{global.color.neutrals.white}",
"type": "color"
}
},
"active": {
"background": {
"value": "{global.color.neutrals.black}",
"type": "color"
},
"border": {
"value": "{alias.action.base}",
"type": "color"
},
"text": {
"value": "{global.color.neutrals.white}",
"type": "color"
},
"icon": {
"value": "{global.color.neutrals.white}",
"type": "color"
}
},
"disabled": {
"background": {
"value": "{global.color.neutrals.20}",
"type": "color"
},
"border": {
"value": "{alias.action.base}",
"type": "color"
},
"text": {
"value": "{global.color.neutrals.50}",
"type": "color"
},
"icon": {
"value": "{global.color.neutrals.50}",
"type": "color"
}
},
"loading": {
"backgroundLeft": {
"value": "{global.color.neutrals.black}",
"type": "color"
},
"backgroundRight": {
"value": "{global.color.neutrals.black}",
"type": "color"
},
"border": {
"value": "{alias.action.base}",
"type": "color"
},
"icon": {
"value": "{global.color.neutrals.white}",
"type": "color"
}
}
}
}
}
Expand Down
26 changes: 24 additions & 2 deletions tokens/components/calendar/calendar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,14 @@
"type": "color"
},
"background": {
"value": "{alias.interaction.background.active}",
"type": "color"
"default": {
"value": "{alias.interaction.background.active}",
"type": "color"
},
"hover": {
"value": "{alias.interaction.background.activeDateHover}",
"type": "color"
}
}
},
"hoverItem": {
Expand All @@ -43,6 +49,22 @@
"type": "color"
}
},
"dateRange": {
"text": {
"value": "{alias.content.text.primary.default}",
"type": "color"
},
"background": {
"default": {
"value": "{alias.interaction.background.elevated}",
"type": "color"
},
"hover": {
"value": "{alias.interaction.background.rangeHover}",
"type": "color"
}
}
},
"presetArea": {
"background": {
"value": "{alias.interaction.background.secondary}",
Expand Down
Loading