[gnome-themes-standard] highcontrast: rework insensitive colors, and button backgrounds

[Cosimo Cecchi <cosimoc src gnome org>]

commit 1e1827d74d36ddbeedf6cd7da9696cd1b5722db5
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Apr 24 17:44:30 2012 -0400

    highcontrast: rework insensitive colors, and button backgrounds
    
    More work in progress...

 themes/HighContrast/gtk-3.0/gtk.css |   15 ++++--
 themes/a11y-base.css                |   80 ++++++++++++++++++++++++++---------
 2 files changed, 70 insertions(+), 25 deletions(-)
---
diff --git a/themes/HighContrast/gtk-3.0/gtk.css b/themes/HighContrast/gtk-3.0/gtk.css
index 7ada9e3..f0f25dd 100644
--- a/themes/HighContrast/gtk-3.0/gtk.css
+++ b/themes/HighContrast/gtk-3.0/gtk.css
@@ -1,13 +1,18 @@
 @define-color theme_base_color #fff;
 @define-color theme_fg_color #000;
 @define-color theme_active_color #b8b891;
- define-color theme_insensitive_color #999;
- define-color theme_insensitive_bg #ccf;
 @define-color theme_selected_bg_color #555;
 
- define-color theme_scrollbar_slider @theme_selected_bg_color;
- define-color theme_scrollbar_border darker(@theme_scrollbar_slider);
- define-color theme_scrollbar_trough #ddd;
+ define-color theme_internal_border shade(#ddd, 0.90);
+ define-color theme_internal_bg #ddd;
+
+ define-color theme_insensitive_color shade(#ddd, 0.90);
+ define-color theme_insensitive_bg @theme_base_color;
+
+ 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_cursor_color #cc0000;
 
diff --git a/themes/a11y-base.css b/themes/a11y-base.css
index e1706c4..dbd71b6 100644
--- a/themes/a11y-base.css
+++ b/themes/a11y-base.css
@@ -1,5 +1,7 @@
 * {
-    -GtkRange-stepper-size: 20;
+    -GtkRange-stepper-size: 2;
+    -GtkScale-slider-length: 18;
+    -GtkRange-slider-width: 18;
 
     -GtkTreeView-expander-size: 16;
 
@@ -58,12 +60,25 @@ GtkImage:insensitive {
     border-color: @theme_fg_color;
 }
 
+.button {
+    background-color: @theme_button_bg;
+}
+
+.button:insensitive {
+    background-color: @theme_insensitive_bg;
+}
+
 .button:hover {
     background-color: @theme_fg_color;
     border-color: @theme_insensitive_bg;
     color: @theme_insensitive_bg;
 }
 
+.button:active {
+    background-color: @theme_slider_bg;
+    color: @theme_base_color;
+}
+
 GtkComboBox *:hover {
     color: @theme_insensitive_bg;
 }
@@ -79,7 +94,7 @@ GtkComboBox .separator {
 }
 
 .trough {
-    background-color: @theme_scrollbar_trough;
+    background-color: @theme_internal_bg;
     color: @theme_fg_color;
 }
 
@@ -93,7 +108,6 @@ GtkComboBox .separator {
     color: @theme_insensitive_color;
 }
 
-.button:active,
 .trough:active {
     background-color: @theme_active_color;
 }
@@ -116,6 +130,11 @@ GtkComboBox .separator {
     color: @theme_base_color;
 }
 
+.entry:focus {
+    border-width: 2px;
+    border-color: #2e3436;
+}
+
 .progressbar {
     background-color: @theme_fg_color;
     border-color: @theme_insensitive_bg;
@@ -271,27 +290,48 @@ GtkComboBox .button {
     background-color: @theme_insensitive_bg;
 }
 
-.slider {
-    background-color: @theme_base_color;
-    border-width: 1px;
+GtkScale.trough {
+    border-image: linear-gradient(to bottom,
+                                  transparent,
+                                  transparent 5px,
+                                  @theme_internal_border 5px,
+                                  @theme_internal_border 15px,
+                                  transparent 15px,
+                                  transparent) 6 1 6 1 / 6px 1px 6px 1px;
     border-style: solid;
-    border-color: @theme_fg_color;
+    border-width: 6px 1px;
+    border-radius: 0;
+}
 
-    color: transparent;
+GtkScale.trough.vertical {
+    border-image: linear-gradient(to left,
+                                  transparent,
+                                  transparent 5px,
+                                  @theme_internal_border 5px,
+                                  @theme_internal_border 15px,
+                                  transparent 15px,
+                                  transparent) 1 6 1 6 / 1px 6px 1px 6px;
+    border-style: solid;
+    border-width: 1px 6px;
+    border-radius: 0;
 }
 
-.slider:hover {
-    background-color: @theme_fg_color;
-    border-color: @theme_fg_color;
+GtkScale.slider {
+    background-color: @theme_slider_bg;
+    color: transparent;
+
+    border-radius: 10px;
+    border-color: @theme_slider_border;
+    border-style: solid;
+    border-width: 1px;
 }
 
-.slider:hover:active {
-    border-color: @theme_insensitive_bg;
+GtkScale.slider:hover {
+    background-color: @theme_fg_color;
 }
 
-.slider:insensitive {
+GtkScale.slider:insensitive {
     background-color: @theme_insensitive_bg;
-    border-color: @theme_insensitive_color;
 }
 
 GtkSwitch.slider {
@@ -376,26 +416,26 @@ column-header:first-child .button {
 }
 
 .scrollbar.trough {
-    background-color: @theme_scrollbar_trough;
+    background-color: @theme_internal_bg;
 
     border-width: 0;
     border-color: transparent;
 }
 
 .scrollbars-junction {
-    background-color: @theme_scrollbar_trough;
+    background-color: @theme_internal_bg;
 }
 
 .scrollbar.trough.vertical {
-    box-shadow: inset 1px 0 shade(@theme_scrollbar_trough, 0.90);
+    box-shadow: inset 1px 0 @theme_internal_border;
 }
 
 .scrollbar.trough.horizontal {
-    box-shadow: inset 0 1px shade(@theme_scrollbar_trough, 0.90);
+    box-shadow: inset 0 1px @theme_internal_border;
 }
 
 .scrollbar.slider {
-    background-color: @theme_scrollbar_slider;
+    background-color: @theme_slider_bg;
 
     border-style: solid;
     border-radius: 12px;