From 24e0585dfa14fb7477ce0dcbf239e56811372707 Mon Sep 17 00:00:00 2001 From: Melanie Boeckmann Date: Wed, 24 Jul 2024 15:34:12 -0700 Subject: [PATCH] Revert "refactor: Update stepper tokens to match new design (#278)" This reverts commit f2abfb885a57f71814bf612044ab377acbfbb48a. --- build/figma/figma.tokens.json | 37 +++++++++----------------- build/web/css/.css | 7 +++-- build/web/css/components.css | 7 +++-- build/web/css/components/stepper.css | 7 +++-- build/web/css/tokens.css | 7 +++-- build/web/scss/.scss | 7 +++-- build/web/scss/components.scss | 7 +++-- build/web/scss/components/stepper.scss | 7 +++-- build/web/scss/tokens.scss | 7 +++-- tokens/components/stepper/tokens.json | 37 +++++++++----------------- 10 files changed, 48 insertions(+), 82 deletions(-) diff --git a/build/figma/figma.tokens.json b/build/figma/figma.tokens.json index 835b2e65..07f307c1 100644 --- a/build/figma/figma.tokens.json +++ b/build/figma/figma.tokens.json @@ -3721,34 +3721,21 @@ }, "stepper": { "font": { - "desktop": { - "value": { - "fontFamily": "\"Lato\", sans-serif", - "fontWeight": "600", - "lineHeight": "124.44444444444444%", - "fontSize": "1.40625rem" - }, - "type": "typography" + "value": { + "fontFamily": "\"Lato\", sans-serif", + "fontWeight": "600", + "lineHeight": "124.44444444444444%", + "fontSize": "1.40625rem" }, - "mobile": { - "value": { - "fontFamily": "\"Lato\", sans-serif", - "fontWeight": "700", - "lineHeight": "133.33333333333334%", - "fontSize": "1.125rem" - }, - "type": "typography" - } + "type": "typography" }, "margin": { - "desktop": { - "value": "0 0 0.5625rem", - "type": "spacing" - }, - "mobile": { - "value": "0 0 0.375rem", - "type": "spacing" - } + "value": "0 0 1.125rem", + "type": "spacing" + }, + "text": { + "value": "#43474E", + "type": "color" } }, "textarea": { diff --git a/build/web/css/.css b/build/web/css/.css index e7da404e..24ca86ac 100644 --- a/build/web/css/.css +++ b/build/web/css/.css @@ -691,10 +691,9 @@ --gcds-signature-signature-height: 1.6875rem; --gcds-signature-white-default: #ffffff; --gcds-signature-wordmark-height: 3rem; - --gcds-stepper-font-desktop: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; - --gcds-stepper-font-mobile: 700 1.125rem/133.33333333333334% "Lato", sans-serif; - --gcds-stepper-margin-desktop: 0 0 0.5625rem; - --gcds-stepper-margin-mobile: 0 0 0.375rem; + --gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; + --gcds-stepper-margin: 0 0 1.125rem; + --gcds-stepper-text: #43474e; --gcds-textarea-border-radius: 0.1875rem; --gcds-textarea-border-width: 0.125rem; --gcds-textarea-danger-border: #d3080c; diff --git a/build/web/css/components.css b/build/web/css/components.css index 773e766f..4e2aab6a 100644 --- a/build/web/css/components.css +++ b/build/web/css/components.css @@ -549,10 +549,9 @@ --gcds-signature-signature-height: 1.6875rem; --gcds-signature-white-default: #ffffff; --gcds-signature-wordmark-height: 3rem; - --gcds-stepper-font-desktop: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; - --gcds-stepper-font-mobile: 700 1.125rem/133.33333333333334% "Lato", sans-serif; - --gcds-stepper-margin-desktop: 0 0 0.5625rem; - --gcds-stepper-margin-mobile: 0 0 0.375rem; + --gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; + --gcds-stepper-margin: 0 0 1.125rem; + --gcds-stepper-text: #43474e; --gcds-textarea-border-radius: 0.1875rem; --gcds-textarea-border-width: 0.125rem; --gcds-textarea-danger-border: #d3080c; diff --git a/build/web/css/components/stepper.css b/build/web/css/components/stepper.css index 462ed85e..e3133149 100644 --- a/build/web/css/components/stepper.css +++ b/build/web/css/components/stepper.css @@ -3,8 +3,7 @@ */ :root { - --gcds-stepper-font-desktop: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; - --gcds-stepper-font-mobile: 700 1.125rem/133.33333333333334% "Lato", sans-serif; - --gcds-stepper-margin-desktop: 0 0 0.5625rem; - --gcds-stepper-margin-mobile: 0 0 0.375rem; + --gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; + --gcds-stepper-margin: 0 0 1.125rem; + --gcds-stepper-text: #43474e; } diff --git a/build/web/css/tokens.css b/build/web/css/tokens.css index e7da404e..24ca86ac 100644 --- a/build/web/css/tokens.css +++ b/build/web/css/tokens.css @@ -691,10 +691,9 @@ --gcds-signature-signature-height: 1.6875rem; --gcds-signature-white-default: #ffffff; --gcds-signature-wordmark-height: 3rem; - --gcds-stepper-font-desktop: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; - --gcds-stepper-font-mobile: 700 1.125rem/133.33333333333334% "Lato", sans-serif; - --gcds-stepper-margin-desktop: 0 0 0.5625rem; - --gcds-stepper-margin-mobile: 0 0 0.375rem; + --gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; + --gcds-stepper-margin: 0 0 1.125rem; + --gcds-stepper-text: #43474e; --gcds-textarea-border-radius: 0.1875rem; --gcds-textarea-border-width: 0.125rem; --gcds-textarea-danger-border: #d3080c; diff --git a/build/web/scss/.scss b/build/web/scss/.scss index d531250b..81f3b959 100644 --- a/build/web/scss/.scss +++ b/build/web/scss/.scss @@ -689,10 +689,9 @@ $gcds-signature-color-text: #000000; $gcds-signature-signature-height: 1.6875rem; $gcds-signature-white-default: #ffffff; $gcds-signature-wordmark-height: 3rem; -$gcds-stepper-font-desktop: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; -$gcds-stepper-font-mobile: 700 1.125rem/133.33333333333334% "Lato", sans-serif; -$gcds-stepper-margin-desktop: 0 0 0.5625rem; -$gcds-stepper-margin-mobile: 0 0 0.375rem; +$gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; +$gcds-stepper-margin: 0 0 1.125rem; +$gcds-stepper-text: #43474e; $gcds-textarea-border-radius: 0.1875rem; $gcds-textarea-border-width: 0.125rem; $gcds-textarea-danger-border: #d3080c; diff --git a/build/web/scss/components.scss b/build/web/scss/components.scss index d6e1fcff..dd47bd6d 100644 --- a/build/web/scss/components.scss +++ b/build/web/scss/components.scss @@ -547,10 +547,9 @@ $gcds-signature-color-text: #000000; $gcds-signature-signature-height: 1.6875rem; $gcds-signature-white-default: #ffffff; $gcds-signature-wordmark-height: 3rem; -$gcds-stepper-font-desktop: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; -$gcds-stepper-font-mobile: 700 1.125rem/133.33333333333334% "Lato", sans-serif; -$gcds-stepper-margin-desktop: 0 0 0.5625rem; -$gcds-stepper-margin-mobile: 0 0 0.375rem; +$gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; +$gcds-stepper-margin: 0 0 1.125rem; +$gcds-stepper-text: #43474e; $gcds-textarea-border-radius: 0.1875rem; $gcds-textarea-border-width: 0.125rem; $gcds-textarea-danger-border: #d3080c; diff --git a/build/web/scss/components/stepper.scss b/build/web/scss/components/stepper.scss index a7d92d2f..d428ab86 100644 --- a/build/web/scss/components/stepper.scss +++ b/build/web/scss/components/stepper.scss @@ -1,7 +1,6 @@ // Do not edit directly. -$gcds-stepper-font-desktop: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; -$gcds-stepper-font-mobile: 700 1.125rem/133.33333333333334% "Lato", sans-serif; -$gcds-stepper-margin-desktop: 0 0 0.5625rem; -$gcds-stepper-margin-mobile: 0 0 0.375rem; +$gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; +$gcds-stepper-margin: 0 0 1.125rem; +$gcds-stepper-text: #43474e; diff --git a/build/web/scss/tokens.scss b/build/web/scss/tokens.scss index d531250b..81f3b959 100644 --- a/build/web/scss/tokens.scss +++ b/build/web/scss/tokens.scss @@ -689,10 +689,9 @@ $gcds-signature-color-text: #000000; $gcds-signature-signature-height: 1.6875rem; $gcds-signature-white-default: #ffffff; $gcds-signature-wordmark-height: 3rem; -$gcds-stepper-font-desktop: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; -$gcds-stepper-font-mobile: 700 1.125rem/133.33333333333334% "Lato", sans-serif; -$gcds-stepper-margin-desktop: 0 0 0.5625rem; -$gcds-stepper-margin-mobile: 0 0 0.375rem; +$gcds-stepper-font: 600 1.40625rem/124.44444444444444% "Lato", sans-serif; +$gcds-stepper-margin: 0 0 1.125rem; +$gcds-stepper-text: #43474e; $gcds-textarea-border-radius: 0.1875rem; $gcds-textarea-border-width: 0.125rem; $gcds-textarea-danger-border: #d3080c; diff --git a/tokens/components/stepper/tokens.json b/tokens/components/stepper/tokens.json index edb5cbce..9fe2fcd0 100644 --- a/tokens/components/stepper/tokens.json +++ b/tokens/components/stepper/tokens.json @@ -1,34 +1,21 @@ { "stepper": { "font": { - "desktop": { - "value": { - "fontFamily": "{fontFamilies.heading}", - "fontWeight": "{fontWeights.semibold}", - "lineHeight": "{lineHeights.h6}", - "fontSize": "{fontSizes.h6}" - }, - "type": "typography" + "value": { + "fontFamily": "{fontFamilies.heading}", + "fontWeight": "{fontWeights.semibold}", + "lineHeight": "{lineHeights.h6}", + "fontSize": "{fontSizes.h6}" }, - "mobile": { - "value": { - "fontFamily": "{fontFamilies.heading}", - "fontWeight": "{fontWeights.bold}", - "lineHeight": "{lineHeights.h6Mobile}", - "fontSize": "{fontSizes.h6Mobile}" - }, - "type": "typography" - } + "type": "typography" }, "margin": { - "desktop": { - "value": "0 0 {spacing.150.value}", - "type": "spacing" - }, - "mobile": { - "value": "0 0 {spacing.100.value}", - "type": "spacing" - } + "value": "0 0 {spacing.300.value}", + "type": "spacing" + }, + "text": { + "value": "{text.secondary.value}", + "type": "color" } } }