Skip to content

Commit

Permalink
feat(data): MANY ORIGIN and MIDLAYER changes including...
Browse files Browse the repository at this point in the history
1. Remove origin.colors.inverse.jade and add origin.colors.lightGreen.
2. Reorder origin colours.
3. Rename base.color.primary to base.primary.standard and add base.primary.inverse.
4. Add origin.colors.lightRed.
5. Rename base.color.interactive.danger to base.color.interactive.danger.typical.
6. Add base.color.interactive.danger.inverse colour tokens.
  • Loading branch information
clairedenning committed Jan 11, 2024
1 parent fe4609b commit 068ec3d
Show file tree
Hide file tree
Showing 6 changed files with 241 additions and 199 deletions.
38 changes: 19 additions & 19 deletions data/tokens/Components/button.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,73 +73,73 @@
"type": "color"
},
"bg-active": {
"value": "{base.color.interactive.danger.active}",
"value": "{base.color.interactive.danger.typical.active}",
"type": "color"
},
"bg-enabled": {
"value": "{base.color.interactive.danger.default}",
"value": "{base.color.interactive.danger.typical.default}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.interactive.danger.hover}",
"value": "{base.color.interactive.danger.typical.hover}",
"type": "color"
},
"label-active": {
"value": "{base.color.interactive.danger.withActive}",
"value": "{base.color.interactive.danger.typical.withActive}",
"type": "color"
},
"label-disabled": {
"value": "{base.color.interactive.inactive.standard.contentAlt}",
"type": "color"
},
"label-enabled": {
"value": "{base.color.interactive.danger.withDefault}",
"value": "{base.color.interactive.danger.typical.withDefault}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.danger.withDefault}",
"value": "{base.color.interactive.danger.typical.withDefault}",
"type": "color"
}
},
"secondary": {
"bg-active": {
"value": "{base.color.interactive.danger.active}",
"value": "{base.color.interactive.danger.typical.active}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.interactive.danger.hoverAlt}",
"value": "{base.color.interactive.danger.typical.hoverAlt}",
"type": "color"
},
"border-active": {
"value": "{base.color.interactive.danger.active}",
"value": "{base.color.interactive.danger.typical.active}",
"type": "color"
},
"border-disabled": {
"value": "{base.color.interactive.inactive.standard.default}",
"type": "color"
},
"border-enabled": {
"value": "{base.color.interactive.danger.default}",
"value": "{base.color.interactive.danger.typical.default}",
"type": "color"
},
"border-hover": {
"value": "{base.color.interactive.danger.hover}",
"value": "{base.color.interactive.danger.typical.hover}",
"type": "color"
},
"label-active": {
"value": "{base.color.interactive.primary.withActive}",
"value": "{base.color.interactive.primary.typical.withActive}",
"type": "color"
},
"label-disabled": {
"value": "{base.color.interactive.inactive.standard.content}",
"type": "color"
},
"label-enabled": {
"value": "{base.color.interactive.danger.default}",
"value": "{base.color.interactive.danger.typical.default}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.danger.hover}",
"value": "{base.color.interactive.danger.typical.hover}",
"type": "color"
}
}
Expand All @@ -156,27 +156,27 @@
"type": "color"
},
"bg-enabled": {
"value": "{base.color.interactive.primary.default}",
"value": "{base.color.interactive.primary.typical.default}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.interactive.primary.hover}",
"value": "{base.color.interactive.primary.typical.hover}",
"type": "color"
},
"label-active": {
"value": "{base.color.interactive.primary.withActive}",
"value": "{base.color.interactive.primary.typical.withActive}",
"type": "color"
},
"label-disabled": {
"value": "{base.color.interactive.inactive.standard.content}",
"type": "color"
},
"label-enabled": {
"value": "{base.color.interactive.primary.withDefault}",
"value": "{base.color.interactive.primary.typical.withDefault}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.primary.withDefault}",
"value": "{base.color.interactive.primary.typical.withDefault}",
"type": "color"
}
},
Expand Down
2 changes: 1 addition & 1 deletion data/tokens/Components/datatable.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
},
"row": {
"bg-activated": {
"value": "{base.color.interactive.primary.default}",
"value": "{base.color.interactive.primary.typical.default}",
"type": "color"
},
"bg-active": {
Expand Down
2 changes: 1 addition & 1 deletion data/tokens/Components/form.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
},
"labelset": {
"label-required": {
"value": "{base.color.interactive.danger.default}",
"value": "{base.color.interactive.danger.typical.default}",
"type": "color"
},
"label-default": {
Expand Down
12 changes: 6 additions & 6 deletions data/tokens/Components/link.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
},
"destructive": {
"label-default": {
"value": "{base.color.interactive.danger.default}",
"value": "{base.color.interactive.danger.typical.default}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.danger.hover}",
"value": "{base.color.interactive.danger.typical.hover}",
"type": "color"
}
},
"typical": {
"label-default": {
"value": "{base.color.interactive.primary.defaultAlt}",
"value": "{base.color.interactive.primary.typical.defaultAlt}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.inverse.hoverAlt}",
"value": "{base.color.interactive.primary.inverse.hoverAlt}",
"type": "color"
}
},
Expand All @@ -52,11 +52,11 @@
},
"typical": {
"label-default": {
"value": "{base.color.interactive.inverse.defaultAlt}",
"value": "{base.color.interactive.primary.inverse.defaultAlt}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.inverse.hoverAlt}",
"value": "{base.color.interactive.primary.inverse.hoverAlt}",
"type": "color"
}
},
Expand Down

0 comments on commit 068ec3d

Please sign in to comment.