[gnome-themes-standard] HighContrastInverse: use the HighContrast layout

[Cosimo Cecchi <cosimoc src gnome org>]

commit 5c1200b4d762172eeb177fc0b52e67f1935f2e15
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Feb 10 00:55:25 2012 -0500

    HighContrastInverse: use the HighContrast layout
    
    Just define different colors.

 themes/HighContrast/gtk-3.0/gtk.css                |   17 ++++
 themes/HighContrastInverse/gtk-3.0/Makefile.am     |   10 ++-
 themes/HighContrastInverse/gtk-3.0/gtk.css         |   79 +++-----------------
 .../HighContrastInverse/gtk-3.0/gtk.gresource.xml  |    6 ++
 themes/a11y-base.css                               |   14 +---
 5 files changed, 42 insertions(+), 84 deletions(-)
---
diff --git a/themes/HighContrast/gtk-3.0/gtk.css b/themes/HighContrast/gtk-3.0/gtk.css
index 62f90bb..45c4aca 100644
--- a/themes/HighContrast/gtk-3.0/gtk.css
+++ b/themes/HighContrast/gtk-3.0/gtk.css
@@ -4,4 +4,21 @@
 @define-color theme_insensitive_color #999;
 @define-color theme_insensitive_bg #ccf;
 
+ define-color theme_cursor_color #cc0000;
+
+* {
+    /* Pidgin */
+    -GtkIMHtml-hyperlink-color: #000060;
+    -GtkIMHtml-hyperlink-visited-color: #600000;
+    -GtkIMHtml-hyperlink-prelight-color: #404080;
+
+    /* Evolution */
+    -GtkHTML-link-color: #000060;
+    -GtkHTML-vlink-color: #600000;
+    -GtkHTML-cite-color: #003000;
+
+    -GtkWidget-link-color: #80ccff;
+    -GtkWidget-visited-link-color: #ff80ff;
+}
+
 @import url("resource:///org/gnome/HighContrast/a11y.css");
diff --git a/themes/HighContrastInverse/gtk-3.0/Makefile.am b/themes/HighContrastInverse/gtk-3.0/Makefile.am
index 439ebb7..9757fae 100644
--- a/themes/HighContrastInverse/gtk-3.0/Makefile.am
+++ b/themes/HighContrastInverse/gtk-3.0/Makefile.am
@@ -1,7 +1,13 @@
+gtk.gresource: gtk.gresource.xml  $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/gtk.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)  $<
+
 themedir = $(datadir)/themes/HighContrastInverse/gtk-3.0
 theme_DATA = \
-	gtk.css
+	gtk.css \
+	gtk.gresource
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = \
+	gtk.css \
+	gtk.gresource.xml
 
 -include $(top_srcdir)/git.mk
diff --git a/themes/HighContrastInverse/gtk-3.0/gtk.css b/themes/HighContrastInverse/gtk-3.0/gtk.css
index 95c9a33..7a93b8d 100644
--- a/themes/HighContrastInverse/gtk-3.0/gtk.css
+++ b/themes/HighContrastInverse/gtk-3.0/gtk.css
@@ -1,22 +1,12 @@
-* {
-    -EelEditableLabel-cursor-aspect-ratio: 0.1;
-    -EelEditableLabel-cursor-color: #0cc;
-
-    -GtkRange-stepper-size: 20;
-
-    -GtkTreeView-expander-size: 16;
+ define-color theme_base_color #003;
+ define-color theme_fg_color #fff;
+ define-color theme_active_color #669;
+ define-color theme_insensitive_color #999;
+ define-color theme_insensitive_bg #033;
 
-    -GtkWidget-cursor-color: #0cc;
-    -GtkWidget-cursor-aspect-ratio: 0.1;
-    -GtkWidget-focus-line-width: 2;
-    -GtkWidget-focus-padding: 0;
-    -GtkWidget-interior-focus: 1;
-    -GtkWidget-link-color: #80ccff;
-    -GtkWidget-visited-link-color: #ff80ff;
-
-    /* Nautilus */
-    -NautilusIconContainer-frame-text: 1;
+ define-color theme_cursor_color #0cc;
 
+* {
     /* Pidgin */
     -GtkIMHtml-hyperlink-color: #80ccff;
     -GtkIMHtml-hyperlink-visited-color: #ff80ff;
@@ -27,57 +17,8 @@
     -GtkHTML-vlink-color: #ff80ff;
     -GtkHTML-cite-color: #ccff80;
 
-    background-color: #003;
-    border-color: #fff;
-    color: #fff;
-}
-
-*:hover {
-    color: #033;
-    background-color: #fff;
-    border-color: #033;
-}
-
-*:insensitive {
-    color: #999;
-    background-color: #333;
-    border-color: #999;
-}
-
-.notebook,
-.button,
-.trough {
-    border-width: 2;
-    border-style: solid;
-}
-
-.trough {
-    background-color: #669;
-    color: #fff;
-}
-
-tab {
-    background-color: #669;
-}
-
-tab:active,
-row:hover {
-    background-color: #003;
-    color: #fff;
-}
-
-*:selected {
-    background-color: #669;
-    color: #003;
-}
-
-*:selected:focused {
-    background-color: #fcc;
-    color: #003;
+    -GtkWidget-link-color: #000060;
+    -GtkWidget-visited-link-color: #600000;
 }
 
-.button:prelight:active {
-    background-color: #669;
-    border-color: #003;
-    color: #003;
-}
\ No newline at end of file
+ import url("resource:///org/gnome/HighContrastInverse/a11y.css");
diff --git a/themes/HighContrastInverse/gtk-3.0/gtk.gresource.xml b/themes/HighContrastInverse/gtk-3.0/gtk.gresource.xml
new file mode 100644
index 0000000..85f90c1
--- /dev/null
+++ b/themes/HighContrastInverse/gtk-3.0/gtk.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/HighContrastInverse">
+    <file alias="a11y.css">../../a11y-base.css</file>
+  </gresource>
+</gresources>
diff --git a/themes/a11y-base.css b/themes/a11y-base.css
index 5714c90..61940d3 100644
--- a/themes/a11y-base.css
+++ b/themes/a11y-base.css
@@ -3,14 +3,12 @@
 
     -GtkTreeView-expander-size: 16;
 
-    -GtkWidget-cursor-color: #cc0000;
+    -GtkWidget-cursor-color: @theme_cursor_color;
     -GtkWidget-cursor-aspect-ratio: 0.1;
     -GtkWidget-focus-line-width: 30;
     -GtkWidget-focus-padding: 1;
     -GtkWidget-focus-line-width: 2;
     -GtkWidget-focus-line-pattern: "\002\001";
-    -GtkWidget-link-color: #000060;
-    -GtkWidget-visited-link-color: #600000;
 
     -GtkMenu-horizontal-padding: 0;
     -GtkMenu-vertical-padding: 0;
@@ -18,16 +16,6 @@
     -GtkScrolledWindow-scrollbar-spacing: 0;
     -GtkScrolledWindow-scrollbars-within-bevel: 1;
 
-    /* Pidgin */
-    -GtkIMHtml-hyperlink-color: #000060;
-    -GtkIMHtml-hyperlink-visited-color: #600000;
-    -GtkIMHtml-hyperlink-prelight-color: #404080;
-
-    /* Evolution */
-    -GtkHTML-link-color: #000060;
-    -GtkHTML-vlink-color: #600000;
-    -GtkHTML-cite-color: #003000;
-
     -GtkComboBox-arrow-scaling: 0.9;
 }