header-bar: more fixes for selection mode

4 files changed, 32 insertions, 11 deletions

diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index 5ea5e829..f35077d1 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -147,7 +147,7 @@
 @define-color selection_toolbar_button_b #3465a4;
 @define-color selection_toolbar_button_fg #bfbfbf;
 @define-color selection_toolbar_button_border #23446f;
-@define-color selection_toolbar_shadow alpha(black, 0.30);
+@define-color selection_toolbar_button_shadow alpha(black, 0.30);
 
 @define-color selection_toolbar_suggested_button_a #3e4545;
 @define-color selection_toolbar_suggested_button_b #2e3232;
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index 848288f5..82429c51 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -143,24 +143,24 @@
 /**************************
  * Selection Mode classes *
  **************************/
-@define-color selection_toolbar_bg_a #97b9db;
-@define-color selection_toolbar_bg_b #729fcf;
-@define-color selection_toolbar_fg #3465a4;
-@define-color selection_toolbar_border @selection_toolbar_bg;
-@define-color selection_toolbar_shadow alpha(white, 0.40);
-
 @define-color selection_toolbar_button_a #bcd1e8;
 @define-color selection_toolbar_button_b #5a8fc7;
 @define-color selection_toolbar_button_fg @theme_base_color;
 @define-color selection_toolbar_button_border #3465a4;
+@define-color selection_toolbar_button_shadow alpha(white, 0.15);
 
 @define-color selection_toolbar_suggested_button_a @theme_base_color;
 @define-color selection_toolbar_suggested_button_b @theme_bg_color;
 @define-color selection_toolbar_suggested_button_c #f3f4f3;
 @define-color selection_toolbar_suggested_button_fg @theme_text_color;
-@define-color selection_toolbar_suggested_button_shadow alpha(white, 0.40);
 @define-color selection_toolbar_suggested_button_border #3465a4;
 
+@define-color selection_toolbar_bg_a #97b9db;
+@define-color selection_toolbar_bg_b #729fcf;
+@define-color selection_toolbar_fg #3465a4;
+@define-color selection_toolbar_shadow alpha(white, 0.40);
+@define-color selection_toolbar_border @selection_toolbar_bg;
+
 @define-color selection_menu_fg #3465a4;
 @define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
 @define-color selection_menu_active shade(@selection_menu_fg, 0.60);
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
index cfd2bfe6..58ed7dbf 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -229,17 +229,21 @@ GtkColorEditor GtkColorSwatch.color-light:hover {
     border-color: @unfocused_borders;
 }
 
+.selection-mode.header-bar .button *,
+.selection-mode.header-bar .button *:active,
 .selection-mode.toolbar .button *,
-.selection-mode.toolbar GtkToolButton .button *,
 .selection-mode.toolbar .button *:active,
+.selection-mode.toolbar GtkToolButton .button *,
 .selection-mode.toolbar GtkToolButton .button *:active {
     text-shadow: 0 -1px @selection_toolbar_button_shadow;
     icon-shadow: 0 -1px @selection_toolbar_button_shadow;
 }
 
+.selection-mode.header-bar .suggested-action.button *,
+.selection-mode.header-bar .suggested-action.button *:active,
 .selection-mode.toolbar .suggested-action.button *,
-.selection-mode.toolbar GtkToolButton.suggested-action .button *,
 .selection-mode.toolbar .suggested-action.button *:active,
+.selection-mode.toolbar GtkToolButton.suggested-action .button *,
 .selection-mode.toolbar GtkToolButton.suggested-action *:active {
     text-shadow: 0 -1px @button_text_shadow;
     icon-shadow: 0 -1px @button_text_shadow;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index c1c8cf77..367f940d 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -3173,6 +3173,12 @@ GtkProgressBar.osd.progressbar {
     icon-shadow: 0 1px @selection_toolbar_button_shadow;
 }
 
+.selection-mode.header-bar .button *:backdrop,
+.selection-mode.toolbar .button *:backdrop {
+    text-shadow: none;
+    icon-shadow: none;
+}
+
 /* suggested button */
 .selection-mode.header-bar .suggested-action.button,
 .selection-mode.toolbar .suggested-action.button,
@@ -3221,7 +3227,7 @@ GtkProgressBar.osd.progressbar {
 
     background-image: none; /* remove custom bg, we want colored buttons to look like normal buttons in backdrop*/
     background-color: @selection_toolbar_suggested_button_b;
-    border-color: alpha(@selection_toolbar_button_border, 0.3);
+    border-color: alpha(@selection_toolbar_suggested_button_border, 0.3);
 
     box-shadow: none;
     color: @theme_unfocused_fg_color;
@@ -3243,6 +3249,12 @@ GtkProgressBar.osd.progressbar {
     icon-shadow: 0 1px @button_text_shadow;
 }
 
+.selection-mode.toolbar .suggested-action.button *:backdrop,
+.selection-mode.header-bar .suggested-action.button *:backdrop {
+    text-shadow: none;
+    icon-shadow: none;
+}
+
 /* menu button */
 .selection-mode.header-bar .selection-menu.button,
 .selection-mode.toolbar .selection-menu.button {
@@ -3291,6 +3303,11 @@ GtkProgressBar.osd.progressbar {
     text-shadow: 0 1px @selection_toolbar_shadow;
 }
 
+.selection-mode.header-bar .selection-menu.button *:backdrop,
+.selection-mode.toolbar .selection-menu.button *:backdrop {
+    text-shadow: none;
+}
+
 .selection-mode.header-bar .selection-menu.button .menuitem *,
 .selection-mode.toolbar .selection-menu.button .menuitem * {
     text-shadow: none;