From cbcb312caf824e54251c2fcc065fec47094a1c25 Mon Sep 17 00:00:00 2001 From: SvenVdv Date: Thu, 12 Dec 2024 15:33:17 +0100 Subject: [PATCH 1/4] SGD8-2906: Change multi-steps layout --- components/21-atoms/list/_list.scss | 3 ++- .../31-molecules/form-steps/_form-steps.scss | 18 +++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/components/21-atoms/list/_list.scss b/components/21-atoms/list/_list.scss index 8d63dbc4..7e4cc0e0 100644 --- a/components/21-atoms/list/_list.scss +++ b/components/21-atoms/list/_list.scss @@ -231,8 +231,9 @@ ol { counter-increment: item; &::before { - @include theme('background-color', 'color-tertiary-pastel'); + @include theme('background-color', 'color-tertiary-light'); @include semi-bold-text; + display: inline-block; width: 30px; height: 30px; diff --git a/components/31-molecules/form-steps/_form-steps.scss b/components/31-molecules/form-steps/_form-steps.scss index 90f2cbe6..3b44669c 100644 --- a/components/31-molecules/form-steps/_form-steps.scss +++ b/components/31-molecules/form-steps/_form-steps.scss @@ -1,7 +1,5 @@ .form-steps { ol.form-steps-list { - @include theme('background-color', 'color-tertiary-light'); - display: flex; flex-wrap: wrap; margin: 0; @@ -79,18 +77,16 @@ &::before, & + li::after { @include desktop-and-below { - @include theme('border-color', 'color-tertiary-pastel', 'form-step-hellip-background-color'); - @include theme('background-color', 'color-tertiary-pastel', 'form-step-hellip-background-color'); - @include theme('color', 'color-zero', 'form-step-hellip-color'); + @include theme('background-color', 'color-tertiary-light'); + @include theme('color', 'color-zero'); display: inline-block; - width: 40px; - height: 40px; - margin-right: 15px; - border: 2px solid; - border-radius: 20px; - line-height: 35px; + width: 30px; + height: 30px; + margin-right: 10px; + line-height: 30px; text-align: center; + vertical-align: middle; } } From 33dcc4189f98e11e0d128d979c7e69ae76006004 Mon Sep 17 00:00:00 2001 From: SvenVdv Date: Thu, 12 Dec 2024 15:42:26 +0100 Subject: [PATCH 2/4] SGD8-2906: Change multistep color to cyan light --- components/21-atoms/list/_list.scss | 2 +- components/31-molecules/form-steps/_form-steps.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/21-atoms/list/_list.scss b/components/21-atoms/list/_list.scss index 7e4cc0e0..dcc6cf78 100644 --- a/components/21-atoms/list/_list.scss +++ b/components/21-atoms/list/_list.scss @@ -231,7 +231,7 @@ ol { counter-increment: item; &::before { - @include theme('background-color', 'color-tertiary-light'); + @include theme('background-color', 'color-tertiary-pastel'); @include semi-bold-text; display: inline-block; diff --git a/components/31-molecules/form-steps/_form-steps.scss b/components/31-molecules/form-steps/_form-steps.scss index 3b44669c..62683bc3 100644 --- a/components/31-molecules/form-steps/_form-steps.scss +++ b/components/31-molecules/form-steps/_form-steps.scss @@ -15,6 +15,10 @@ li { display: inline-block; + &::before { + @include theme('background-color', 'color-tertiary-light'); + } + @include desktop-and-below { margin-bottom: 0; } From 121e1cfa877487c5fc9386e9ced7c6de356c0cab Mon Sep 17 00:00:00 2001 From: SvenVdv Date: Thu, 12 Dec 2024 16:12:08 +0100 Subject: [PATCH 3/4] SGD8-2889: Fix text alignment center --- components/31-molecules/partner-block/_partner-block.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/components/31-molecules/partner-block/_partner-block.scss b/components/31-molecules/partner-block/_partner-block.scss index 15a77ef5..22db1bd1 100644 --- a/components/31-molecules/partner-block/_partner-block.scss +++ b/components/31-molecules/partner-block/_partner-block.scss @@ -50,6 +50,7 @@ } &.partner__single { + align-items: center; text-align: center; .intro { From 0e46c2c215dbb309aa19709a971a9954d891128b Mon Sep 17 00:00:00 2001 From: SvenVdv Date: Mon, 16 Dec 2024 14:02:01 +0100 Subject: [PATCH 4/4] Prepare for version 6.0.0-beta33 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c197cba..289bea46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gent_styleguide", - "version": "6.0.0-beta31", + "version": "6.0.0-beta33", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "gent_styleguide", - "version": "6.0.0-beta31", + "version": "6.0.0-beta33", "hasInstallScript": true, "license": "GPL-2.0", "dependencies": { diff --git a/package.json b/package.json index 7d364893..0cd6576f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gent_styleguide", - "version": "6.0.0-beta31", + "version": "6.0.0-beta33", "description": "Styleguide Stad.Gent", "devDependencies": { "@babel/core": "^7.20.12",