[gnome-themes-standard] Base more colors off the primary selection color

[William Jon McCann <mccann src gnome org>]

commit 6b0763df9dd48ce82b50aa8a7227ae104d022698
Author: William Jon McCann <william jon mccann gmail com>
Date:   Tue May 6 20:38:23 2014 -0400

    Base more colors off the primary selection color

 themes/Adwaita/gtk-3.0/gnome-applications.css |    3 +++
 themes/Adwaita/gtk-3.0/gtk-main-dark.css      |   15 +--------------
 themes/Adwaita/gtk-3.0/gtk-main.css           |   15 +--------------
 themes/Adwaita/gtk-3.0/gtk-widgets.css        |   23 ++++++++++++-----------
 4 files changed, 17 insertions(+), 39 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index 547a56e..a2bea8d 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -1,3 +1,6 @@
+ define-color entry_tag_bg @theme_selected_bg_color;
+ define-color entry_tag_fg @theme_selected_fg_color;
+
 @define-color documents_emblem_bg #3465a4;
 @define-color documents_collection_bg #d3d7cf;
 @define-color gedit_not_found_bg rgb (237, 54, 54);
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index 340ec19..89af855 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -132,7 +132,7 @@
 @define-color view_separators @toolbar_separator;
 @define-color view_symbolic_color shade(@theme_text_color, 0.70);
 
- define-color expander_row_selected_color alpha (@theme_base_color, 0.60);
+ define-color expander_row_selected_color alpha (@theme_selected_fg_color, 0.50);
 
 @define-color inset_light_color alpha(white, 0.05);
 @define-color inset_dark_color alpha(black, 0.25);
@@ -160,23 +160,10 @@
 @define-color selection_toolbar_button_border_backdrop shade(@selection_toolbar_button_border, 0.80);
 @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;
- define-color selection_toolbar_suggested_button_c #2a2828;
- define-color selection_toolbar_suggested_button_fg #ffffff;
- define-color selection_toolbar_suggested_button_border #1f2020;
- define-color selection_toolbar_suggested_button_border_backdrop 
shade(@selection_toolbar_suggested_button_border, 1.30);
-
 @define-color selection_menu_fg @selection_toolbar_fg;
 @define-color selection_menu_hover shade(@selection_menu_fg, 1.15);
 @define-color selection_menu_active shade(@selection_menu_fg, 1.30);
 
-/**************
- * GNOME Apps *
- **************/
- define-color entry_tag_bg #888a85;
- define-color entry_tag_fg black;
-
 /******
  * WM *
  ******/
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index d84dff4..36b43aa 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -132,7 +132,7 @@
 @define-color view_separators shade(@borders, 1.30);
 @define-color view_symbolic_color shade(@internal_element_color, 0.80);
 
- define-color expander_row_selected_color #acccee;
+ define-color expander_row_selected_color alpha (@theme_selected_fg_color, 0.50);
 
 @define-color inset_light_color alpha(white, 0.45);
 @define-color inset_dark_color alpha(black, 0.07);
@@ -160,23 +160,10 @@
 @define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
 @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_border @selection_toolbar_button_border;
- 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, 1.15);
 @define-color selection_menu_active shade(@selection_menu_fg, 1.3);
 
-/**************
- * GNOME Apps *
- **************/
- define-color entry_tag_bg #3465a4;
- define-color entry_tag_fg @theme_base_color;
-
 /******
  * WM *
  ******/
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 06cb254..40ff190 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -3971,9 +3971,9 @@ GtkProgressBar.osd.progressbar {
 .selection-mode.toolbar .suggested-action.button,
 .selection-mode.toolbar GtkToolButton.suggested-action .button {
     background-image: linear-gradient(to bottom,
-                                      @selection_toolbar_suggested_button_a,
-                                      @selection_toolbar_suggested_button_b 40%,
-                                      @selection_toolbar_suggested_button_c);
+                                      @button_gradient_color_a,
+                                      @button_gradient_color_b 40%,
+                                      @button_gradient_color_c);
 
     color: @theme_text_color;
 }
@@ -3982,9 +3982,9 @@ GtkProgressBar.osd.progressbar {
 .selection-mode.toolbar .suggested-action.button:hover,
 .selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
     background-image: linear-gradient(to bottom,
-                                      shade(@selection_toolbar_suggested_button_a, 1.15),
-                                      shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
-                                      @selection_toolbar_suggested_button_c);
+                                      shade(@button_gradient_color_a, 1.15),
+                                      shade(@button_gradient_color_b, 1.15) 40%,
+                                      @button_gradient_color_c);
 }
 
 .selection-mode.header-bar .suggested-action.button:active,
@@ -3994,9 +3994,10 @@ GtkProgressBar.osd.progressbar {
 .selection-mode.toolbar GtkToolButton.suggested-action .button:active,
 .selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active {
     background-image: linear-gradient(to bottom,
-                                      shade(@selection_toolbar_suggested_button_c, 0.92),
-                                      @selection_toolbar_suggested_button_b 40%,
-                                      shade(@selection_toolbar_suggested_button_a, 0.92));
+                                  @button_active_gradient_color_a,
+                                  @button_active_gradient_color_b 20%,
+                                  @button_active_gradient_color_c
+                                  );
 }
 
 .selection-mode.header-bar .suggested-action.button:backdrop,
@@ -4006,8 +4007,8 @@ GtkProgressBar.osd.progressbar {
     icon-shadow: none;
 
     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: @selection_toolbar_suggested_button_border_backdrop;
+    background-color: @button_gradient_color_b;
+    border-color: @borders;
 
     color: @theme_unfocused_fg_color;
 }