Skip to content

Commit

Permalink
feat(primitives and modes): 1. Add
Browse files Browse the repository at this point in the history
primitives.colors.navyAlt, and
primitives.colors.navyAltBright.

2. Update values in light and dark modes in
modes.color.interactive.dataEntry.frozen.withDefault,
modes.color.interactive.inactive.frozen.defaultAlt, 
modes.color.interactive.monochrome.generic.frozen.active, 
modes.color.interactive.monochrome.frozen, 
modes.color.interactive.primary.frozen.table.default, and
modes.color.status.neutral.frozen.
  • Loading branch information
clairedenning committed Dec 10, 2024
1 parent 90f3a37 commit 438fc19
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 62 deletions.
41 changes: 6 additions & 35 deletions data/tokens/modes/dark.json
Original file line number Diff line number Diff line change
Expand Up @@ -795,18 +795,8 @@
},
"frozen": {
"active": {
"value": "{primitives.colors.navy}",
"value": "{modes.color.interactive.monochrome.generic.active}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.9",
"space": "lch",
"color": "{modes.color.modifier.contrastLess}"
}
}
},
"description": "Used within frozen table"
}
}
Expand Down Expand Up @@ -1048,17 +1038,8 @@
},
"frozen": {
"bg": {
"value": "{modes.color.generic.bg.extreme}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "alpha",
"value": "0.08",
"space": "lch"
}
}
}
"value": "{modes.color.interactive.progress.bg}",
"type": "color"
}
}
}
Expand Down Expand Up @@ -1337,21 +1318,11 @@
},
"frozen": {
"default": {
"value": "{primitives.colors.navy}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.4",
"space": "lch",
"color": "{modes.color.modifier.contrastLess} "
}
}
}
"value": "{primitives.colors.navyAltBright}",
"type": "color"
},
"hover": {
"value": "{primitives.colors.navy}",
"value": "{modes.color.status.neutral.frozen.default}",
"type": "color",
"$extensions": {
"studio.tokens": {
Expand Down
44 changes: 22 additions & 22 deletions data/tokens/modes/light.json
Original file line number Diff line number Diff line change
Expand Up @@ -548,13 +548,13 @@
},
"frozen": {
"withDefault": {
"value": "{primitives.colors.navy}",
"value": "{primitives.colors.navyAlt}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.4",
"value": "0.045",
"space": "lch",
"color": "{modes.color.modifier.contrastLess} "
}
Expand Down Expand Up @@ -630,13 +630,13 @@
},
"frozen": {
"defaultAlt": {
"value": "{primitives.colors.navy}",
"value": "{primitives.colors.navyAlt}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.9",
"value": "0.84",
"space": "lch",
"color": "{modes.color.modifier.contrastLess} "
}
Expand All @@ -649,8 +649,18 @@
"monochrome": {
"frozen": {
"active": {
"value": "{primitives.colors.navy}",
"type": "color"
"value": "{primitives.colors.navyAlt}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.67",
"space": "lch",
"color": "{modes.color.modifier.contrastMore}"
}
}
}
},
"activeAlt": {
"value": "{modes.color.interactive.monochrome.frozen.active}",
Expand Down Expand Up @@ -811,13 +821,13 @@
},
"frozen": {
"active": {
"value": "{primitives.colors.navy}",
"value": "{primitives.colors.navyAlt}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.9",
"value": "0.84",
"space": "lch",
"color": "{modes.color.modifier.contrastLess}"
}
Expand Down Expand Up @@ -1020,13 +1030,13 @@
},
"table": {
"default": {
"value": "{primitives.colors.navy}",
"value": "{primitives.colors.navyAlt}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.64",
"value": "0.43",
"space": "lch",
"color": "{modes.color.modifier.contrastLess}"
}
Expand Down Expand Up @@ -1356,18 +1366,8 @@
},
"frozen": {
"default": {
"value": "{primitives.colors.navy}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.37",
"space": "lch",
"color": "{modes.color.modifier.contrastLess} "
}
}
}
"value": "{primitives.colors.navyAlt}",
"type": "color"
},
"hover": {
"value": "{modes.color.status.neutral.frozen.default}",
Expand Down
40 changes: 35 additions & 5 deletions data/tokens/primitives.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,46 @@
"type": "color",
"description": "Outer focus border."
},
"storm": {
"value": "#6f6f6f",
"type": "color",
"description": "Base neutral status color for on light surface messages, toasts and pills. Luminosity 46.8."
},
"navy": {
"value": "#00293F",
"type": "color",
"description": "old product color for monochrome components. eg page backgrounds and minor buttons "
},
"navyAlt": {
"value": "{primitives.colors.navy}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.37",
"space": "lch",
"color": "{primitives.colors.white}"
}
}
},
"description": "adjusted old product colour. Luminosity is 46.8 to balance with other hue luminosities."
},
"navyAltBright": {
"value": "{primitives.colors.navy}",
"type": "color",
"$extensions": {
"studio.tokens": {
"modify": {
"type": "mix",
"value": "0.48",
"space": "lch",
"color": "{primitives.colors.white}"
}
}
},
"description": "Base frozen neutral status color for on dark surface messages, toasts and pills. Luminosity 56.2."
},
"storm": {
"value": "#6f6f6f",
"type": "color",
"description": "Base neutral status color for on light surface messages, toasts and pills. Luminosity 46.8."
},
"stormBright": {
"value": "#878787",
"type": "color",
Expand Down

0 comments on commit 438fc19

Please sign in to comment.