Skip to content

Commit

Permalink
Merge pull request #341 from Sage/NEW-ClaireTokens230809
Browse files Browse the repository at this point in the history 
 !!DO NOT MERGE!! Finalised Multi-theme Semantic tokens
  • Loading branch information
@druhill
druhill authored Jan 5, 2024
2 parents 63dcd23 + 5b03a9d commit 5d43cdb
Show file tree
Hide file tree
Showing 8 changed files with 775 additions and 658 deletions.
52 changes: 25 additions & 27 deletions data/tokens/Components/actionpopover.json
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
{
"actionpopover": {
"menu": {
"bg-active": {
"value": "{base.color.interactive.monochrome.standard.active}",
"type": "color",
"description": "previously action minor 850"
},
"bg-hover": {
"value": "{base.color.interactive.monochrome.inverse.hoverAlt}",
"type": "color",
"description": "was action minor 100\n"
},
"label-active": {
"value": "{base.color.interactive.monochrome.standard.withActive}",
"type": "color"
},
"label-disabled": {
"value": "{base.color.interactive.inactive.content}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.monochrome.standard.withHover}",
"type": "color"
},
"label-enabled": {
"value": "{base.color.interactive.monochrome.standard.defaultAlt}",
"type": "color"
}
"bg-active": {
"value": "{base.color.interactive.monochrome.standard.active}",
"type": "color",
"description": "previously action minor 850"
},
"bg-hover": {
"value": "{base.color.interactive.monochrome.standard.hoverAlt}",
"type": "color",
"description": "was action minor 100\n"
},
"label-active": {
"value": "{base.color.interactive.monochrome.standard.withActive}",
"type": "color"
},
"label-disabled": {
"value": "{base.color.interactive.inactive.content}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.monochrome.standard.withHover}",
"type": "color"
},
"label-enabled": {
"value": "{base.color.interactive.monochrome.standard.defaultAlt}",
"type": "color"
}
}
}
73 changes: 39 additions & 34 deletions data/tokens/Components/button.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"value": "{base.color.interactive.inactive.default}",
"type": "color"
},
"bg-enabled": {
"value": "{base.color.interactive.danger.default}",
"type": "color"
},
"bg-active": {
"value": "{base.color.interactive.danger.active}",
"type": "color"
},
"bg-enabled": {
"value": "{base.color.interactive.danger.default}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.interactive.danger.hover}",
"type": "color"
Expand Down Expand Up @@ -64,30 +64,31 @@
"value": "{base.color.interactive.primary.withActive}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.danger.hover}",
"type": "color"
},
"label-disabled": {
"value": "{base.color.interactive.inactive.content}",
"type": "color"
},
"label-enabled": {
"value": "{base.color.interactive.danger.default}",
"type": "color"
},
"label-hover": {
"value": "{base.color.interactive.danger.hover}",
"type": "color"
}
}
},
"standard": {
"primary": {
"bg-active": {
"value": "{base.color.interactive.monochrome.standard.active}",
"type": "color",
"description": "Was previously dark green {base.color.interactive.primary.active}"
},
"bg-disabled": {
"value": "{base.color.interactive.inactive.default}",
"type": "color"
},
"bg-active": {
"value": "{base.color.interactive.primary.active}",
"type": "color"
},
"bg-enabled": {
"value": "{base.color.interactive.primary.default}",
"type": "color"
Expand Down Expand Up @@ -155,35 +156,15 @@
"type": "color"
}
},
"tertiary": {
"subtle": {
"bg-active": {
"value": "{base.color.interactive.monochrome.standard.active}",
"type": "color"
},
"bg-activeDisabled": {
"value": "{base.color.interactive.inactive.default}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.interactive.monochrome.standard.hoverAlt}",
"type": "color"
},
"border-active": {
"value": "{base.color.interactive.monochrome.standard.active}",
"type": "color"
},
"border-disabled": {
"value": "{base.color.interactive.inactive.default}",
"type": "color"
},
"border-enabled": {
"value": "{base.color.interactive.monochrome.standard.defaultAlt}",
"type": "color"
},
"border-hover": {
"value": "{base.color.interactive.monochrome.standard.defaultAlt}",
"type": "color"
},
"label-active": {
"value": "{base.color.interactive.monochrome.standard.withActive}",
"type": "color"
Expand All @@ -201,11 +182,35 @@
"type": "color"
}
},
"subtle": {
"tertiary": {
"bg-active": {
"value": "{base.color.interactive.monochrome.standard.active}",
"type": "color"
},
"bg-activeDisabled": {
"value": "{base.color.interactive.inactive.default}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.interactive.monochrome.standard.hoverAlt}",
"type": "color"
},
"border-active": {
"value": "{base.color.interactive.monochrome.standard.active}",
"type": "color"
},
"border-disabled": {
"value": "{base.color.interactive.inactive.default}",
"type": "color"
},
"border-enabled": {
"value": "{base.color.interactive.monochrome.standard.defaultAlt}",
"type": "color"
},
"border-hover": {
"value": "{base.color.interactive.monochrome.standard.defaultAlt}",
"type": "color"
},
"label-active": {
"value": "{base.color.interactive.monochrome.standard.withActive}",
"type": "color"
Expand Down
12 changes: 10 additions & 2 deletions data/tokens/Components/container.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,16 @@
"value": "{base.color.status.success.standard.default}",
"type": "color"
},
"border-alt": {
"value": "{base.color.generic.fg.standard.delicate}",
"type": "color"
},
"border-inactive": {
"value": "{base.color.interactive.inactive.default}",
"value": "{base.color.generic.fg.standard.soft}",
"type": "color"
},
"border-enabled": {
"value": "{base.color.generic.fg.standard.delicate}",
"value": "{base.color.generic.fg.standard.moderate}",
"type": "color"
},
"icon-active": {
Expand Down Expand Up @@ -110,6 +114,10 @@
"type": "color",
"description": "tile footer bg color\n"
},
"border-alt": {
"value": "{base.color.generic.fg.standard.delicate}",
"type": "color"
},
"border-default": {
"value": "{base.color.generic.fg.standard.soft}",
"type": "color"
Expand Down
132 changes: 67 additions & 65 deletions data/tokens/Components/datatable.json
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,78 @@
{
"datatable": {
"header": {
"bg-default": {
"value": "{origin.colors.transparent}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.generic.content.standard.extreme}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "alpha",
"value": "0.12",
"space": "lch"
"subtle": {
"bg-alt": {
"value": "{base.color.generic.content.standard.extreme}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "alpha",
"value": "0.08",
"space": "lch"
}
}
}
}
},
"bgAlt-default": {
"value": "{base.color.generic.content.standard.extreme}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "alpha",
"value": "0.08",
"space": "lch"
},
"description": "header alt"
},
"bg-default": {
"value": "{origin.colors.transparent}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.generic.content.standard.extreme}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "alpha",
"value": "0.12",
"space": "lch"
}
}
}
},
"description": "header alt"
},
"border-default": {
"value": "{base.color.generic.fg.standard.delicate}",
"type": "color",
"description": "Header borders"
},
"label-default": {
"value": "{base.color.generic.content.standard.harsh}",
"type": "color"
},
"label-hover": {
"value": "{base.color.generic.content.standard.extreme}",
"type": "color"
}
},
"headeralt": {
"bg-default": {
"value": "{base.color.generic.bg.inverse.moderate}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.generic.bg.inverse.soft}",
"type": "color"
},
"bgAlt-default": {
"value": "{base.color.generic.bg.inverse.firm}",
"type": "color",
"description": "Zebra stripes"
},
"border-default": {
"value": "{base.color.generic.fg.inverse.moderate}",
"type": "color"
},
"label-default": {
"value": "{base.color.generic.content.inverse.harsh}",
"type": "color"
"border-default": {
"value": "{base.color.generic.fg.standard.delicate}",
"type": "color",
"description": "Header borders"
},
"label-default": {
"value": "{base.color.generic.content.standard.harsh}",
"type": "color"
},
"label-hover": {
"value": "{base.color.generic.content.standard.extreme}",
"type": "color"
}
},
"label-hover": {
"value": "{base.color.generic.content.inverse.extreme}",
"type": "color"
"harsh": {
"bg-alt": {
"value": "{base.color.generic.bg.inverse.harsh}",
"type": "color",
"description": "Zebra stripes"
},
"bg-default": {
"value": "{base.color.generic.bg.inverse.firm}",
"type": "color"
},
"bg-hover": {
"value": "{base.color.generic.bg.inverse.moderate}",
"type": "color"
},
"border-default": {
"value": "{base.color.generic.fg.inverse.moderate}",
"type": "color"
},
"label-default": {
"value": "{base.color.generic.content.inverse.harsh}",
"type": "color"
},
"label-hover": {
"value": "{base.color.generic.content.inverse.extreme}",
"type": "color"
}
}
},
"row": {
Expand Down
4 changes: 2 additions & 2 deletions data/tokens/Components/nav.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
},
"harsh": {
"bg-default": {
"value": "{base.color.generic.bg.inverse.firm}",
"value": "{base.color.generic.bg.inverse.harsh}",
"type": "color"
},
"bg-alt": {
"value": "{base.color.generic.bg.inverse.moderate}",
"value": "{base.color.generic.bg.inverse.firm}",
"type": "color"
},
"item": {
Expand Down
Loading

0 comments on commit 5d43cdb

Please sign in to comment.