From f327b3b94fc2ed7d5aa22b6dd27802126e811112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariana=20N=C3=BA=C3=B1ez?= <48533432+mariannuar@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:30:45 -0600 Subject: [PATCH 1/5] Design tokens for Footer --- src/tokens/figma.tokens.json | 56 +++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/src/tokens/figma.tokens.json b/src/tokens/figma.tokens.json index e14447aa..16e22ff6 100644 --- a/src/tokens/figma.tokens.json +++ b/src/tokens/figma.tokens.json @@ -2392,6 +2392,40 @@ } } }, + "components/footer": { + "footer": { + "background": { + "default": { + "value": "{color.primary.darker}", + "type": "color" + }, + "light": { + "value": "{color.text.white}", + "type": "color" + } + }, + "heading": { + "default": { + "value": "{color.primary.lighter}", + "type": "color" + }, + "dark": { + "value": "{color.primary.dark}", + "type": "color" + } + }, + "icon": { + "default": { + "value": "{color.primary.lighter}", + "type": "color" + }, + "dark": { + "value": "{color.primary.dark}", + "type": "color" + } + } + } + }, "components/textField": { "textField": { "borderWidth": { @@ -2672,7 +2706,8 @@ "components/table": "enabled", "components/tabs": "enabled", "components/textField": "enabled", - "semantic": "enabled" + "semantic": "enabled", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:16908", "$figmaModeId": "23237:10", @@ -2860,7 +2895,8 @@ "name": "Emulsify Global", "$figmaStyleReferences": {}, "selectedTokenSets": { - "global": "enabled" + "global": "enabled", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17089", "$figmaModeId": "23237:11", @@ -2912,7 +2948,8 @@ "name": "Emulsify Semantic", "$figmaStyleReferences": {}, "selectedTokenSets": { - "semantic": "enabled" + "semantic": "enabled", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17133", "$figmaModeId": "23237:12", @@ -2934,7 +2971,8 @@ "name": "Emulsify Storybook only", "$figmaStyleReferences": {}, "selectedTokenSets": { - "storybook": "source" + "storybook": "source", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17144", "$figmaModeId": "23237:13", @@ -2962,7 +3000,8 @@ "components/status": "enabled", "components/table": "enabled", "components/tabs": "enabled", - "components/textField": "enabled" + "components/textField": "enabled", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17145", "$figmaModeId": "23237:14", @@ -3115,7 +3154,8 @@ "components/table": "enabled", "components/tabs": "enabled", "components/textField": "enabled", - "semantic": "enabled" + "semantic": "enabled", + "components/footer": "disabled" }, "group": "WUP" }, @@ -3142,7 +3182,8 @@ "components/status": "enabled", "components/table": "enabled", "components/tabs": "enabled", - "components/textField": "enabled" + "components/textField": "enabled", + "components/footer": "disabled" }, "group": "WUP" } @@ -3169,6 +3210,7 @@ "components/status", "components/table", "components/tabs", + "components/footer", "components/textField", "storybook" ] From 112fdeaa23f865250b6e288970e4ab8074dfa566 Mon Sep 17 00:00:00 2001 From: mariannuar Date: Fri, 16 Aug 2024 16:34:08 +0000 Subject: [PATCH 2/5] feat: create tokens --- src/components/tokens/_tokens.scss | 13 +++++-- src/tokens/transformed.tokens.json | 59 ++++++++++++++++++++++++++---- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/src/components/tokens/_tokens.scss b/src/components/tokens/_tokens.scss index f091c608..4d4208ac 100644 --- a/src/components/tokens/_tokens.scss +++ b/src/components/tokens/_tokens.scss @@ -1,6 +1,6 @@ /** * Do not edit directly - * Generated on Mon, 12 Aug 2024 17:38:58 GMT + * Generated on Fri, 16 Aug 2024 16:34:06 GMT */ :root { @@ -11,6 +11,12 @@ --text-field-border-width: 1px; --text-field-radius: 0.625rem; --text-field-border: [object Object]; + --footer-background-default: #006089; + --footer-background-light: #ffffff; + --footer-heading-default: #9ce1ff; + --footer-heading-dark: #0080b7; + --footer-icon-default: #9ce1ff; + --footer-icon-dark: #0080b7; --tabs-color-bg-default: #ffffff; --tabs-color-bg-active: #ffffff; --tabs-color-bg-hover: #ffffff; @@ -388,8 +394,9 @@ --token-set-order-17: components/status; --token-set-order-18: components/table; --token-set-order-19: components/tabs; - --token-set-order-20: components/textField; - --token-set-order-21: storybook; + --token-set-order-20: components/footer; + --token-set-order-21: components/textField; + --token-set-order-22: storybook; --emulsify-ui-kit-full: [object Object]; --emulsify-global: [object Object]; --emulsify-semantic: [object Object]; diff --git a/src/tokens/transformed.tokens.json b/src/tokens/transformed.tokens.json index 56133545..8935ae8a 100644 --- a/src/tokens/transformed.tokens.json +++ b/src/tokens/transformed.tokens.json @@ -37,6 +37,38 @@ "type": "border" } }, + "footer": { + "background": { + "default": { + "value": "#006089", + "type": "color" + }, + "light": { + "value": "#ffffff", + "type": "color" + } + }, + "heading": { + "default": { + "value": "#9ce1ff", + "type": "color" + }, + "dark": { + "value": "#0080b7", + "type": "color" + } + }, + "icon": { + "default": { + "value": "#9ce1ff", + "type": "color" + }, + "dark": { + "value": "#0080b7", + "type": "color" + } + } + }, "tabs": { "color": { "bg": { @@ -2432,10 +2464,14 @@ "type": "other" }, "20": { - "value": "components/textField", + "value": "components/footer", "type": "other" }, "21": { + "value": "components/textField", + "type": "other" + }, + "22": { "value": "storybook", "type": "other" } @@ -2676,7 +2712,8 @@ "components/table": "enabled", "components/tabs": "enabled", "components/textField": "enabled", - "semantic": "enabled" + "semantic": "enabled", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:16908", "$figmaModeId": "23237:10", @@ -2865,7 +2902,8 @@ "id": "0a5c4562bd35f00ce8a339239980a3842147c0bd", "$figmaStyleReferences": {}, "selectedTokenSets": { - "global": "enabled" + "global": "enabled", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17089", "$figmaModeId": "23237:11", @@ -2918,7 +2956,8 @@ "id": "ca91148967a5dcc80f7e50f6ccfe35b30efd5f2f", "$figmaStyleReferences": {}, "selectedTokenSets": { - "semantic": "enabled" + "semantic": "enabled", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17133", "$figmaModeId": "23237:12", @@ -2941,7 +2980,8 @@ "id": "16a10d373d39988a75c7d612cd449a633f373c44", "$figmaStyleReferences": {}, "selectedTokenSets": { - "storybook": "source" + "storybook": "source", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17144", "$figmaModeId": "23237:13", @@ -2970,7 +3010,8 @@ "components/status": "enabled", "components/table": "enabled", "components/tabs": "enabled", - "components/textField": "enabled" + "components/textField": "enabled", + "components/footer": "disabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17145", "$figmaModeId": "23237:14", @@ -3124,7 +3165,8 @@ "components/table": "enabled", "components/tabs": "enabled", "components/textField": "enabled", - "semantic": "enabled" + "semantic": "enabled", + "components/footer": "disabled" }, "group": "WUP", "type": "other", @@ -3152,7 +3194,8 @@ "components/status": "enabled", "components/table": "enabled", "components/tabs": "enabled", - "components/textField": "enabled" + "components/textField": "enabled", + "components/footer": "disabled" }, "group": "WUP", "type": "other", From cc8cecd94bc612887a6a3a3548066eab61da66f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariana=20N=C3=BA=C3=B1ez?= <48533432+mariannuar@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:34:22 -0600 Subject: [PATCH 3/5] change order of design token for footer --- src/tokens/figma.tokens.json | 91 +++++++++++++++++------------------- 1 file changed, 42 insertions(+), 49 deletions(-) diff --git a/src/tokens/figma.tokens.json b/src/tokens/figma.tokens.json index 16e22ff6..480bb228 100644 --- a/src/tokens/figma.tokens.json +++ b/src/tokens/figma.tokens.json @@ -1971,6 +1971,40 @@ } } }, + "components/footer": { + "footer": { + "background": { + "default": { + "value": "{color.primary.darker}", + "type": "color" + }, + "light": { + "value": "{color.text.white}", + "type": "color" + } + }, + "heading": { + "default": { + "value": "{color.primary.lighter}", + "type": "color" + }, + "dark": { + "value": "{color.primary.dark}", + "type": "color" + } + }, + "icon": { + "default": { + "value": "{color.primary.lighter}", + "type": "color" + }, + "dark": { + "value": "{color.primary.dark}", + "type": "color" + } + } + } + }, "components/input": { "input": { "gap": { @@ -2392,40 +2426,6 @@ } } }, - "components/footer": { - "footer": { - "background": { - "default": { - "value": "{color.primary.darker}", - "type": "color" - }, - "light": { - "value": "{color.text.white}", - "type": "color" - } - }, - "heading": { - "default": { - "value": "{color.primary.lighter}", - "type": "color" - }, - "dark": { - "value": "{color.primary.dark}", - "type": "color" - } - }, - "icon": { - "default": { - "value": "{color.primary.lighter}", - "type": "color" - }, - "dark": { - "value": "{color.primary.dark}", - "type": "color" - } - } - } - }, "components/textField": { "textField": { "borderWidth": { @@ -2706,8 +2706,7 @@ "components/table": "enabled", "components/tabs": "enabled", "components/textField": "enabled", - "semantic": "enabled", - "components/footer": "disabled" + "semantic": "enabled" }, "$figmaCollectionId": "VariableCollectionId:23237:16908", "$figmaModeId": "23237:10", @@ -2895,8 +2894,7 @@ "name": "Emulsify Global", "$figmaStyleReferences": {}, "selectedTokenSets": { - "global": "enabled", - "components/footer": "disabled" + "global": "enabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17089", "$figmaModeId": "23237:11", @@ -2948,8 +2946,7 @@ "name": "Emulsify Semantic", "$figmaStyleReferences": {}, "selectedTokenSets": { - "semantic": "enabled", - "components/footer": "disabled" + "semantic": "enabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17133", "$figmaModeId": "23237:12", @@ -2971,8 +2968,7 @@ "name": "Emulsify Storybook only", "$figmaStyleReferences": {}, "selectedTokenSets": { - "storybook": "source", - "components/footer": "disabled" + "storybook": "source" }, "$figmaCollectionId": "VariableCollectionId:23237:17144", "$figmaModeId": "23237:13", @@ -3000,8 +2996,7 @@ "components/status": "enabled", "components/table": "enabled", "components/tabs": "enabled", - "components/textField": "enabled", - "components/footer": "disabled" + "components/textField": "enabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17145", "$figmaModeId": "23237:14", @@ -3154,8 +3149,7 @@ "components/table": "enabled", "components/tabs": "enabled", "components/textField": "enabled", - "semantic": "enabled", - "components/footer": "disabled" + "semantic": "enabled" }, "group": "WUP" }, @@ -3182,8 +3176,7 @@ "components/status": "enabled", "components/table": "enabled", "components/tabs": "enabled", - "components/textField": "enabled", - "components/footer": "disabled" + "components/textField": "enabled" }, "group": "WUP" } @@ -3201,6 +3194,7 @@ "components/checkbox", "components/cta", "components/fieldset", + "components/footer", "components/input", "components/link", "components/mainMenu", @@ -3210,7 +3204,6 @@ "components/status", "components/table", "components/tabs", - "components/footer", "components/textField", "storybook" ] From 665bb3cb837839f1810867cd1bfc34ba38dae83a Mon Sep 17 00:00:00 2001 From: mariannuar Date: Fri, 16 Aug 2024 16:35:32 +0000 Subject: [PATCH 4/5] feat: create tokens --- src/components/tokens/_tokens.scss | 34 +++++----- src/tokens/transformed.tokens.json | 105 ++++++++++++++--------------- 2 files changed, 66 insertions(+), 73 deletions(-) diff --git a/src/components/tokens/_tokens.scss b/src/components/tokens/_tokens.scss index 4d4208ac..760b03f0 100644 --- a/src/components/tokens/_tokens.scss +++ b/src/components/tokens/_tokens.scss @@ -1,6 +1,6 @@ /** * Do not edit directly - * Generated on Fri, 16 Aug 2024 16:34:06 GMT + * Generated on Fri, 16 Aug 2024 16:35:30 GMT */ :root { @@ -11,12 +11,6 @@ --text-field-border-width: 1px; --text-field-radius: 0.625rem; --text-field-border: [object Object]; - --footer-background-default: #006089; - --footer-background-light: #ffffff; - --footer-heading-default: #9ce1ff; - --footer-heading-dark: #0080b7; - --footer-icon-default: #9ce1ff; - --footer-icon-dark: #0080b7; --tabs-color-bg-default: #ffffff; --tabs-color-bg-active: #ffffff; --tabs-color-bg-hover: #ffffff; @@ -94,6 +88,12 @@ --input-radius: 0.25rem; --input-label-lineheight: 125%; --input-bkg: #ffffff; + --footer-background-default: #006089; + --footer-background-light: #ffffff; + --footer-heading-default: #9ce1ff; + --footer-heading-dark: #0080b7; + --footer-icon-default: #9ce1ff; + --footer-icon-dark: #0080b7; --fieldset-color-bg: white; --fieldset-color-border: #a9afb1; --fieldset-color-label: #00202e; @@ -385,16 +385,16 @@ --token-set-order-8: components/checkbox; --token-set-order-9: components/cta; --token-set-order-10: components/fieldset; - --token-set-order-11: components/input; - --token-set-order-12: components/link; - --token-set-order-13: components/mainMenu; - --token-set-order-14: components/pager; - --token-set-order-15: components/radioButton; - --token-set-order-16: components/selectdropdown; - --token-set-order-17: components/status; - --token-set-order-18: components/table; - --token-set-order-19: components/tabs; - --token-set-order-20: components/footer; + --token-set-order-11: components/footer; + --token-set-order-12: components/input; + --token-set-order-13: components/link; + --token-set-order-14: components/mainMenu; + --token-set-order-15: components/pager; + --token-set-order-16: components/radioButton; + --token-set-order-17: components/selectdropdown; + --token-set-order-18: components/status; + --token-set-order-19: components/table; + --token-set-order-20: components/tabs; --token-set-order-21: components/textField; --token-set-order-22: storybook; --emulsify-ui-kit-full: [object Object]; diff --git a/src/tokens/transformed.tokens.json b/src/tokens/transformed.tokens.json index 8935ae8a..e017369d 100644 --- a/src/tokens/transformed.tokens.json +++ b/src/tokens/transformed.tokens.json @@ -37,38 +37,6 @@ "type": "border" } }, - "footer": { - "background": { - "default": { - "value": "#006089", - "type": "color" - }, - "light": { - "value": "#ffffff", - "type": "color" - } - }, - "heading": { - "default": { - "value": "#9ce1ff", - "type": "color" - }, - "dark": { - "value": "#0080b7", - "type": "color" - } - }, - "icon": { - "default": { - "value": "#9ce1ff", - "type": "color" - }, - "dark": { - "value": "#0080b7", - "type": "color" - } - } - }, "tabs": { "color": { "bg": { @@ -472,6 +440,38 @@ "type": "color" } }, + "footer": { + "background": { + "default": { + "value": "#006089", + "type": "color" + }, + "light": { + "value": "#ffffff", + "type": "color" + } + }, + "heading": { + "default": { + "value": "#9ce1ff", + "type": "color" + }, + "dark": { + "value": "#0080b7", + "type": "color" + } + }, + "icon": { + "default": { + "value": "#9ce1ff", + "type": "color" + }, + "dark": { + "value": "#0080b7", + "type": "color" + } + } + }, "fieldset": { "color": { "bg": { @@ -2428,43 +2428,43 @@ "type": "other" }, "11": { - "value": "components/input", + "value": "components/footer", "type": "other" }, "12": { - "value": "components/link", + "value": "components/input", "type": "other" }, "13": { - "value": "components/mainMenu", + "value": "components/link", "type": "other" }, "14": { - "value": "components/pager", + "value": "components/mainMenu", "type": "other" }, "15": { - "value": "components/radioButton", + "value": "components/pager", "type": "other" }, "16": { - "value": "components/selectdropdown", + "value": "components/radioButton", "type": "other" }, "17": { - "value": "components/status", + "value": "components/selectdropdown", "type": "other" }, "18": { - "value": "components/table", + "value": "components/status", "type": "other" }, "19": { - "value": "components/tabs", + "value": "components/table", "type": "other" }, "20": { - "value": "components/footer", + "value": "components/tabs", "type": "other" }, "21": { @@ -2712,8 +2712,7 @@ "components/table": "enabled", "components/tabs": "enabled", "components/textField": "enabled", - "semantic": "enabled", - "components/footer": "disabled" + "semantic": "enabled" }, "$figmaCollectionId": "VariableCollectionId:23237:16908", "$figmaModeId": "23237:10", @@ -2902,8 +2901,7 @@ "id": "0a5c4562bd35f00ce8a339239980a3842147c0bd", "$figmaStyleReferences": {}, "selectedTokenSets": { - "global": "enabled", - "components/footer": "disabled" + "global": "enabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17089", "$figmaModeId": "23237:11", @@ -2956,8 +2954,7 @@ "id": "ca91148967a5dcc80f7e50f6ccfe35b30efd5f2f", "$figmaStyleReferences": {}, "selectedTokenSets": { - "semantic": "enabled", - "components/footer": "disabled" + "semantic": "enabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17133", "$figmaModeId": "23237:12", @@ -2980,8 +2977,7 @@ "id": "16a10d373d39988a75c7d612cd449a633f373c44", "$figmaStyleReferences": {}, "selectedTokenSets": { - "storybook": "source", - "components/footer": "disabled" + "storybook": "source" }, "$figmaCollectionId": "VariableCollectionId:23237:17144", "$figmaModeId": "23237:13", @@ -3010,8 +3006,7 @@ "components/status": "enabled", "components/table": "enabled", "components/tabs": "enabled", - "components/textField": "enabled", - "components/footer": "disabled" + "components/textField": "enabled" }, "$figmaCollectionId": "VariableCollectionId:23237:17145", "$figmaModeId": "23237:14", @@ -3165,8 +3160,7 @@ "components/table": "enabled", "components/tabs": "enabled", "components/textField": "enabled", - "semantic": "enabled", - "components/footer": "disabled" + "semantic": "enabled" }, "group": "WUP", "type": "other", @@ -3194,8 +3188,7 @@ "components/status": "enabled", "components/table": "enabled", "components/tabs": "enabled", - "components/textField": "enabled", - "components/footer": "disabled" + "components/textField": "enabled" }, "group": "WUP", "type": "other", From 062243702e1fe1310635892779402ecc14cb191e Mon Sep 17 00:00:00 2001 From: mariannuar Date: Thu, 22 Aug 2024 18:22:47 +0000 Subject: [PATCH 5/5] feat: create tokens --- src/components/tokens/_tokens.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tokens/_tokens.scss b/src/components/tokens/_tokens.scss index 4d4a64b4..9aef3876 100644 --- a/src/components/tokens/_tokens.scss +++ b/src/components/tokens/_tokens.scss @@ -1,6 +1,6 @@ /** * Do not edit directly - * Generated on Thu, 22 Aug 2024 18:20:22 GMT + * Generated on Thu, 22 Aug 2024 18:22:46 GMT */ :root {