From bd22bcfa60dffe56f54ebe42f4e42882b12b9817 Mon Sep 17 00:00:00 2001 From: Elijah Ahianyo Date: Mon, 22 Jan 2024 13:04:01 -0800 Subject: [PATCH] Accordion styling fix (#2420) --- .../components/radix/primitives/accordion.py | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/reflex/components/radix/primitives/accordion.py b/reflex/components/radix/primitives/accordion.py index 230757d30..5709ef067 100644 --- a/reflex/components/radix/primitives/accordion.py +++ b/reflex/components/radix/primitives/accordion.py @@ -115,10 +115,6 @@ def get_theme_accordion_item(): "overflow": "hidden", "width": "100%", "margin_top": "1px", - # "background_color": "var(--accent-3)", - # "background_color": cond( - # color_scheme == "primary", "var(--accent-3)", "var(--slate-3)" - # ), "&:first-child": { "margin_top": 0, "border_top_left_radius": "4px", @@ -165,8 +161,8 @@ def get_theme_accordion_trigger(variant: str | Var, color_scheme: str | Var) -> { "color": cond( color_scheme == "primary", - "var(--accent-9-contrast)", - "var(--slate-9-contrast)", + "var(--accent-11)", + "var(--slate-11)", ), "&:hover": { "background_color": cond( @@ -195,7 +191,6 @@ def get_theme_accordion_trigger(variant: str | Var, color_scheme: str | Var) -> "align_items": "center", "justify_content": "space-between", "font_size": "15px", - "box_shadow": "0 1px 0 var(--accent-6)", "line_height": 1, } ), @@ -238,7 +233,6 @@ def get_theme_accordion_trigger(variant: str | Var, color_scheme: str | Var) -> "align_items": "center", "justify_content": "space-between", "font_size": "15px", - "box_shadow": "0 1px 0 var(--accent-6)", "line_height": 1, } ), @@ -251,7 +245,11 @@ def get_theme_accordion_trigger(variant: str | Var, color_scheme: str | Var) -> "var(--accent-9-contrast)", "var(--slate-9-contrast)", ), - "box_shadow": "0 1px 0 var(--accent-6)", + "box_shadow": cond( + color_scheme == "primary", + "0 1px 0 var(--accent-6)", + "0 1px 0 var(--slate-11)", + ), "&:hover": { "background_color": cond( color_scheme == "primary", "var(--accent-10)", "var(--slate-10)" @@ -304,11 +302,8 @@ def get_theme_accordion_content(variant: str | Var, color_scheme: str | Var) -> "font_size": "10px", "color": cond( color_scheme == "primary", - "var(--accent-9-contrast)", - "var(--slate-9-contrast)", - ), - "background_color": cond( - color_scheme == "primary", "var(--accent-3)", "var(--slate-3)" + "var(--accent-11)", + "var(--slate-11)", ), "padding": "15px, 20px", "&[data-state='open']": { @@ -330,10 +325,19 @@ def get_theme_accordion_content(variant: str | Var, color_scheme: str | Var) -> { "overflow": "hidden", "font_size": "10px", - "color": cond( - color_scheme == "primary", - "var(--accent-9-contrast)", - "var(--slate-9-contrast)", + "color": match( + variant, + ( + "classic", + cond( + color_scheme == "primary", + "var(--accent-9-contrast)", + "var(--slate-9-contrast)", + ), + ), + cond( + color_scheme == "primary", "var(--accent-11)", "var(--slate-11)" + ), ), "background_color": match( variant,