[gnome-themes-standard] switch: cleanup color names

[Cosimo Cecchi <cosimoc src gnome org>]

commit 22c518801c04445342e6cde991d9830fc861fca3
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Oct 24 15:08:21 2011 -0400

    switch: cleanup color names

 themes/Adwaita/gtk-3.0/gtk-dark.css    |    7 +++----
 themes/Adwaita/gtk-3.0/gtk-widgets.css |    4 ++--
 themes/Adwaita/gtk-3.0/gtk.css         |    5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index b5333e9..9a2a7a9 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -47,13 +47,12 @@
 @define-color notebook_tab_gradient_b @button_gradient_color_b;
 
 @define-color switch_slider_color shade(@theme_bg_color, 0.95);
- define-color switch_slider_active_border shade(@active_switch_bg_color_a, 0.60);
+ define-color switch_slider_active_border shade(@switch_trough_active_bg_a, 0.60);
 @define-color switch_slider_insensitive_bg @insensitive_border_color;
 
 @define-color switch_trough_active_color @theme_text_color;
-
- define-color active_switch_bg_color_a shade (@theme_selected_bg_color, 0.85);
- define-color active_switch_bg_color_b @theme_selected_bg_color;
+ define-color switch_trough_active_bg_a shade (@theme_selected_bg_color, 0.85);
+ define-color switch_trough_active_bg_b @theme_selected_bg_color;
 
 @define-color highlighted_border @button_border;
 @define-color internal_element_color #888a85;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 1b8e2ad..518298e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1365,8 +1365,8 @@ GtkSwitch.trough:active {
     color: @switch_trough_active_color;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (@active_switch_bg_color_a),
-                                     to (@active_switch_bg_color_b));
+                                     from (@switch_trough_active_bg_a),
+                                     to (@switch_trough_active_bg_b));
 }
 
 GtkSwitch.trough:insensitive {
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 9f3a2d9..15b7cf3 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -78,14 +78,13 @@
 @define-color trough_bg_color_a #bcbcb7;
 @define-color trough_bg_color_b #e0e0dd;
 
- define-color active_switch_bg_color_a #509ae7;
- define-color active_switch_bg_color_b #84b8ee;
-
 @define-color switch_slider_color #eeeeec;
 @define-color switch_slider_active_border #2a79cb;
 @define-color switch_slider_insensitive_bg @insensitive_bg_color;
 
 @define-color switch_trough_active_color @theme_base_color;
+ define-color switch_trough_active_bg_a #509ae7;
+ define-color switch_trough_active_bg_b #84b8ee;
 
 @define-color progressbar_background_a #76b0ec;
 @define-color progressbar_background_b #1f72c6;