Skip to content

Commit

Permalink
Merge pull request #76 from davyd-akamai/updates
Browse files Browse the repository at this point in the history
feat: Global Header updates, new 'Danger' button tokens
  • Loading branch information
jaalah-akamai authored Jan 10, 2025
2 parents 3f35bb6 + 5aad0dc commit f09a1a3
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 3 deletions.
16 changes: 16 additions & 0 deletions tokens/alias/dark.json
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,14 @@
"value": "{global.color.green.60}",
"type": "color"
},
"hover": {
"value": "{global.color.green.50}",
"type": "color"
},
"active": {
"value": "{global.color.green.60}",
"type": "color"
},
"disabled": {
"value": "{global.color.neutrals.80}",
"type": "color"
Expand All @@ -304,6 +312,14 @@
"value": "{global.color.red.60}",
"type": "color"
},
"hover": {
"value": "{global.color.red.50}",
"type": "color"
},
"active": {
"value": "{global.color.red.60}",
"type": "color"
},
"disabled": {
"value": "{global.color.neutrals.80}",
"type": "color"
Expand Down
20 changes: 18 additions & 2 deletions tokens/alias/light.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,15 @@
},
"positive": {
"default": {
"value": "{global.color.green.80}",
"value": "{global.color.green.90}",
"type": "color"
},
"hover": {
"value": "{global.color.green.70}",
"type": "color"
},
"active": {
"value": "{global.color.green.90}",
"type": "color"
},
"disabled": {
Expand All @@ -292,7 +300,15 @@
},
"negative": {
"default": {
"value": "{global.color.red.80}",
"value": "{global.color.red.90}",
"type": "color"
},
"hover": {
"value": "{global.color.red.70}",
"type": "color"
},
"active": {
"value": "{global.color.red.90}",
"type": "color"
},
"disabled": {
Expand Down
64 changes: 64 additions & 0 deletions tokens/components/button/button.json
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,70 @@
"description": "This component token is considered unstable and in development."
}
}
},
"danger": {
"default": {
"background": {
"value": "{alias.action.negative.default}",
"type": "color"
},
"text": {
"value": "{alias.content.text.base}",
"type": "color"
},
"icon": {
"value": "{alias.content.icon.base}",
"type": "color"
}
},
"hover": {
"background": {
"value": "{alias.action.negative.hover}",
"type": "color"
},
"text": {
"value": "{alias.content.text.base}",
"type": "color"
},
"icon": {
"value": "{alias.content.icon.base}",
"type": "color"
}
},
"pressed": {
"background": {
"value": "{alias.action.negative.active}",
"type": "color"
},
"text": {
"value": "{alias.content.text.base}",
"type": "color"
},
"icon": {
"value": "{alias.content.icon.base}",
"type": "color"
}
},
"disabled": {
"background": {
"value": "{alias.action.negative.disabled}",
"type": "color"
},
"text": {
"value": "{alias.content.text.primary.disabled}",
"type": "color"
},
"icon": {
"value": "{alias.content.icon.primary.disabled}",
"type": "color"
}
},
"loading": {
"background": {
"value": "{alias.action.negative.active}",
"type": "color"
}
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tokens/components/button/segmentedStatusButton.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
},
"disabledNeutral": {
"background": {
"value": "{alias.action.secondary.disabled}",
"value": "{alias.action.primary.disabled}",
"type": "color"
},
"text": {
Expand Down
18 changes: 18 additions & 0 deletions tokens/components/globals/header.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
"hover": {
"value": "{global.color.neutrals.white}",
"type": "color"
},
"active": {
"value": "{global.color.brand.60}",
"type": "color"
}
},
"text": {
Expand Down Expand Up @@ -57,6 +61,20 @@
"value": "{global.color.neutrals.white}",
"type": "color"
}
},
"border": {
"default": {
"value": "{global.color.neutrals.90}",
"type": "color"
},
"hover": {
"value": "{global.color.neutrals.70}",
"type": "color"
},
"active": {
"value": "{global.color.neutrals.50}",
"type": "color"
}
}
}
}
Expand Down

0 comments on commit f09a1a3

Please sign in to comment.