[gnome-themes-standard] highcontrast: more work on progresbars, switch and buttons

[Cosimo Cecchi <cosimoc src gnome org>]

commit ea529d54a08d494e5c7afcf9389fe8341e499f70
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Apr 29 20:55:22 2012 -0400

    highcontrast: more work on progresbars, switch and buttons

 themes/HighContrast/gtk-3.0/gtk.css |   10 +++--
 themes/a11y-base.css                |   69 ++++++++++++++++++++++++-----------
 2 files changed, 53 insertions(+), 26 deletions(-)
---
diff --git a/themes/HighContrast/gtk-3.0/gtk.css b/themes/HighContrast/gtk-3.0/gtk.css
index a86e7ea..4ad7ce7 100644
--- a/themes/HighContrast/gtk-3.0/gtk.css
+++ b/themes/HighContrast/gtk-3.0/gtk.css
@@ -3,6 +3,8 @@
 @define-color theme_selected_bg_color #555753;
 
 @define-color theme_highlight_color #3465a4;
+ define-color theme_highlight_alt #204a87;
+ define-color theme_highlight_border #12294a;
 
 @define-color theme_internal_bg #d3d4d1;
 @define-color theme_internal_border shade(@theme_internal_bg, 0.90);
@@ -16,12 +18,12 @@
 @define-color theme_slider_bg shade(@theme_selected_bg_color, 1.10);
 @define-color theme_slider_border darker(@theme_slider_bg);
 
- define-color theme_button_bg #f3f3f3;
+ define-color theme_button_bg #eeeeec;
 @define-color theme_button_fg #2e3436;
 @define-color theme_button_insensitive_fg #c6c8c8;
- define-color theme_button_insensitive_bg alpha(@theme_button_bg, 0.30);
- define-color theme_button_insensitive_border alpha(@theme_fg_color, 0.30);
- define-color theme_button_insensitive_active_bg alpha(@theme_selected_bg_color, 0.30);
+ define-color theme_button_insensitive_bg #fafaf9;
+ define-color theme_button_insensitive_border #c1c2c3;
+ define-color theme_button_insensitive_active_bg #cccdcc;
 
 @define-color theme_cursor_color @theme_highlight_color;
 
diff --git a/themes/a11y-base.css b/themes/a11y-base.css
index 0b8dc8b..371a23a 100644
--- a/themes/a11y-base.css
+++ b/themes/a11y-base.css
@@ -173,12 +173,13 @@ GtkComboBox .separator {
 }
 
 .trough {
-    background-color: @theme_internal_bg;
-    color: @theme_fg_color;
+    background-color: @theme_button_bg;
+    color: @theme_selected_bg_color;
 
     border-width: 1px;
     border-style: solid;
-    border-color: @theme_internal_border;
+    border-color: @theme_selected_bg_color;
+    border-radius: 3px;
 }
 
 .trough:insensitive {
@@ -193,7 +194,9 @@ GtkComboBox .separator {
 
 .progressbar {
     background-color: @theme_highlight_color;
-    border-style: none;
+    border-width: 1px;
+    border-color: @theme_highlight_border;
+    border-radius: 3px
 }
 
 GtkComboBox .button {
@@ -346,6 +349,31 @@ GtkComboBox .button {
     color: @theme_base_color;
 }
 
+.linked .button,
+.inline-toolbar .button {
+    color: @theme_selected_bg_color;
+    border-color: @theme_selected_bg_color;
+}
+
+.linked .button:hover,
+.inline-toolbar .button:hover {
+    color: @theme_base_color;
+    border-color: @theme_fg_color;
+}
+
+.linked .button:active,
+.inline-toolbar .button:active {
+    color: @theme_base_color;
+}
+
+.linked .button:insensitive,
+.inline-toolbar .button:insensitive {
+    border-color: @theme_insensitive_border;
+    background-color: @theme_button_insensitive_bg;
+
+    color: @theme_button_insensitive_fg;
+}
+
 .inline-toolbar {
     border-width: 0 1px 1px;
 }
@@ -385,11 +413,6 @@ GtkComboBox .button {
     border-radius: 0;
 }
 
-.linked .button:hover,
-.inline-toolbar .button:hover {
-    border-color: @theme_fg_color;
-}
-
 .osd .button:first-child,
 .linked .button:first-child,
 .inline-toolbar GtkToolButton:first-child .button {
@@ -403,12 +426,6 @@ GtkComboBox .button {
     border-radius: 0 3px 3px 0;
 }
 
-.linked .button:insensitive,
-.inline-toolbar .button:insensitive {
-    background-color: @theme_button_insensitive_bg;
-    border-color: @theme_insensitive_border;
-}
-
 GtkScale.trough {
     border-image: linear-gradient(to bottom,
                                   transparent,
@@ -463,18 +480,20 @@ GtkSwitch {
 GtkSwitch.slider {
     padding: 2px;
 
-    border-width: 1px;
-    border-color: @theme_slider_border;
+    border-width: 0;
     border-style: solid;
     border-radius: 3px;
 
-    background-color: @theme_slider_bg;
+    background-color: @theme_selected_bg_color;
     background-clip: border-box;
 }
 
 GtkSwitch.slider:insensitive {
-    background-color: @theme_insensitive_bg;
-    border-color: @theme_insensitive_color;
+    background-color: @theme_button_insensitive_active_bg;
+}
+
+GtkSwitch.slider:active {
+    background-color: @theme_base_color;
 }
 
 GtkSwitch.trough {
@@ -485,8 +504,14 @@ GtkSwitch.trough {
 }
 
 GtkSwitch.trough:active {
-    color: @theme_highlight_color;
-    background-color: @theme_button_bg;
+    color: @theme_base_color;
+    background-color: @theme_highlight_color;
+    background-color: @theme_highlight_alt;
+}
+
+GtkSwitch.trough:insensitive {
+    background-color: @theme_button_insensitive_bg;
+    color: @theme_button_insensitive_active_bg;
 }
 
 .notebook {