[gnome-themes-standard] Widget theme: some defined colors cleanup and some initial dark theme unfocused window work.

[Lapo Calamandrei <lapo src gnome org>]

commit 3fa80d856be72e9e0baeadd472cb72f46f5cecb8
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Tue Dec 20 19:15:59 2011 +0100

    Widget theme: some defined colors cleanup and some initial dark theme unfocused window work.

 .../borders/generic-border-unfocused-dark.svg      |    8 +-
 ...imary-toolbar-generic-border-unfocused-dark.svg |    8 +-
 themes/Adwaita/gtk-3.0/gtk-dark.css                |   13 ++--
 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   14 ++--
 .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css   |    2 +-
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |    2 +-
 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |    4 +-
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   66 ++++++++++++--------
 themes/Adwaita/gtk-3.0/gtk.css                     |   12 +---
 9 files changed, 68 insertions(+), 61 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg b/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg
index 54287a8..35c74e4 100644
--- a/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg
@@ -14,7 +14,7 @@
    id="svg33222"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="generic-border-unfocused.svg">
+   sodipodi:docname="generic-border-unfocused-dark.svg">
   <defs
      id="defs33224" />
   <sodipodi:namedview
@@ -26,7 +26,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313709"
      inkscape:cx="17.850819"
-     inkscape:cy="-1.2397353"
+     inkscape:cy="-4.775269"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:grid-bbox="true"
@@ -56,7 +56,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -72,6 +72,6 @@
        height="13.999999"
        width="15"
        id="rect17861"
-       style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
+       style="color:#000000;fill:none;stroke:#545959;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
   </g>
 </svg>
diff --git a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg
index 324acca..753ff9c 100644
--- a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg
@@ -68,9 +68,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="6.284171"
-     inkscape:cy="9.0507553"
+     inkscape:zoom="16"
+     inkscape:cx="11.653849"
+     inkscape:cy="8.8456424"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:grid-bbox="true"
@@ -116,6 +116,6 @@
        height="13"
        width="13"
        id="rect17861"
-       style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:none;stroke:#545959;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
   </g>
 </svg>
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 7774cbb..92100d7 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -13,14 +13,14 @@
 @define-color theme_unfocused_text_color mix(@theme_unfocused_base_color, @theme_text_color, 0.8);
 @define-color theme_unfocused_fg_color mix(@theme_unfocused_bg_color, @theme_text_color, 0.3);
 @define-color theme_unfocused_bg_color @theme_bg_color;
- define-color theme_unfocused_selected_bg_color shade (@theme_selected_bg_color, 0.75); /* FIXME */
+ define-color theme_unfocused_selected_bg_color shade (@theme_selected_bg_color, 0.9); /* FIXME */
 @define-color theme_unfocused_selected_fg_color @theme_selected_fg_color; /* FIXME */
 @define-color unfocused_button_background @theme_unfocused_bg_color;
- define-color unfocused_borders_color @button_border;
- define-color unfocused_insensitive_borders_color mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5);
+ define-color unfocused_borders mix(@theme_unfocused_bg_color, @theme_text_color, 0.15);
+ define-color unfocused_insensitive_borders_color mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
 @define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
 @define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
- define-color unfocused_toolbar mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5);
+ define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @borders, 0.5);
 
 @define-color menu_bg_color #555753;
 @define-color menu_fg_color @theme_text_color;
@@ -35,7 +35,7 @@
 
 @define-color button_gradient_color_a shade (@theme_bg_color, 1.15);
 @define-color button_gradient_color_b shade (@theme_bg_color, 0.8);
- define-color button_border #24282a;
+ define-color borders #24282a;
 
 @define-color button_active_text_shadow black;
 @define-color button_text_shadow black;
@@ -60,7 +60,6 @@
 
 @define-color inactive_frame_color shade (@theme_bg_color, 0.8);
 
- define-color notebook_border @button_border;
 @define-color notebook_active_tab_border shade (@theme_selected_bg_color, 0.5);
 @define-color notebook_selected_tab_color alpha (@theme_selected_bg_color, 0.75);
 
@@ -75,7 +74,7 @@
 @define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.6);
 @define-color switch_trough_active_bg_b @theme_selected_bg_color;
 
- define-color highlighted_border @button_border;
+ define-color highlighted_border @borders;
 @define-color internal_element_color #595959;
 @define-color internal_element_prelight #eeeeee;
 @define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.65);
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 00d0542..eed0760 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -31,7 +31,7 @@
 .trough row:hover {
     background-image: -gtk-gradient (linear,
     				     left top, left bottom,
-                                     from (@button_border),
+                                     from (@borders),
 				     to (shade(@theme_bg_color, 0.95)));
     background-color: transparent; 
 }
