diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 19faa31b..b0e10694 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -146,7 +146,7 @@ $header_fg: if($variant == 'light', #575757, #FDFDFD); $dark_header_bg: if($trans == 'true', gtkalpha($base_color, 0.96), $base_color); $header_bg_backdrop: if($variant == 'light', gtkmix(black, $header_bg, 2%), gtkmix(black, $header_bg, 1%)); $header_border: if($variant == 'light', gtkmix(black, $header_bg, 12%), gtkmix(black, $header_bg, 75%)); -$header_border_backdrop: if($variant == 'light', gtkmix(black, $header_bg, 8%), gtkmix(black, $header_bg, 35%)); +$header_border_backdrop: if($variant == 'light', gtkmix(black, $header_bg, 8%), gtkmix(black, $header_bg, 45%)); // Sidebar colors $dark_sidebar_bg: white; diff --git a/src/sass/gtk/_colors-libadwaita.scss b/src/sass/gtk/_colors-libadwaita.scss index 43a58dea..820b430c 100644 --- a/src/sass/gtk/_colors-libadwaita.scss +++ b/src/sass/gtk/_colors-libadwaita.scss @@ -268,6 +268,7 @@ $dark_5: #000000; $header_fg: gtkcolor(headerbar_fg_color); $header_border: gtkcolor(headerbar_darker_shade_color); $header_bg_backdrop: gtkcolor(headerbar_backdrop_color); + $header_border_backdrop: gtkcolor(headerbar_shade_color); $dialog_bg_color: gtkcolor(dialog_bg_color); $dialog_fg_color: gtkcolor(dialog_fg_color); @@ -283,4 +284,10 @@ $dark_5: #000000; $wm_shadow_backdrop: gtkcolor(sidebar_shade_color); $wm_outline: 0 0 0 2px rgba(black, 0.03), 0 0 0 1px gtkcolor(headerbar_darker_shade_color); $wm_border: gtkcolor(headerbar_darker_shade_color); + + @if $trans=='true' { + $bg_color: color-mix(in srgb, gtkcolor(window_bg_color) 95%, transparent); + $dark_sidebar_bg: color-mix(in srgb, gtkcolor(sidebar_bg_color) 95%, transparent); + $menu_bg: color-mix(in srgb, gtkcolor(popover_bg_color) 95%, transparent); + } } diff --git a/src/sass/gtk/_colors-public.scss b/src/sass/gtk/_colors-public.scss index c8e5043f..718fc7b1 100644 --- a/src/sass/gtk/_colors-public.scss +++ b/src/sass/gtk/_colors-public.scss @@ -17,14 +17,14 @@ $theme_text: currentColor; @define-color base_color #{"" + $base_color}; @define-color selected_bg_color #{"" + $selected_bg_color}; @define-color selected_fg_color #{"" + $selected_fg_color}; -@define-color insensitive_bg_color #{"" + color-mix(in srgb, $bg_color 60%, $base_color)}; +@define-color insensitive_bg_color #{"" + gtkmix($bg_color, $base_color, 60%)}; @define-color insensitive_fg_color #{"" + $disabled_fg_color}; @define-color insensitive_base_color #{"" + $base_color}; @define-color theme_unfocused_fg_color #{"" + $fg_color}; @define-color theme_unfocused_text_color #{"" + $theme_text}; @define-color theme_unfocused_bg_color #{"" + $bg_color}; @define-color theme_unfocused_base_color #{"" + $base_color}; -@define-color unfocused_insensitive_color #{"" + color-mix(in srgb, $fg_color 35%, $bg_color)}; +@define-color unfocused_insensitive_color #{"" + gtkmix($fg_color, $bg_color, 35%)}; @define-color borders #{"" + $borders_color}; @define-color unfocused_borders #{"" + $borders_color}; diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index 7ec02bb9..1c7c591f 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -4817,10 +4817,8 @@ calendar { // Dialogs // -$messagedialog_bg: if($trans == 'true', gtkalpha($bg_color, 0.95), $bg_color); - window.dialog.message { // Message Dialog styling - &.background { background-color: $messagedialog_bg; } + &.background { background-color: $dialog_bg_color; } .titlebar { min-height: 28px; @@ -5003,7 +5001,7 @@ stacksidebar { // Navigation Sidebar .navigation-sidebar { - background-color: $dark_sidebar_bg; + background-color: transparent; padding: $container_padding; //only vertical padding. horizontal row size would clip > separator { diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss index 180c1e26..4a0f1553 100644 --- a/src/sass/gtk/apps/_libadwaita.scss +++ b/src/sass/gtk/apps/_libadwaita.scss @@ -586,11 +586,11 @@ toolbarview.undershoot-bottom scrolledwindow { .unfolded stacksidebar.sidebar { border: none; } .sidebar-pane { - background-color: $dark_sidebar_bg; + background-color: transparent; color: $dark_sidebar_fg; &:backdrop { - background-color: $dark_sidebar_bg; + background-color: transparent; // transition: background-color $longer_duration $deceleration_curve; }