From 11748eabf2b454e303864dee93e18f1606541f88 Mon Sep 17 00:00:00 2001 From: sarahgm Date: Mon, 26 Feb 2024 16:09:28 +0100 Subject: [PATCH 1/6] b2b styles --- themes/theme-b2b/src/components/Switch.styles.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/theme-b2b/src/components/Switch.styles.ts b/themes/theme-b2b/src/components/Switch.styles.ts index 537cdf3a41..4c4e7d6c2a 100644 --- a/themes/theme-b2b/src/components/Switch.styles.ts +++ b/themes/theme-b2b/src/components/Switch.styles.ts @@ -6,7 +6,7 @@ export const Switch: ThemeComponent<'Switch'> = { [ 'bg-bg-inverted/20 border-border-base border', 'group-selected/switch:bg-bg-selected-input', - 'group-disabled/switch:bg-bg-base-disabled group-disabled/switch:opacity-[0.5]', + 'group-disabled/switch:bg-bg-base-disabled', ], { variants: { @@ -18,9 +18,9 @@ export const Switch: ThemeComponent<'Switch'> = { ), thumb: cva( [ - 'bg-white', + 'bg-bg-base', 'group-disabled/switch:bg-bg-base-disabled', - 'shadow-[1px_1px_4px]', + 'border-border-base border border-solid', ], { variants: { From 779cce9f08013c982063008ef1f07e7ffbd7d091 Mon Sep 17 00:00:00 2001 From: sarahgm Date: Mon, 26 Feb 2024 16:22:39 +0100 Subject: [PATCH 2/6] update core styles --- themes/theme-core/src/components/Switch.styles.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/themes/theme-core/src/components/Switch.styles.ts b/themes/theme-core/src/components/Switch.styles.ts index eac2f89a54..fd1c0bc473 100644 --- a/themes/theme-core/src/components/Switch.styles.ts +++ b/themes/theme-core/src/components/Switch.styles.ts @@ -4,14 +4,15 @@ export const Switch: ThemeComponent<'Switch'> = { container: cva('justify-start'), track: cva([ 'h-[22px]', - 'bg-bg-surface-raised shadow-[0_0_0_1px]', - 'group-selected/switch:bg-bg-brand group-selected/switch:shadow-[#ae440a]', - 'group-disabled/switch:bg-bg-inverted-disabled group-disabled/switch:opacity-[0.5] group-disabled/switch:shadow-[0_0_0_1px] ', + 'bg-bg-inverted border-border-base border border-solid', + 'group-selected/switch:bg-bg-selected-input group-selected/switch:border-border-selected', + 'group-disabled/switch:bg-bg-base-disabled group-disabled/switch:border-border-base', ]), thumb: cva([ 'size-[20px]', - 'bg-white', - 'group-disabled/switch:bg-bg-inverted-disabled', - 'shadow-[1px_1px_4px]', + 'bg-bg-base', + 'group-selected/switch:border-border-selected', + 'group-disabled/switch:bg-bg-base-disabled group-disabled/switch:border-border-base', + 'border-border-base border border-solid', ]), }; From a2a51f870f487c3a86695840f26cf40bf7538d83 Mon Sep 17 00:00:00 2001 From: sarahgm <38324334+sarahgm@users.noreply.github.com> Date: Mon, 26 Feb 2024 16:24:51 +0100 Subject: [PATCH 3/6] Create quiet-pants-kneel.md --- .changeset/quiet-pants-kneel.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/quiet-pants-kneel.md diff --git a/.changeset/quiet-pants-kneel.md b/.changeset/quiet-pants-kneel.md new file mode 100644 index 0000000000..0485f57843 --- /dev/null +++ b/.changeset/quiet-pants-kneel.md @@ -0,0 +1,6 @@ +--- +"@marigold/theme-b2b": patch +"@marigold/theme-core": patch +--- + +fix: remove and update `Switch` styles for themes From 152f4fae59cc693c9d835a73212dbe380e3e29ae Mon Sep 17 00:00:00 2001 From: sarahgm Date: Tue, 27 Feb 2024 10:00:04 +0100 Subject: [PATCH 4/6] update styles --- themes/theme-core/src/components/Switch.styles.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/themes/theme-core/src/components/Switch.styles.ts b/themes/theme-core/src/components/Switch.styles.ts index fd1c0bc473..58edafaf59 100644 --- a/themes/theme-core/src/components/Switch.styles.ts +++ b/themes/theme-core/src/components/Switch.styles.ts @@ -4,7 +4,7 @@ export const Switch: ThemeComponent<'Switch'> = { container: cva('justify-start'), track: cva([ 'h-[22px]', - 'bg-bg-inverted border-border-base border border-solid', + 'bg-bg-inverted border-border-inverted border border-solid', 'group-selected/switch:bg-bg-selected-input group-selected/switch:border-border-selected', 'group-disabled/switch:bg-bg-base-disabled group-disabled/switch:border-border-base', ]), @@ -13,6 +13,5 @@ export const Switch: ThemeComponent<'Switch'> = { 'bg-bg-base', 'group-selected/switch:border-border-selected', 'group-disabled/switch:bg-bg-base-disabled group-disabled/switch:border-border-base', - 'border-border-base border border-solid', ]), }; From f0a2a4125c5a7e55bb47887bc36c599f5fc13226 Mon Sep 17 00:00:00 2001 From: sarahgm Date: Tue, 27 Feb 2024 10:03:39 +0100 Subject: [PATCH 5/6] hm better ? --- themes/theme-core/src/components/Switch.styles.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/theme-core/src/components/Switch.styles.ts b/themes/theme-core/src/components/Switch.styles.ts index 58edafaf59..17aeb80da9 100644 --- a/themes/theme-core/src/components/Switch.styles.ts +++ b/themes/theme-core/src/components/Switch.styles.ts @@ -12,6 +12,5 @@ export const Switch: ThemeComponent<'Switch'> = { 'size-[20px]', 'bg-bg-base', 'group-selected/switch:border-border-selected', - 'group-disabled/switch:bg-bg-base-disabled group-disabled/switch:border-border-base', ]), }; From 72e3f87f64604ff7ea96f16f66de2249341bd390 Mon Sep 17 00:00:00 2001 From: Sebastian Sebald Date: Tue, 27 Feb 2024 10:24:21 +0100 Subject: [PATCH 6/6] patch -> minor --- .changeset/quiet-pants-kneel.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changeset/quiet-pants-kneel.md b/.changeset/quiet-pants-kneel.md index 0485f57843..ff932fe9e1 100644 --- a/.changeset/quiet-pants-kneel.md +++ b/.changeset/quiet-pants-kneel.md @@ -1,6 +1,6 @@ --- -"@marigold/theme-b2b": patch -"@marigold/theme-core": patch +"@marigold/theme-b2b": minor +"@marigold/theme-core": minor --- fix: remove and update `Switch` styles for themes