@@ -47,7 +47,7 @@
 .inline-toolbar .button:active:focus:hover {
     background-image: -gtk-gradient (linear,
     				     left top, left bottom,
-                                     from (shade(@button_border, 0.95)),
+                                     from (shade(@borders, 0.95)),
 				     to (shade(@theme_bg_color, 0.88)));
     background-color: transparent;
 }
@@ -56,7 +56,7 @@
 .trough.vertical {
     background-image: -gtk-gradient (linear,
     				     left top, right top,
-                                     from (@button_border),
+                                     from (@borders),
 				     to (shade(@theme_bg_color, 0.95)));
 }
 
@@ -126,7 +126,7 @@
 /* Unfocused window pushed button background */
 .button:active:window-unfocused {
     background-image: none;
-    background-color: @unfocused_borders_color;
+    background-color: @unfocused_borders;
 }
 
 /* Unfocused window insensitive button background */
@@ -137,7 +137,7 @@
 
 .button:insensitive:active:window-unfocused {
     background-image: none;
-    background-color: mix(@unfocused_insensitive_bg_color, @unfocused_borders_color, 0.5);
+    background-color: mix(@unfocused_insensitive_bg_color, @unfocused_borders, 0.5);
 }
 
 /* Entry background */
@@ -225,7 +225,7 @@ GtkComboBox.combobox-entry .button:insensitive:window-unfocused {
 .primary-toolbar.toolbar:window-unfocused,
 .inline-toolbar.toolbar:window-unfocused  {
     background-image: none;
-    background-color: @unfocused_toolbar;
+    background-color: @unfocused_dark_bg;
 }
 
 /* Active switch background*/
@@ -244,7 +244,7 @@ GtkSwitch.trough:window-unfocused {
 }
 
 GtkSwitch.trough:active:window-unfocused {
-    background-color: @unfocused_borders_color;
+    background-color: @unfocused_borders;
     background-image: none;
 }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
index 5e9d7b5..b7d45b8 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -144,7 +144,7 @@ column-header.button:window-unfocused,
 column-header .button:window-unfocused {
     border-image: -gtk-gradient (linear,
                                  left top, left bottom,
-                                 from (@unfocused_borders_color),
+                                 from (@unfocused_borders),
                                  to (@theme_unfocused_base_color)) 0 1 0 0;
     border-width: 0 1 0 0;
     border-radius: 0;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 0203d3e..6c196d3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -154,7 +154,7 @@ column-header.button:window-unfocused,
 column-header .button:window-unfocused {
     border-image: -gtk-gradient (linear,
                                  left top, left bottom,
-                                 from (@unfocused_borders_color),
+                                 from (@unfocused_borders),
                                  to (@theme_unfocused_base_color)) 0 1 0 0;
     border-width: 0 1 0 0;
     border-radius: 0;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
index 7404616..8c38c73 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -93,7 +93,7 @@ GtkSwitch.slider {
                                      to (@switch_slider_color));
 
     -adwaita-switch-grip-color: shade (@switch_slider_color, 0.9);
-    border-color: mix (@button_border, black, 0.4);
-    box-shadow: 0 -1 inset alpha(white, 0.04), 0 1 inset shade(@theme_bg_color, 1.1), 0 2 inset alpha(@button_border, 0.2);
+    border-color: mix (@borders, black, 0.4);
+    box-shadow: 0 -1 inset alpha(white, 0.04), 0 1 inset shade(@theme_bg_color, 1.1), 0 2 inset alpha(@borders, 0.2);
 }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index c7aee84..c3a39e5 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -152,7 +152,7 @@ GtkStatusbar {
 GtkTreeView .separator,
 .separator,
 .separator:hover {
-    color: darker (@theme_bg_color);
+    color: @borders;
 }
 
 GtkTreeView .separator:window-unfocused,
@@ -394,7 +394,7 @@ GtkProgressBar,
 GtkProgressBar:window-unfocused,
 .trough row:window-unfocused {
     background-image: none;
-    background-color: mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5); /*FIXME*/
+    background-color: @unfocused_dark_bg;
 }
 
 /************
@@ -427,7 +427,16 @@ GtkScale.trough:window-unfocused {
     border-width: 1;
     border-image: none;
     border-style: solid;
-    border-color: @button_border;
+}
+
+GtkScale.trough,
+GtkScale.trough.highlight,
+GtkScale.trough.vertical {
+    border-color: @borders;
+}
+
+GtkScale.trough:window-unfocused {
+    border-color: @unfocused_borders;
 }
 
 GtkScale.trough:insensitive {
@@ -444,7 +453,7 @@ GtkScale.progressbar {
 }
 
 GtkScale.progressbar:window-unfocused {
-    background-color: @unfocused_borders_color;
+    background-color: @unfocused_borders;
 
     -adwaita-progressbar-pattern: none;
 }
@@ -463,8 +472,8 @@ GtkScale.trough {
 
 GtkScale.trough:window-unfocused {
     box-shadow: none;
-    border-color: @unfocused_borders_color;
-    background-color: mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5);
+    border-color: @unfocused_borders;
+    background-color: @unfocused_dark_bg;
     background-image: none;
 }
 
@@ -487,12 +496,15 @@ GtkScale.trough:insensitive:window-unfocused {
 /* only render frames in a GtkScrolledWindow */
 GtkScrolledWindow.frame {
     border-style: solid;
-    border-color: darker (@theme_bg_color);
+    border-color: @borders;
     border-width: 1;
     border-radius: 2;
     padding: 0;
 }
 
+GtkScrolledWindow.frame:window-unfocused {
+    border-color: @unfocused_borders;
+}
 
 /***********
  * Buttons *
@@ -596,7 +608,7 @@ GtkComboBox.combobox-entry .button {
 }
 
 .primary-toolbar .button *:insensitive:window-unfocused {
-    color: mix(@unfocused_insensitive_bg_color, @unfocused_toolbar, 0.65);
+    color: mix(@unfocused_insensitive_bg_color, @unfocused_dark_bg, 0.65); /* FIXME */
 }
 
 .primary-toolbar .button.raised *:insensitive:window-unfocused,
@@ -652,7 +664,7 @@ GtkComboBox.combobox-entry .button {
 .primary-toolbar .raised.linked .button:window-unfocused,
 .inline-toolbar.toolbar .button:window-unfocused,
 .inline-toolbar.toolbar GtkToolButton .button:window-unfocused {
-    box-shadow: -1 0 inset @unfocused_borders_color;
+    box-shadow: -1 0 inset @unfocused_borders;
 }
 
 .linked .button:insensitive:window-unfocused,
@@ -960,7 +972,7 @@ GtkLinkButton * {
 .notebook {
     padding: 0;
 
-    border-color: @notebook_border;
+    border-color: @borders;
     border-style: solid;
     border-width: 1;
 
@@ -979,7 +991,7 @@ GtkLinkButton * {
 .notebook:window-unfocused,
 .notebook GtkViewport:window-unfocused {
     background-color: @theme_unfocused_base_color;
-    border-color: @notebook_border;
+    border-color: @unfocused_borders;
 }
 
 .notebook tab {
@@ -1002,7 +1014,7 @@ GtkLinkButton * {
     -adwaita-border-gradient: -gtk-gradient (linear,
                                              left top, left bottom,
                                              from (@notebook_active_tab_border),
-                                             to (@notebook_border));
+                                             to (@borders));
 
     -adwaita-selected-tab-color: @notebook_selected_tab_color;
     background-image: -gtk-gradient (linear,
@@ -1018,13 +1030,13 @@ GtkLinkButton * {
                                              from (@theme_unfocused_base_color),
                                              to (@theme_unfocused_base_color));
     background-color:  @theme_unfocused_base_color;
-    border-color: @unfocused_borders_color;
+    border-color: @unfocused_borders;
     /* FIXME - should be possible to set it to none and use border color */
     -adwaita-border-gradient: -gtk-gradient (linear, 
                                              left top, left bottom,
-                                             from (@unfocused_borders_color),
-                                             to (@unfocused_borders_color));
-    -adwaita-selected-tab-color: @unfocused_borders_color;
+                                             from (@unfocused_borders),
+                                             to (@unfocused_borders));
+    -adwaita-selected-tab-color: @unfocused_borders;
 }
 
 .notebook tab.left:active:window-unfocused,
@@ -1223,7 +1235,7 @@ GtkComboBox .button *:hover {
 }
 
 .scrollbar.trough:window-unfocused {
-    background-color: mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.3);
+    background-color: mix(@theme_unfocused_bg_color, @unfocused_borders, 0.3);
     
     /* FIXME - all those values should be inherited */
     background-image: none;
@@ -1245,7 +1257,7 @@ GtkComboBox .button *:hover {
 .scrollbar.slider,
 .scrollbar.button {
     background-color: @theme_base_color;
-    border-color: @button_border;
+    border-color: @borders;
 }
 
 .scrollbar.slider:hover {
@@ -1284,7 +1296,7 @@ GtkComboBox .button *:hover {
     color: @internal_element_insensitive;
 
     border-image: none;
-    border-color: @button_border;
+    border-color: @borders;
     border-width: 1;
 }
 
@@ -1292,7 +1304,7 @@ GtkComboBox .button *:hover {
 .scrollbar.button:window-unfocused,
 .scrollbar.button:insensitive:window-unfocused {
     background-color: @theme_unfocused_base_color;
-    border-color: @unfocused_borders_color;
+    border-color: @unfocused_borders;
 }
 
 .scrollbar.button:insensitive:window-unfocused {
@@ -1486,7 +1498,7 @@ GtkTreeMenu .menuitem * {
     border-radius: 5 5 0 0;
     border-image: none;
     border-width: 1 1 0 1;
-    border-color: shade(@button_border, 1.30);
+    border-color: shade(@borders, 1.30);
     border-style: solid;
 }
 
@@ -1570,7 +1582,7 @@ GtkCheckButton:selected:focus {
 
 .primary-toolbar .toolbar:window-unfocused,
 .primary-toolbar.toolbar:window-unfocused {
-    border-color: @unfocused_borders_color;
+    border-color: @unfocused_borders;
 }
 
 /* progressbars on primary toolbar entries are special */
@@ -1688,10 +1700,10 @@ GtkSwitch.slider {
     border-width: 1;
     border-radius: 2;
     border-style: solid;
-    border-color: mix (@button_border, @theme_text_color, 0.4);
+    border-color: mix (@borders, @theme_text_color, 0.4);
 
     /*box-shadow: 0 -1 inset alpha(@theme_base_color, 0.50);*/
-    box-shadow: 0 -1 inset alpha(white, 0.9), 0 1 inset @theme_base_color, 0 2 inset alpha(@button_border, 0.15);
+    box-shadow: 0 -1 inset alpha(white, 0.9), 0 1 inset @theme_base_color, 0 2 inset alpha(@borders, 0.15);
 
     padding: 2 2 3 2;
 
@@ -1719,7 +1731,7 @@ GtkSwitch.slider:window-unfocused {
     background-color: @theme_unfocused_base_color;
     background-image: none;
 
-    border-color: @unfocused_borders_color;
+    border-color: @unfocused_borders;
 
     box-shadow: none;
 
@@ -1780,8 +1792,8 @@ GtkTreeView.view {
 }
 
 .view:window-unfocused,
-GtkTreeView:window-unfocused, /* not working */
-GtkTreeView.view:window-unfocused /*not working*/ {
+GtkTreeView:window-unfocused,
+GtkTreeView.view:window-unfocused {
     background-color: @theme_unfocused_base_color;
     color: @theme_unfocused_text_color;
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 7e5af15..df5d869 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -29,11 +29,11 @@
 @define-color theme_unfocused_selected_bg_color darker(@theme_selected_bg_color);
 @define-color theme_unfocused_selected_fg_color @theme_selected_fg_color; /* FIXME */
 @define-color unfocused_button_background @theme_unfocused_bg_color;
- define-color unfocused_borders_color #a7aba7;
- define-color unfocused_insensitive_borders_color mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5);
+ define-color unfocused_borders @borders;
+ define-color unfocused_insensitive_borders_color mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
 @define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
 @define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
- define-color unfocused_toolbar mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5);
+ define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
 
 @define-color menu_bg_color shade (@theme_bg_color, 1.1);
 @define-color menu_fg_color @theme_fg_color;
@@ -78,7 +78,7 @@
 
 @define-color button_gradient_color_a #f4f6f4;
 @define-color button_gradient_color_b #d7dad7;
- define-color button_border #a7aba7;
+ define-color borders #a7aba7;
 
 @define-color button_active_gradient_color_a #a2a9a2;
 @define-color button_active_gradient_color_b shade (@button_active_gradient_color_a, 0.83);
@@ -138,7 +138,6 @@
 
 @define-color highlighted_border #8a8f8a;
 
- define-color notebook_border #a6a6a6;
 @define-color notebook_active_tab_border #1372d3;
 @define-color notebook_selected_tab_color #8dc0f3;
 
@@ -150,9 +149,6 @@
 @define-color toolbar_gradient_step2 #d9d9d7;
 @define-color toolbar_gradient_final #e5e5e2;
 
- define-color theme_unfocused_toolbar_color shade(@theme_unfocused_bg_color, 0.9);
- define-color theme_unfocused_border_color shade(@theme_unfocused_bg_color, 0.9);
-
 @define-color toolbar_border_top shade (@theme_bg_color, 0.56);
 @define-color toolbar_border_bottom shade (@theme_bg_color, 0.83);