From 2f46dbc543f8d3b2d015bcce9412cb3b0f92c063 Mon Sep 17 00:00:00 2001 From: Luke Emmerson-Finch Date: Wed, 1 Nov 2023 14:14:53 +0000 Subject: [PATCH] feat(data): adding border active and activated tokens --- data/tokens/Components/container.json | 18 +++++++++++++----- data/tokens/Components/form.json | 8 ++++---- data/tokens/Modes/light.json | 19 ++++++++++++------- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/data/tokens/Components/container.json b/data/tokens/Components/container.json index 87885fa0..b1341138 100644 --- a/data/tokens/Components/container.json +++ b/data/tokens/Components/container.json @@ -15,7 +15,7 @@ "description": "tile footer bg color\n" }, "border-default": { - "value": "{base.color.passive.standard.bgDelicate}", + "value": "{base.color.passive.standard.bgFaint}", "type": "color" } }, @@ -46,12 +46,20 @@ "value": "{base.color.status.success.default}", "type": "color" }, + "border-active": { + "value": "{base.color.interactive.monochrome.standard.active}", + "type": "color" + }, + "border-activated": { + "value": "{base.color.status.success.default}", + "type": "color" + }, "border-inactive": { "value": "{base.color.interactive.inactive.default}", "type": "color" }, "border-enabled": { - "value": "{base.color.passive.standard.fgDelicate}", + "value": "{base.color.passive.standard.bgFaint}", "type": "color" }, "labelFooter-active": { @@ -59,11 +67,11 @@ "type": "color" }, "text-active": { - "value": "{base.color.passive.standard.fgExtreme}", + "value": "{base.color.interactive.monochrome.standard.active}", "type": "color" }, "text-default": { - "value": "{base.color.passive.standard.fgFirm}", + "value": "{base.color.interactive.monochrome.standard.default}", "type": "color" }, "text-disabled": { @@ -71,7 +79,7 @@ "type": "color" }, "text-hover": { - "value": "{base.color.passive.standard.fgExtreme}", + "value": "{base.color.interactive.monochrome.standard.hover}", "type": "color" } } diff --git a/data/tokens/Components/form.json b/data/tokens/Components/form.json index 33e96ecc..c6a17378 100644 --- a/data/tokens/Components/form.json +++ b/data/tokens/Components/form.json @@ -99,20 +99,20 @@ "type": "color" }, "label-default": { - "value": "{base.color.passive.standard.fgFirm}", + "value": "{base.color.interactive.dataEntry.content}", "type": "color" }, "label-alt": { - "value": "{base.color.passive.standard.fgModerate}", + "value": "{base.color.interactive.dataEntry.contentAlt}", "type": "color", "description": "used for '(optional)' text and hint text." }, "label-disabled": { - "value": "{base.color.passive.standard.fgDelicate}", + "value": "{base.color.interactive.inactive.content}", "type": "color" }, "label-readOnly": { - "value": "{base.color.passive.standard.fgFirm}", + "value": "{base.color.interactive.dataEntry.content}", "type": "color" } } diff --git a/data/tokens/Modes/light.json b/data/tokens/Modes/light.json index 827c3b43..9e6da387 100644 --- a/data/tokens/Modes/light.json +++ b/data/tokens/Modes/light.json @@ -312,6 +312,11 @@ "value": "{base.color.passive.standard.fgFirm}", "type": "color", "description": "Input Text" + }, + "contentAlt": { + "value": "{base.color.passive.standard.fgModerate}", + "type": "color", + "description": "Input Text" } }, "focus": { @@ -340,12 +345,12 @@ }, "inactive": { "default": { - "value": "{origin.colors.black}", + "value": "{origin.colors.white}", "type": "color", "$extensions": { "studio.tokens": { "modify": { - "type": "alpha", + "type": "mix", "value": "{base.color.modifiers.input.disabledFg}", "space": "lch", "color": "{base.color.modifier.contrastMore} " @@ -355,27 +360,27 @@ "description": "Disabled form input borders." }, "defaultAlt": { - "value": "{origin.colors.black}", + "value": "{origin.colors.white}", "type": "color", "$extensions": { "studio.tokens": { "modify": { - "type": "alpha", + "type": "mix", "value": "{base.color.modifiers.input.disabledBg} ", "space": "lch", - "color": "{base.color.modifier.contrastMore}" + "color": "{base.color.modifier.contrastMore} " } } }, "description": "Disabled input and button backgrounds, button borders and input backgrounds." }, "content": { - "value": "{origin.colors.black}", + "value": "{origin.colors.white}", "type": "color", "$extensions": { "studio.tokens": { "modify": { - "type": "alpha", + "type": "mix", "value": "{base.color.modifiers.input.disabledFg} ", "space": "lch", "color": "{base.color.modifier.contrastMore} "