Skip to content

Commit

Permalink
Merge branch 'beta' into ts-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@druhill
druhill authored Dec 3, 2024
2 parents 63f575f + a28b2ee commit c785392
Show file tree
Hide file tree
Showing 8 changed files with 416 additions and 177 deletions.
6 changes: 0 additions & 6 deletions data/tokens/$themes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4391,12 +4391,6 @@
"tab.color.bg-hover": "5a423db0a74e578a55e9190169ed5706b8a008f4",
"tab.color.border-enabled": "ab9fa748bb5194e0fc3e265ea50d015bb014fd2d",
"tab.color.border-hover": "c5affbe1329789237c379a860684f3034b0933e7",
"tab.color.icon-enabled": "6d4c0c7c30992888d09c794ab70a3c3ce7b9baef",
"tab.color.icon-hover": "f6d224fe972b8d484006cd2b251b48e9c6f6144b",
"tab.color.label-active": "19d3a9036e6e2b1271ff32b81fa50191cbffa142",
"tab.color.icon-active": "a882447b658aa26b2694f1b6ebf26eaeb98d6e43",
"tab.color.label-enabled": "691226bda8fc13bcbfae1e7e409dd8aacfc9e44f",
"tab.color.label-hover": "f8c367d3dca0e458c0a4937e5d4a65b01d58ba26",
"tab.color.navigation.bg-default": "e3facc8423ab67d4d5beeae1562fece5da868d02",
"tab.color.validation.border-warning": "cf2e74be918f9b6ed3c2e2a2bd205c64cae48778",
"tab.color.validation.border-error": "f794f4e18be75e8014786527f9dc50e4f9301a29",
Expand Down
80 changes: 42 additions & 38 deletions data/tokens/components/button.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,44 +710,6 @@
"type": "color"
}
},
"toggle": {
"bg-activeDisabled": {
"value": "{modes.color.interactive.inactive.default}",
"type": "color"
},
"label-activeDisabled": {
"value": "{modes.color.interactive.inactive.contentAlt}",
"type": "color"
},
"bg-active": {
"value": "{modes.color.interactive.monochrome.generic.active}",
"type": "color"
},
"bg-hover": {
"value": "{modes.color.interactive.monochrome.generic.hoverAlt}",
"type": "color"
},
"border-enabled": {
"value": "{modes.color.interactive.monochrome.generic.default}",
"type": "color"
},
"label-active": {
"value": "{modes.color.interactive.monochrome.generic.withActive}",
"type": "color"
},
"label-disabled": {
"value": "{modes.color.interactive.inactive.content}",
"type": "color"
},
"label-enabled": {
"value": "{modes.color.interactive.monochrome.generic.defaultAlt}",
"type": "color"
},
"label-hover": {
"value": "{modes.color.interactive.monochrome.generic.withHover}",
"type": "color"
}
},
"secondary": {
"bg-active": {
"value": "{modes.color.interactive.monochrome.generic.activeAlt}",
Expand Down Expand Up @@ -845,6 +807,10 @@
"value": "{modes.color.interactive.monochrome.generic.withActiveAlt}",
"type": "color"
},
"label-active-copy": {
"value": "{modes.color.interactive.monochrome.frozen.withActive}",
"type": "color"
},
"label-disabled": {
"value": "{modes.color.interactive.inactive.content}",
"type": "color"
Expand All @@ -857,6 +823,44 @@
"value": "{modes.color.interactive.monochrome.generic.withHover}",
"type": "color"
}
},
"toggle": {
"bg-activeDisabled": {
"value": "{modes.color.interactive.inactive.default}",
"type": "color"
},
"label-activeDisabled": {
"value": "{modes.color.interactive.inactive.contentAlt}",
"type": "color"
},
"bg-active": {
"value": "{modes.color.interactive.monochrome.generic.active}",
"type": "color"
},
"bg-hover": {
"value": "{modes.color.interactive.monochrome.generic.hoverAlt}",
"type": "color"
},
"border-enabled": {
"value": "{modes.color.interactive.monochrome.generic.default}",
"type": "color"
},
"label-active": {
"value": "{modes.color.interactive.monochrome.generic.withActive}",
"type": "color"
},
"label-disabled": {
"value": "{modes.color.interactive.inactive.content}",
"type": "color"
},
"label-enabled": {
"value": "{modes.color.interactive.monochrome.generic.defaultAlt}",
"type": "color"
},
"label-hover": {
"value": "{modes.color.interactive.monochrome.generic.withHover}",
"type": "color"
}
}
},
"video": {
Expand Down
5 changes: 5 additions & 0 deletions data/tokens/components/tab.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@
}
},
"color": {
"bg-enabled": {
"value": "{modes.color.none}",
"type": "color",
"description": "For anchor nav, not tab."
},
"bg-hover": {
"value": "{modes.color.interactive.monochrome.generic.hoverAlt}",
"type": "color",
Expand Down
164 changes: 119 additions & 45 deletions data/tokens/context/frozenproduct.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
"button": {
"color": {
"typical": {
"primary": {
"bg-active": {
"value": "{modes.color.interactive.primary.frozen.active}",
"type": "color"
},
"bg-enabled": {
"value": "{modes.color.interactive.primary.frozen.default}",
"type": "color"
},
"bg-hover": {
"value": "{modes.color.interactive.primary.frozen.hover}",
"type": "color"
}
},
"secondary": {
"bg-active": {
"value": "{modes.color.interactive.primary.frozen.active}",
Expand All @@ -26,6 +40,36 @@
"label-enabled": {
"value": "{modes.color.interactive.primary.frozen.default}",
"type": "color"
},
"label-hover": {
"value": "{modes.color.interactive.monochrome.frozen.withHoverAlt}",
"type": "color"
},
"label-active": {
"value": "{modes.color.interactive.monochrome.frozen.withActive}",
"type": "color"
}
},
"subtle": {
"bg-active": {
"value": "{modes.color.interactive.monochrome.frozen.activeAlt}",
"type": "color"
},
"bg-hover": {
"value": "{modes.color.interactive.monochrome.frozen.hoverAlt}",
"type": "color"
},
"label-active": {
"value": "{modes.color.interactive.monochrome.frozen.active}",
"type": "color"
},
"label-enabled": {
"value": "{modes.color.interactive.monochrome.frozen.default}",
"type": "color"
},
"label-hover": {
"value": "{modes.color.interactive.monochrome.frozen.withHover}",
"type": "color"
}
},
"tertiary": {
Expand All @@ -42,7 +86,7 @@
"type": "color"
},
"border-enabled": {
"value": "{modes.color.interactive.primary.frozen.default}",
"value": "{modes.color.none}",
"type": "color"
},
"border-hover": {
Expand All @@ -56,41 +100,19 @@
"bg-enabled": {
"value": "{modes.color.none}",
"type": "color"
}
},
"primary": {
"bg-active": {
"value": "{modes.color.interactive.primary.frozen.active}",
"type": "color"
},
"bg-enabled": {
"value": "{modes.color.interactive.primary.frozen.default}",
"label-hover": {
"value": "{modes.color.interactive.monochrome.frozen.withHoverAlt}",
"type": "color"
},
"bg-hover": {
"value": "{modes.color.interactive.primary.frozen.hover}",
"label-active": {
"value": "{modes.color.interactive.monochrome.frozen.withActive}",
"type": "color"
}
},
"subtle": {
"bg-active": {
"value": "{modes.color.interactive.monochrome.frozen.activeAlt}",
"type": "color"
},
"bg-hover": {
"value": "{modes.color.interactive.monochrome.frozen.hoverAlt}",
"type": "color"
},
"label-active": {
"value": "{modes.color.interactive.monochrome.frozen.active}",
"type": "color"
},
"label-enabled": {
"value": "{modes.color.interactive.monochrome.frozen.default}",
"type": "color"
},
"toggle": {
"label-hover": {
"value": "{modes.color.interactive.monochrome.frozen.withHover}",
"value": "{modes.color.interactive.monochrome.generic.withHover}",
"type": "color"
}
}
Expand Down Expand Up @@ -216,6 +238,20 @@
"value": "{modes.color.interactive.dataEntry.frozen.withDefault}",
"type": "color"
}
},
"switch": {
"bg-active": {
"value": "{modes.color.interactive.monochrome.frozen.default}",
"type": "color"
},
"border-enabled": {
"value": "{modes.color.interactive.dataEntry.frozen.withDefault}",
"type": "color"
},
"fg-enabled": {
"value": "{modes.color.interactive.dataEntry.frozen.withDefault}",
"type": "color"
}
}
}
},
Expand Down Expand Up @@ -283,20 +319,6 @@
}
}
},
"tab": {
"radius": {
"M": {
"value": "{global.radius.interactive.S}",
"type": "borderRadius",
"description": "Tab horizontal - top corners. Tab vertical - left corners."
},
"L": {
"value": "{global.radius.interactive.S}",
"type": "borderRadius",
"description": "Tab horizontal - top corners. Tab vertical - left corners."
}
}
},
"nav": {
"radius": {
"menumodal": {
Expand Down Expand Up @@ -325,15 +347,30 @@
"type": "color"
},
"label-hover": {
"value": "{modes.color.interactive.monochrome.frozen.withHover}",
"value": "{modes.color.interactive.monochrome.generic.default}",
"type": "color"
},
"label-enabled": {
"value": "{modes.color.interactive.monochrome.frozen.default}",
"value": "{modes.color.interactive.monochrome.generic.default}",
"type": "color"
}
}
},
"progress": {
"color": {
"loader": {
"bg-default": {
"value": "{modes.color.interactive.progress.frozen.bg}",
"type": "color"
},
"fg-default": {
"value": "{modes.color.interactive.primary.frozen.default}",
"type": "color",
"description": "used for loader standard loader spinner"
}
}
}
},
"status": {
"color": {
"rating": {
Expand Down Expand Up @@ -363,6 +400,43 @@
}
}
},
"tab": {
"radius": {
"M": {
"value": "{global.radius.interactive.S}",
"type": "borderRadius",
"description": "Tab horizontal - top corners. Tab vertical - left corners."
},
"L": {
"value": "{global.radius.interactive.S}",
"type": "borderRadius",
"description": "Tab horizontal - top corners. Tab vertical - left corners."
}
},
"color": {
"bg-enabled": {
"value": "{modes.color.interactive.monochrome.generic.withDefault}",
"type": "color"
},
"bg-hover": {
"value": "{modes.color.interactive.monochrome.frozen.hoverAlt}",
"type": "color",
"description": "For anchor nav, not tab."
},
"border-active": {
"value": "{modes.color.interactive.primary.frozen.default}",
"type": "color"
},
"border-enabled": {
"value": "{modes.color.interactive.monochrome.frozen.hoverAlt}",
"type": "color"
},
"border-hover": {
"value": "{modes.color.interactive.monochrome.frozen.hoverAlt}",
"type": "color"
}
}
},
"table": {
"color": {
"row": {
Expand Down
Loading

0 comments on commit c785392

Please sign in to comment.