[gnome-themes-standard] Rename switch active trough color

[William Jon McCann <mccann src gnome org>]

commit fc43bd804448e908fe64549db7182f6ecc84f319
Author: William Jon McCann <william jon mccann gmail com>
Date:   Tue May 6 17:26:20 2014 -0400

    Rename switch active trough color

 themes/Adwaita/gtk-3.0/gtk-main-dark.css |   10 +++++-----
 themes/Adwaita/gtk-3.0/gtk-main.css      |    8 ++++----
 themes/Adwaita/gtk-3.0/gtk-widgets.css   |   17 ++++++++---------
 3 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index ff66a63..ce1105e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -59,6 +59,10 @@
 
 @define-color trough_bg_color_a #30312f;
 @define-color trough_bg_color_b #41433f;
+ define-color trough_active_color @theme_text_color;
+ define-color trough_active_bg_a shade(@theme_selected_bg_color, 0.86);
+ define-color trough_active_bg_b shade(@theme_selected_bg_color, 1.04);
+ define-color trough_active_bg_c shade(@theme_selected_bg_color, 1.12);
 
 @define-color scrollbar_trough shade(@theme_bg_color, 1.2);
 @define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.05); /* FIXME */
@@ -70,15 +74,11 @@
 @define-color scrollbar_slider_unfocused shade(@theme_unfocused_base_color, 0.8);
 
 @define-color switch_slider_color shade(@theme_bg_color, 0.9);
- define-color switch_trough_active_color @theme_text_color;
- define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.86);
- define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 1.04);
- define-color switch_trough_active_bg_c shade(@theme_selected_bg_color, 1.12);
 
 @define-color progressbar_background_a shade(@theme_selected_bg_color, 1.15);
 @define-color progressbar_background_b shade(@theme_selected_bg_color, 0.8);
 @define-color progressbar_pattern @progressbar_background_b;
- define-color progressbar_border shade(@switch_trough_active_bg_a, 0.60);
+ define-color progressbar_border shade(@trough_active_bg_a, 0.60);
 @define-color progressbar_unfocused_background @unfocused_borders;
 @define-color progressbar_unfocused_border @theme_unfocused_fg_color;
 @define-color progressbar_unfocused_trough @unfocused_dark_bg;
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index 6483755..39cce99 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -59,6 +59,10 @@
 
 @define-color trough_bg_color_a #bcbcb7;
 @define-color trough_bg_color_b #e0e0dd;
+ define-color trough_active_color @theme_base_color;
+ define-color trough_active_bg_a shade(@theme_selected_bg_color, 1.17);
+ define-color trough_active_bg_b shade(@theme_selected_bg_color, 1.22);
+ define-color trough_active_bg_c shade(@theme_selected_bg_color, 1.34);
 
 @define-color scrollbar_trough shade(@theme_bg_color, 0.9);
 @define-color scrollbar_trough_insensitive shade(@theme_bg_color, 0.9);
@@ -70,10 +74,6 @@
 @define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
 
 @define-color switch_slider_color #eeeeec;
- define-color switch_trough_active_color @theme_base_color;
- define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 1.17);
- define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 1.22);
- define-color switch_trough_active_bg_c shade(@theme_selected_bg_color, 1.34);
 
 @define-color progressbar_background_a #76b0ec;
 @define-color progressbar_background_b #1f72c6;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 455a8df..7d88c8a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1181,21 +1181,21 @@ GtkLevelBar.vertical {
 }
 
 .scale.progressbar {
-    color: @switch_trough_active_color;
+    color: @trough_active_color;
     box-shadow: inset 0 1px 1px alpha(black, 0.1);
     background-image: linear-gradient(to bottom,
-                                      @switch_trough_active_bg_a,
-                                      @switch_trough_active_bg_b 20%,
-                                      @switch_trough_active_bg_c
+                                      @trough_active_bg_a,
+                                      @trough_active_bg_b 20%,
+                                      @trough_active_bg_c
                                       );
     background-color: transparent;
 }
 
 .scale.progressbar.vertical {
     background-image: linear-gradient(to right,
-                                      @switch_trough_active_bg_a,
-                                      @switch_trough_active_bg_b 20%,
-                                      @switch_trough_active_bg_c
+                                      @trough_active_bg_a,
+                                      @trough_active_bg_b 20%,
+                                      @trough_active_bg_c
                                       );
     background-color: transparent;
 }
@@ -3869,9 +3869,8 @@ GtkSwitch {
     text-shadow: none;
 }
 
-.scale.progressbar,
 GtkSwitch.trough:active {
-    color: @switch_trough_active_color;
+    color: @trough_active_color;
 }
 
 GtkSwitch.trough:active {