[gnome-themes-standard/highcontrast-improvements] highcontrast: update buttons and entries to new mockups

[Cosimo Cecchi <cosimoc src gnome org>]

commit 5a4c52e466e0941e3c338997a5052c063bb6359e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Apr 29 20:23:46 2012 -0400

    highcontrast: update buttons and entries to new mockups

 themes/HighContrast/gtk-3.0/gtk.css |   18 ++-
 themes/a11y-base.css                |  192 ++++++++++++++++++++---------------
 2 files changed, 122 insertions(+), 88 deletions(-)
---
diff --git a/themes/HighContrast/gtk-3.0/gtk.css b/themes/HighContrast/gtk-3.0/gtk.css
index 0076729..a86e7ea 100644
--- a/themes/HighContrast/gtk-3.0/gtk.css
+++ b/themes/HighContrast/gtk-3.0/gtk.css
@@ -1,21 +1,27 @@
 @define-color theme_base_color #fff;
 @define-color theme_fg_color #000;
- define-color theme_selected_bg_color #555;
+ define-color theme_selected_bg_color #555753;
 
- define-color theme_highlight_color shade(#4a90d9, 0.85);
+ define-color theme_highlight_color #3465a4;
 
- define-color theme_internal_border shade(#ddd, 0.90);
- define-color theme_internal_bg #ddd;
+ define-color theme_internal_bg #d3d4d1;
+ define-color theme_internal_border shade(@theme_internal_bg, 0.90);
 
 @define-color theme_notebook_bg @theme_internal_bg;
 
- define-color theme_insensitive_color shade(#ddd, 0.90);
- define-color theme_insensitive_bg @theme_base_color;
+ define-color theme_insensitive_color alpha(#000, 0.50);
+ define-color theme_insensitive_bg #f4f4f2;
+ define-color theme_insensitive_border #babdb6;
 
 @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_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_cursor_color @theme_highlight_color;
 
diff --git a/themes/a11y-base.css b/themes/a11y-base.css
index f05a7d4..0b8dc8b 100644
--- a/themes/a11y-base.css
+++ b/themes/a11y-base.css
@@ -51,9 +51,8 @@ GtkWindow {
 }
 
 *:insensitive {
-    color: @theme_insensitive_color;
     background-color: @theme_insensitive_bg;
-    border-color: @theme_insensitive_color;
+    border-color: @theme_insensitive_border;
 }
 
 GtkCheckButton:selected,
@@ -93,35 +92,78 @@ GtkImage:insensitive {
     background-color: @theme_insensitive_color;
 }
 
-.button,
-.entry {
-    border-width: 1px;
+/***********
+ * Buttons *
+ ***********/
+.button {
+    border-width: 2px;
     border-style: solid;
-    border-color: @theme_fg_color;
+    border-color: @theme_button_fg;
 
     border-radius: 3px;
-}
 
-.button {
     background-color: @theme_button_bg;
     padding: 1px 4px;
-    color: @theme_fg_color;
+    color: @theme_button_fg;
+}
+
+.button:active {
+    background-color: @theme_slider_bg;
+    color: @theme_base_color;
+    border-color: @theme_slider_bg;
 }
 
 .button:insensitive {
-    background-color: @theme_insensitive_bg;
+    background-color: @theme_button_insensitive_bg;
+    color: @theme_button_insensitive_fg;
+    border-color: @theme_insensitive_border;
+}
+
+.button:insensitive:active {
+    background-color: @theme_button_insensitive_active_bg;
+    border-color: @theme_button_insensitive_active_bg;
+    color: @theme_base_color;
 }
 
 .button:hover {
     background-color: @theme_fg_color;
-    color: @theme_insensitive_bg;
+    color: @theme_base_color;
 }
 
-.button:active {
-    background-color: @theme_slider_bg;
+.button:hover:active {
+    background-color: @theme_fg_color;
+}
+
+/***********
+ * Entries *
+ ***********/
+.entry {
+    border-width: 1px;
+    border-style: solid;
+    border-color: @theme_fg_color;
+
+    border-radius: 3px;
+
+    background-color: @theme_base_color;
+    padding: 4px;
+}
+
+.entry:selected {
+    background-color: @theme_selected_bg_color;
     color: @theme_base_color;
 }
 
+.entry:focus {
+    border-width: 2px;
+    border-color: @theme_highlight_color;
+}
+
+.entry:insensitive {
+    border-color: @theme_insensitive_border;
+    background-color: @theme_insensitive_bg;
+    color: @theme_insensitive_color;
+}
+
 GtkComboBox *:hover {
     color: @theme_insensitive_bg;
 }
@@ -130,12 +172,6 @@ GtkComboBox .separator {
     color: transparent;
 }
 
-.button:insensitive,
-.trough:insensitive,
-.entry:insensitive {
-    border-color: @theme_insensitive_color;
-}
-
 .trough {
     background-color: @theme_internal_bg;
     color: @theme_fg_color;
@@ -145,36 +181,16 @@ GtkComboBox .separator {
     border-color: @theme_internal_border;
 }
 
-.entry:insensitive,
 .trough:insensitive {
+    border-color: @theme_insensitive_border;
     background-color: @theme_insensitive_bg;
     color: @theme_insensitive_color;
 }
 
-.button:hover:active {
-    background-color: @theme_fg_color;
-}
-
-.button:insensitive:active,
 .trough:insensitive:active {
     background-color: @theme_insensitive_bg;
 }
 
-.entry {
-    background-color: @theme_base_color;
-    padding: 4px;
-}
-
-.entry:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_base_color;
-}
-
-.entry:focus {
-    border-width: 2px;
-    border-color: @theme_highlight_color;
-}
-
 .progressbar {
     background-color: @theme_highlight_color;
     border-style: none;
@@ -184,6 +200,19 @@ GtkComboBox .button {
     padding: 0 4px;
 }
 
+.combobox-entry .button {
+    background-color: @theme_base_color;
+    color: @theme_fg_color;
+    border-width: 1px;
+    border-color: @theme_fg_color;
+}
+
+.combobox-entry .button:insensitive {
+    background-color: @theme_insensitive_bg;
+    color: @theme_internal_bg;
+    border-color: @theme_insensitive_border;
+}
+
 .combobox-entry .entry:first-child {
     border-right-width: 0px;
     border-radius: 2px 0 0 2px;
@@ -204,19 +233,23 @@ GtkComboBox .button {
 
 .spinbutton .button {
     padding: 2px 6px;
-    color: @theme_fg_color;
+    color: @theme_selected_bg_color;
 
     border-width: 0px 1px;
     border-radius: 0;
+    background-color: @theme_base_color;
+    border-color: @theme_internal_border;
 }
 
 .spinbutton .button:hover {
+    background-color: @theme_selected_bg_color;
     color: @theme_insensitive_bg;
     border-color: @theme_fg_color;
 }
 
 .spinbutton .button:insensitive {
-    color: @theme_insensitive_color;
+    color: @theme_internal_bg;
+    background-color: @theme_insensitive_bg;
 }
 
 .spinbutton .button:first-child,
@@ -276,22 +309,41 @@ GtkComboBox .button {
     background-color: transparent;
 }
 
+.toolbar .button:insensitive {
+    background-color: @theme_base_color;
+}
+
+.primary-toolbar .raised .button:insensitive,
+.primary-toolbar .raised.button:insensitive {
+    border-color: @theme_button_insensitive_border;
+    background-color: @theme_button_insensitive_bg;
+    color: @theme_button_insensitive_fg;
+}
+
+.primary-toolbar .raised .button:active,
+.primary-toolbar .raised.button:active,
+.primary-toolbar .button:active,
 .toolbar .button:active {
     background-color: @theme_slider_bg;
+    border-color: @theme_slider_bg;
 }
 
+.primary-toolbar .raised .button:hover,
+.primary-toolbar .raised.button:hover,
+.primary-toolbar .button:hover,
 .toolbar .button:hover {
     background-color: @theme_fg_color;
+    border-color: @theme_fg_color;
 }
 
-.toolbar .button *:insensitive,
-.toolbar .button:insensitive {
-    background-color: @theme_base_color;
-}
+.primary-toolbar .raised .button:active:insensitive,
+.primary-toolbar .raised.button:active:insensitive,
+.primary-toolbar .button:active:insensitive,
+.toolbar .button:active:insensitive {
+    border-color: @theme_button_insensitive_active_bg;
+    background-color: @theme_button_insensitive_active_bg;
 
-.toolbar .button *:insensitive:active,
-.toolbar .button:insensitive:active {
-    background-color: @theme_insensitive_bg;
+    color: @theme_base_color;
 }
 
 .inline-toolbar {
@@ -321,34 +373,15 @@ GtkComboBox .button {
     border-color: transparent;
 }
 
-.primary-toolbar .button:hover,
-.primary-toolbar .button:active {
-    border-color: @theme_fg_color;
-}
-
-.primary-toolbar .button:active:insensitive {
-    border-color: @theme_insensitive_color;
-}
-
 .primary-toolbar .button.raised,
 .primary-toolbar .raised .button {
-    border-color: @theme_fg_color;
-}
-
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar .raised.button:insensitive {
-    border-color: transparent;
-}
-
-.primary-toolbar .raised .button:active:insensitive,
-.primary-toolbar .raised.button:active:insensitive {
-    border-color: @theme_insensitive_color;
+    border-color: @theme_button_fg;
 }
 
 .osd .button,
 .linked .button,
 .inline-toolbar .button {
-    border-right-width: 0;
+    border-left-width: 0;
     border-radius: 0;
 }
 
@@ -357,30 +390,23 @@ GtkComboBox .button {
     border-color: @theme_fg_color;
 }
 
-.linked .button:insensitive,
-.inline-toolbar .button:insensitive {
-    border-top-color: @theme_fg_color;
-    border-bottom-color: @theme_fg_color;
-}
-
 .osd .button:first-child,
 .linked .button:first-child,
 .inline-toolbar GtkToolButton:first-child .button {
     border-radius: 3px 0 0 3px;
-    border-left-color: @theme_fg_color;
+    border-left-width: 2px;
 }
 
 .osd .button:last-child,
 .linked .button:last-child,
 .inline-toolbar GtkToolButton:last-child .button {
-    border-width: 1px;
-    border-right-color: @theme_fg_color;
     border-radius: 0 3px 3px 0;
 }
 
-.inline-toolbar .button *:insensitive,
+.linked .button:insensitive,
 .inline-toolbar .button:insensitive {
-    background-color: @theme_insensitive_bg;
+    background-color: @theme_button_insensitive_bg;
+    border-color: @theme_insensitive_border;
 }
 
 GtkScale.trough {
@@ -522,6 +548,8 @@ column-header .button,
 column-header.button {
     font: bold;
 
+    border-width: 1px;
+
     border-top-width: 0;
     border-right-width: 0;
     border-radius: 0;
@@ -687,7 +715,7 @@ TerminalScreen {
 
 .osd GtkToolButton .button,
 .osd .button:only-child {
-    border-width: 1px;
+    border-width: 2px;
     border-radius: 3px;
     border-style: solid;
 }