[gnome-themes-standard] Base selection bar colors on base selection color

[William Jon McCann <mccann src gnome org>]

commit f7cb626496d0767b90bd03ecf343d815efebe6a8
Author: William Jon McCann <william jon mccann gmail com>
Date:   Mon May 5 13:08:22 2014 -0400

    Base selection bar colors on base selection color

 themes/Adwaita/gtk-3.0/gtk-main-dark.css |   21 +++++++++++----------
 themes/Adwaita/gtk-3.0/gtk-main.css      |   27 ++++++++++++++-------------
 themes/Adwaita/gtk-3.0/gtk-widgets.css   |    4 ++--
 3 files changed, 27 insertions(+), 25 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index 03690fc..43dd120 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -146,17 +146,18 @@
 /**************************
  * Selection Mode classes *
  **************************/
- define-color selection_toolbar_bg_a #3465a4;
- define-color selection_toolbar_bg_b #1d437b;
+
+ define-color selection_toolbar_bg_a shade(@theme_selected_bg_color,1.2);
+ define-color selection_toolbar_bg_b shade(@theme_selected_bg_color,0.8);
 @define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_b;
- define-color selection_toolbar_fg #729fcf;
- define-color selection_toolbar_shadow #204a87;
- define-color selection_toolbar_border #183967;
-
- define-color selection_toolbar_button_a @selection_toolbar_fg;
- define-color selection_toolbar_button_b @selection_toolbar_bg_a;
- define-color selection_toolbar_button_fg #bfbfbf;
- define-color selection_toolbar_button_border #23446f;
+ define-color selection_toolbar_fg shade(@theme_selected_fg_color,0.9);
+ define-color selection_toolbar_shadow shade(@theme_selected_bg_color,0.3);
+ define-color selection_toolbar_border shade(@theme_selected_bg_color,0.3);
+
+ define-color selection_toolbar_button_a shade(@theme_selected_bg_color,1.2);
+ define-color selection_toolbar_button_b shade(@theme_selected_bg_color,0.8);
+ define-color selection_toolbar_button_fg @selection_toolbar_fg;
+ define-color selection_toolbar_button_border @selection_toolbar_border;
 @define-color selection_toolbar_button_border_backdrop shade(@selection_toolbar_button_border, 0.80);
 @define-color selection_toolbar_button_shadow alpha(black, 0.30);
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index 1faaa64..787ad13 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -146,17 +146,18 @@
 /**************************
  * Selection Mode classes *
  **************************/
- define-color selection_toolbar_bg_a #97b9db;
- define-color selection_toolbar_bg_b #729fcf;
- define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
- define-color selection_toolbar_fg #3465a4;
- define-color selection_toolbar_shadow alpha(white, 0.40);
- define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
-
- 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 @selection_toolbar_fg;
+
+ define-color selection_toolbar_bg_a shade(@theme_selected_bg_color,1.2);
+ define-color selection_toolbar_bg_b shade(@theme_selected_bg_color,0.8);
+ define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_b;
+ define-color selection_toolbar_fg shade(@theme_selected_fg_color,0.9);
+ define-color selection_toolbar_shadow shade(@theme_selected_bg_color,0.6);
+ define-color selection_toolbar_border shade(@theme_selected_bg_color,0.6);
+
+ define-color selection_toolbar_button_a shade(@theme_selected_bg_color,1.3);
+ define-color selection_toolbar_button_b shade(@theme_selected_bg_color,0.8);
+ define-color selection_toolbar_button_fg @theme_selected_fg_color;
+ define-color selection_toolbar_button_border @selection_toolbar_border;
 @define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
 @define-color selection_toolbar_button_shadow alpha(white, 0.15);
 
@@ -168,8 +169,8 @@
 @define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
 
 @define-color selection_menu_fg @selection_toolbar_fg;
- define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
- define-color selection_menu_active shade(@selection_menu_fg, 0.60);
+ define-color selection_menu_hover shade(@selection_menu_fg, 1.15);
+ define-color selection_menu_active shade(@selection_menu_fg, 1.3);
 
 /**************
  * GNOME Apps *
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 9e65867..0cc7421 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -3490,8 +3490,8 @@ GtkProgressBar.osd.progressbar {
 .selection-mode.toolbar GtkToolButton .button:active,
 .selection-mode.toolbar GtkToolButton .button:hover:active {
     background-image: linear-gradient(to bottom,
-                                      shade(@selection_toolbar_button_b, 0.95),
-                                      shade(@selection_toolbar_button_a, 0.88));
+                                      shade(@selection_toolbar_button_b, 0.9),
+                                      shade(@selection_toolbar_button_b, 0.95));
     box-shadow: none;
 }