[gnome-themes-standard/highcontrast-improvements] highcontrast: adapt HighContrastInverse theme

[Cosimo Cecchi <cosimoc src gnome org>]

commit 9cd869ac9fa55ac4b262d50d786e3fbaa7610852
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Apr 24 23:23:08 2012 -0400

    highcontrast: adapt HighContrastInverse theme
    
    Use the new color defines and refresh its palette to match the
    HighContrast version.

 themes/HighContrast/gtk-3.0/gtk.css        |    4 +++-
 themes/HighContrastInverse/gtk-3.0/gtk.css |   26 ++++++++++++++++++++------
 themes/a11y-base.css                       |   14 ++++++++++----
 3 files changed, 33 insertions(+), 11 deletions(-)
---
diff --git a/themes/HighContrast/gtk-3.0/gtk.css b/themes/HighContrast/gtk-3.0/gtk.css
index 65a0df1..9162e60 100644
--- a/themes/HighContrast/gtk-3.0/gtk.css
+++ b/themes/HighContrast/gtk-3.0/gtk.css
@@ -8,6 +8,8 @@
 @define-color theme_internal_border shade(#ddd, 0.90);
 @define-color theme_internal_bg #ddd;
 
+ 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;
 
@@ -16,7 +18,7 @@
 
 @define-color theme_button_bg #f3f3f3;
 
- define-color theme_cursor_color #cc0000;
+ define-color theme_cursor_color @theme_highlight_color;
 
 * {
     /* Pidgin */
diff --git a/themes/HighContrastInverse/gtk-3.0/gtk.css b/themes/HighContrastInverse/gtk-3.0/gtk.css
index 7a93b8d..c7d83db 100644
--- a/themes/HighContrastInverse/gtk-3.0/gtk.css
+++ b/themes/HighContrastInverse/gtk-3.0/gtk.css
@@ -1,10 +1,24 @@
- define-color theme_base_color #003;
+ define-color theme_base_color #002;
 @define-color theme_fg_color #fff;
- define-color theme_active_color #669;
- define-color theme_insensitive_color #999;
- define-color theme_insensitive_bg #033;
+ define-color theme_active_color #668;
+ define-color theme_selected_bg_color #eee;
 
- define-color theme_cursor_color #0cc;
+ define-color theme_highlight_color shade(#4a90d9, 1.05);
+
+ define-color theme_internal_bg #555;
+ define-color theme_internal_border shade(@theme_internal_bg, 1.40);
+
+ define-color theme_notebook_bg shade(@theme_active_color, 0.60);
+
+ define-color theme_insensitive_color #555;
+ define-color theme_insensitive_bg #002;
+
+ define-color theme_slider_bg shade(@theme_selected_bg_color, 0.95);
+ define-color theme_slider_border shade(@theme_slider_bg, 0.30);
+
+ define-color theme_button_bg shade(@theme_active_color, 0.50);
+
+ define-color theme_cursor_color @theme_highlight_color;
 
 * {
     /* Pidgin */
@@ -17,7 +31,7 @@
     -GtkHTML-vlink-color: #ff80ff;
     -GtkHTML-cite-color: #ccff80;
 
-    -GtkWidget-link-color: #000060;
+    -GtkWidget-link-color: @theme_highlight_color;
     -GtkWidget-visited-link-color: #600000;
 }
 
diff --git a/themes/a11y-base.css b/themes/a11y-base.css
index 9cf10d4..502b1dc 100644
--- a/themes/a11y-base.css
+++ b/themes/a11y-base.css
@@ -5,7 +5,7 @@
 
     -GtkTreeView-expander-size: 16;
 
-    -GtkWidget-cursor-color: @theme_highlight_color;
+    -GtkWidget-cursor-color: @theme_cursor_color;
     -GtkWidget-cursor-aspect-ratio: 0.10;
 
     -GtkWidget-focus-padding: 1;
@@ -184,6 +184,10 @@ GtkComboBox .button {
     border-width: 0px;
 }
 
+.menuitem {
+    color: @theme_fg_color;
+}
+
 .menubar .menuitem {
     padding: 3px 5px;
 }
@@ -205,7 +209,9 @@ GtkComboBox .button {
 .menu {
     border-style: solid;
     border-color: @theme_fg_color;
-    border-width: 2px;
+    border-width: 1px;
+
+    color: @theme_fg_color;
 }
 
 .menuitem.separator {
@@ -342,7 +348,7 @@ GtkScale.slider {
     background-color: @theme_slider_bg;
     color: transparent;
 
-    border-radius: 20px;
+    border-radius: 10px;
     border-color: @theme_slider_border;
     border-style: solid;
     border-width: 1px;
@@ -397,7 +403,7 @@ GtkSwitch.trough:active {
 }
 
 .notebook tab {
-    background-color: @theme_internal_bg;
+    background-color: @theme_notebook_bg;
     padding: 3px;
 
     border-color: @theme_fg_color;