[gnome-themes-standard] Widget theme: tiny css cleanup.

[Lapo Calamandrei <lapo src gnome org>]

commit 312fecb00e07149e8ee480c56f66fbdc9e8b0a9b
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Dec 21 15:07:00 2011 +0100

    Widget theme: tiny css cleanup.

 themes/Adwaita/gtk-3.0/gtk-dark.css                |    6 +++---
 themes/Adwaita/gtk-3.0/gtk-widgets-assets.css      |    1 -
 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |    4 ++++
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   20 ++++++++++----------
 themes/Adwaita/gtk-3.0/gtk.css                     |    4 ++--
 5 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 77b55f1..f756a10 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -17,7 +17,7 @@
 @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 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_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
 @define-color unfocused_insensitive_fg_color mix(@insensitive_fg_color, @insensitive_bg_color, 0.3);
 @define-color unfocused_insensitive_bg_color @insensitive_bg_color;
 @define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @borders, 0.5);
@@ -56,7 +56,7 @@
 
 @define-color insensitive_fg_color #535555;
 @define-color insensitive_bg_color mix(@theme_bg_color, @theme_base_color, 0.6);
- define-color insensitive_border_color #535555;
+ define-color insensitive_borders #535555;
 
 @define-color inactive_frame_color shade (@theme_bg_color, 0.8);
 
@@ -124,7 +124,7 @@
 
 @define-color treeview_focus_border shade (@theme_selected_bg_color, 1.20);
 
- define-color scale_fill shade (@insensitive_border_color, 0.90);
+ define-color scale_fill shade (@insensitive_borders, 0.90);
 @define-color scale_border_a shade (@internal_element_color, 0.90);
 @define-color scale_border_b shade (@internal_element_color, 0.65);
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
index 8cfcf16..daedb0e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
@@ -187,7 +187,6 @@ GtkScale.slider.horizontal {
     background-image: url("assets/scale-slider-horizontal.svg");
 }
 
-
 GtkScale.slider:window-unfocused,
 GtkScale.slider.horizontal:window-unfocused {
     background-image: url("assets/scale-slider-horizontal-unfocused.svg");
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 8c38c73..f5a3965 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -86,6 +86,10 @@ column-header .button {
     border-color: shade (@highlighted_border, 0.75);
 }
 
+GtkScale.trough:insensitive:window-unfocused { /* not working */
+    background-color: transparent;
+}
+
 GtkSwitch.slider {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 41a5cee..eb94c8e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -77,7 +77,7 @@ GtkWindow:window-unfocused {
 *:insensitive {
     background-color: @insensitive_bg_color;
     color: @insensitive_fg_color;
-    border-color: @insensitive_border_color;
+    border-color: @insensitive_borders;
 }
 
 /*
@@ -158,7 +158,7 @@ GtkTreeView .separator,
 GtkTreeView .separator:window-unfocused,
 .separator:window-unfocused,
 .separator:hover:window-unfocused {
-    color: @unfocused_insensitive_borders_color;
+    color: @unfocused_insensitive_borders;
 }
 
 .pane-separator {
@@ -195,11 +195,11 @@ GtkTreeView .separator:window-unfocused,
  ****************/
 .entry {
     border-style: solid;
-    padding: 0;
 
     /* we use inner-border instead of padding because padding
      * also applies to the progressbar.
      */
+    padding: 0;
 
     -GtkEntry-inner-border: 5;
     -GtkEntry-progress-border: 0;
@@ -442,7 +442,7 @@ GtkScale.trough:window-unfocused {
 
 GtkScale.trough:insensitive {
     background-color: @insensitive_bg_color;
-    border-color: @insensitive_border_color;
+    border-color: @insensitive_borders;
     box-shadow: none;
     background-image: none;
 }
@@ -480,7 +480,7 @@ GtkScale.trough:window-unfocused {
 
 GtkScale.trough:insensitive:window-unfocused {
     background-color: @unfocused_insensitive_bg_color;
-    border-color: @unfocused_insensitive_borders_color;
+    border-color: @unfocused_insensitive_borders;
     box-shadow: none;
     background-image: none;
 }
@@ -673,7 +673,7 @@ GtkComboBox.combobox-entry .button {
 .primary-toolbar .raised.linked .button:insensitive:window-unfocused,
 .inline-toolbar.toolbar .button:insensitive:window-unfocused,
 .inline-toolbar.toolbar GtkToolButton .button:insensitive:window-unfocused {
-    box-shadow: -1 0 inset @unfocused_insensitive_borders_color;
+    box-shadow: -1 0 inset @unfocused_insensitive_borders;
 }
 
 .linked .button:insensitive:last-child:window-unfocused,
@@ -1008,7 +1008,7 @@ GtkLinkButton * {
 .notebook tab:window-unfocused {
     background-image: none;
     background-color: @theme_unfocused_bg_color;
-    border-color: @unfocused_insensitive_borders_color;
+    border-color: @unfocused_insensitive_borders;
 }
 
 .notebook tab:active {
@@ -1706,7 +1706,7 @@ GtkSwitch.trough:active {
 GtkSwitch.trough:insensitive {
     background-image: none;
     background-color: @insensitive_bg_color;
-    color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5);
+    color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5); /* FIXME */
 }
 
 GtkSwitch.trough:window-unfocused {
@@ -1718,7 +1718,7 @@ GtkSwitch.trough:active:window-unfocused {
 }
 
 GtkSwitch.trough:insensitive:window-unfocused {
-    color: @unfocused_insensitive_borders_color;
+    color: @unfocused_insensitive_borders;
 }
 
 GtkSwitch.slider {
@@ -1765,7 +1765,7 @@ GtkSwitch.slider:window-unfocused {
 
 GtkSwitch.slider:insensitive:window-unfocused {
     background-color: @theme_unfocused_bg_color;
-    border-color: @unfocused_insensitive_borders_color;
+    border-color: @unfocused_insensitive_borders;
 }
 
 GtkViewport,
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index df5d869..4ae82c4 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -98,7 +98,7 @@
 
 @define-color insensitive_bg_color #f4f4f2;
 @define-color insensitive_fg_color #a7aba7;
- define-color insensitive_border_color shade (@internal_element_color, 1.37);
+ define-color insensitive_borders shade (@internal_element_color, 1.37);
 
 @define-color trough_bg_color_a #bcbcb7;
 @define-color trough_bg_color_b #e0e0dd;
@@ -129,7 +129,7 @@
 @define-color internal_element_prelight @theme_text_color;
 @define-color internal_element_insensitive shade (@internal_element_color, 1.7);
 
- define-color scale_fill @insensitive_border_color;
+ define-color scale_fill @insensitive_borders;
 @define-color scale_border_a @internal_element_color;
 @define-color scale_border_b shade (@internal_element_color, 1.25);
 @define-color scale_progress_fill #2c85e2;