[gnome-themes-standard] Widget theme: some more fixes...

[Lapo Calamandrei <lapo src gnome org>]

commit c46333674ecebb070a67bc302c8d17d231c1f242
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Jan 11 20:57:00 2012 +0100

    Widget theme: some more fixes...

 themes/Adwaita/gtk-3.0/gtk-dark.css                |    1 +
 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   38 ++++------
 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |   81 +++++++++++++-------
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   67 ++++++++--------
 themes/Adwaita/gtk-3.0/gtk.css                     |    1 +
 5 files changed, 104 insertions(+), 84 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 3159d16..2f37488 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -38,6 +38,7 @@
 @define-color button_gradient_color_c shade (@theme_bg_color, 0.8);
 @define-color borders #24282a;
 
+ define-color button_active_text @theme_selected_bg_color;
 @define-color button_active_text_shadow alpha(black, 0.45);
 @define-color button_text_shadow alpha(black, 0.7);
 @define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index e96a89c..ef4bd95 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -1,9 +1,9 @@
 /* Button background */
 .button,
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.primary-toolbar .button.raised:focus,
-.primary-toolbar .raised .button:focus,
+.toolbar .button.raised,
+.toolbar .raised .button,
+.toolbar .button.raised:focus,
+.toolbar .raised .button:focus,
 .primary-toolbar GtkComboBox .button,
 .primary-toolbar GtkComboBox .button:focus {
     background-image: -gtk-gradient (linear,
@@ -20,10 +20,10 @@
 .button:active:hover, 
 .toolbar .button:active,
 .toolbar .button:active:hover,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.primary-toolbar .button.raised:active:hover,
-.primary-toolbar .raised .button:active:hover,
+.toolbar .button.raised:active,
+.toolbar .raised .button:active,
+.toolbar .button.raised:active:hover,
+.toolbar .raised .button:active:hover,
 .trough,
 .trough.highlight,
 .trough row,
@@ -58,8 +58,8 @@
 /* Prelit button background */
 .button:hover,
 .toolbar .button:hover,
-.primary-toolbar .button.raised:hover,
-.primary-toolbar .raised .button:hover,
+.toolbar .button.raised:hover,
+.toolbar .raised .button:hover,
 .primary-toolbar GtkComboBox .button:hover {
     background-color: transparent;
     background-image: -gtk-gradient (linear,
@@ -106,14 +106,15 @@
 
 /* Unfocused window button background */
 .button:backdrop,
-.primary-toolbar .button.raised:backdrop,
-.primary-toolbar .raised .button:backdrop {
+.toolbar .button.raised:backdrop,
+.toolbar .raised .button:backdrop {
     background-image: none;
     background-color: @unfocused_button_background;
 }
 
 /* Unfocused window pushed button background */
-.button:active:backdrop {
+.button:active:backdrop,
+.primary-toolbar .button:active:backdrop {
     background-image: none;
     background-color: @unfocused_borders;
 }
@@ -149,8 +150,6 @@ GtkComboBox.combobox-entry .button:hover,
 GtkComboBox.combobox-entry .button:active,
 .spinbutton .button:active,
 .spinbutton .button:active:hover,
-/*.spinbutton .button:active:focus,
-.spinbutton .button:active:hover, */
 column-header.button:active,
 column-header .button:active,
 column-header.button:active:hover,
@@ -200,14 +199,7 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop {
 .primary-toolbar.toolbar,
 .inline-toolbar.toolbar  {
     background-color: transparent;
-/*   background-image: -gtk-gradient (linear,
-				     left top,
-				     left bottom,
-				     from (@toolbar_gradient_base),
-				     color-stop (0.16, @toolbar_gradient_step1),
-				     color-stop (0.90, @toolbar_gradient_step2),
-				     to (@toolbar_gradient_final));*/
-   background-image: -gtk-gradient (linear,
+    background-image: -gtk-gradient (linear,
 				     left top,
 				     left bottom,
 				     from (@toolbar_gradient_a),
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 80dd9b4..9e0fe45 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -1,22 +1,3 @@
-.entry:focus {
-    box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
-}
-
-.spinbutton .button:active,
-.spinbutton .button:active:focus {
-    box-shadow: 1 0 inset @inset_dark_color, 0 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 0 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 0 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), 0 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
-}
-
-.spinbutton .button:first-child:active,
-.spinbutton .button:first-child:active:focus {
-    box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 0 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), 0 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
-}
-
-.spinbutton .button:last-child:active,
-.spinbutton .button:last-child:active:focus {
-    box-shadow: 1 0 inset @inset_dark_color, 0 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 0 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
-}
-
 GtkIconView.view.cell:selected,
 GtkIconView.view.cell:selected:focus {
     background-color: alpha(@theme_base_color, 0.0);
@@ -40,18 +21,22 @@ GtkComboBox {
 }
 
 .button *:active,
-.button *:active:hover,
+/*.button *:active:hover,
 .button *:active:focus,
-.button *:active:hover:focus,
-GtkComboBox *:active,
+.button *:active:hover:focus, */
+GtkComboBox *:active /*,
 GtkComboBox *:active:hover,
 GtkComboBox *:active:focus,
-GtkComboBox *:active:hover:focus {
+GtkComboBox *:active:hover:focus*/ {
     text-shadow: @button_active_text_shadow 0 -1;
-    color: @theme_selected_bg_color; /* Not sure about this one */
+/*    color: @theme_selected_bg_color; /* Not sure about this one */
+}
+
+.button *:insensitive,
+.button *:active:insensitive {
+    text-shadow: none;
 }
 
-.button
 .button.raised,
 .raised .button,
 .inline-toolbar .button,
@@ -78,6 +63,11 @@ column-header .button {
     text-shadow: none;
 }
 
+
+.spinbutton .button {
+    icon-shadow: none;
+}
+
 .button .separator,
 .button .separator:prelight {
     color: alpha (@theme_text_color, 0.1);
@@ -95,7 +85,9 @@ GtkSwitch.slider {
 
     -adwaita-switch-grip-color: shade (@switch_slider_color, 0.9);
     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);
+    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);
 }
 
 .scrollbar.trough.vertical {
@@ -108,5 +100,40 @@ GtkSwitch.slider {
 
 .primary-toolbar .toolbar,
 .primary-toolbar.toolbar {
-    box-shadow: 0 3 inset alpha(black, 0.05), 0 2 inset alpha(black, 0.05), 0 1 inset alpha(black, 0.05);
+    box-shadow: 0 3 inset alpha(black, 0.05),
+                0 2 inset alpha(black, 0.05),
+                0 1 inset alpha(black, 0.05);
+}
+
+.entry:focus {
+    box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
+               -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
+               1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7),
+               -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
+}
+
+.spinbutton .button:active,
+.spinbutton .button:active:focus {
+    box-shadow: 1 0 inset @inset_dark_color,
+                0 2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
+                0 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 
+                0 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), 
+                0 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
+}
+
+.spinbutton .button:first-child:active,
+.spinbutton .button:first-child:active:focus {
+    box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 
+                0 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 
+                1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7), 
+                0 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
+}
+
+.spinbutton .button:last-child:active,
+.spinbutton .button:last-child:active:focus {
+    box-shadow: 1 0 inset @inset_dark_color, 
+                0 2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 
+                -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2), 
+                0 1 inset alpha(lighter(@theme_selected_bg_color), 0.7),
+                -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 5763a46..d255edd 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -512,7 +512,7 @@ GtkComboBox.combobox-entry .button {
 .button *:active:hover:focus,
 .button *:active:focus */ {
     text-shadow: @button_active_text_shadow 0 1;
-    color: darker(@theme_selected_bg_color); /* Not sure about this one */
+    color: @button_active_text; /* Not sure about this one */
 }
 
 .button *:insensitive {
@@ -553,8 +553,8 @@ GtkComboBox.combobox-entry .button {
     border-color: transparent;
 }
 
-.primary-toolbar .button.raised *,
-.primary-toolbar .raised .button *,
+.toolbar .button.raised *,
+.toolbar .raised .button *,
 .inline-toolbar .button * {
     icon-shadow: @button_text_shadow 0 1;
     text-shadow: @button_text_shadow 0 1;
@@ -590,8 +590,8 @@ GtkComboBox.combobox-entry .button {
     color: mix(@unfocused_insensitive_bg_color, @unfocused_dark_bg, 0.65); /* FIXME */
 }
 
-.primary-toolbar .button.raised *:insensitive:backdrop,
-.primary-toolbar .raised .button *:insensitive:backdrop {
+.toolbar .button.raised *:insensitive:backdrop,
+.toolbar .raised .button *:insensitive:backdrop {
     color: @unfocused_insensitive_fg_color;
 }
 
@@ -599,64 +599,64 @@ GtkComboBox.combobox-entry .button {
 
 /* Set up shadows and hilights for button visual separation */
 .linked .button,
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .raised.linked .button,
+.toolbar .button.raised.linked,
+.toolbar .raised.linked .button,
 .inline-toolbar.toolbar .button,
 .inline-toolbar.toolbar GtkToolButton .button {
     box-shadow: 1 0 inset @inset_light_color, -1 0 inset @inset_dark_color;
 }
 
 .linked .button:first-child,
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .raised.linked .button:first-child,
+.toolbar .button.raised.linked:first-child,
+.toolbar .raised.linked .button:first-child,
 .inline-toolbar.toolbar .button:first-child,
 .inline-toolbar.toolbar GtkToolButton:first-child .button {
     box-shadow: -1 0 inset @inset_dark_color;
 }
 
 .linked .button:last-child,
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .raised.linked .button:last-child,
+.toolbar .button.raised.linked:last-child,
+.toolbar .raised.linked .button:last-child,
 .inline-toolbar.toolbar .button:last-child,
 .inline-toolbar.toolbar GtkToolButton:last-child .button {
     box-shadow: 1 0 inset @inset_light_color;
 }
 
 .linked .button:active,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .raised.linked .button:active,
+.toolbar .button.raised.linked:active,
+.toolbar .raised.linked .button:active,
 .inline-toolbar.toolbar .button:active,
 .inline-toolbar.toolbar GtkToolButton .button:active {
     box-shadow: 1 0 inset @inset_dark_color;
 }
 
 .linked .button:insensitive,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button:insensitive,
+.toolbar .button.raised.linked:insensitive,
+.toolbar .raised.linked .button:insensitive,
 .inline-toolbar.toolbar .button:insensitive,
 .inline-toolbar.toolbar GtkToolButton .button:insensitive {
     box-shadow: -1 0 inset @inset_dark_color;
 }
 
 .linked .button:backdrop,
-.primary-toolbar .button.raised.linked:backdrop,
-.primary-toolbar .raised.linked .button:backdrop,
+.toolbar .button.raised.linked:backdrop,
+.toolbar .raised.linked .button:backdrop,
 .inline-toolbar.toolbar .button:backdrop,
 .inline-toolbar.toolbar GtkToolButton .button:backdrop {
     box-shadow: -1 0 inset @unfocused_borders;
 }
 
 .linked .button:insensitive:backdrop,
-.primary-toolbar .button.raised.linked:insensitive:backdrop,
-.primary-toolbar .raised.linked .button:insensitive:backdrop,
+.toolbar .button.raised.linked:insensitive:backdrop,
+.toolbar .raised.linked .button:insensitive:backdrop,
 .inline-toolbar.toolbar .button:insensitive:backdrop,
 .inline-toolbar.toolbar GtkToolButton .button:insensitive:backdrop {
     box-shadow: -1 0 inset @unfocused_insensitive_borders;
 }
 
 .linked .button:insensitive:last-child:backdrop,
-.primary-toolbar .button.raised.linked:insensitive:last-child:backdrop,
-.primary-toolbar .raised.linked .button:insensitive:last-child:backdrop,
+.toolbar .button.raised.linked:insensitive:last-child:backdrop,
+.toolbar .raised.linked .button:insensitive:last-child:backdrop,
 .inline-toolbar.toolbar .button:insensitive:last-child:backdrop,
 .inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive:backdrop {
     box-shadow: none;
@@ -670,27 +670,27 @@ GtkComboBox.combobox-entry .button {
 .inline-toolbar.toolbar GtkToolButton:only-child .button,
 .linked .button:backdrop:last-child,
 .linked .button:insensitive:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .raised.linked .button:insensitive:last-child,
+.toolbar .button.raised.linked:insensitive:last-child,
+.toolbar .raised.linked .button:insensitive:last-child,
 .inline-toolbar.toolbar .button:insensitive:last-child,
 .inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
-.primary-toolbar .button.raised.linked:backdrop:last-child,
-.primary-toolbar .raised.linked .button:backdrop:last-child,
+.toolbar .button.raised.linked:backdrop:last-child,
+.toolbar .raised.linked .button:backdrop:last-child,
 .inline-toolbar.toolbar .button:backdrop:last-child,
 .inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop,
 .linked .button:insensitive:backdrop:last-child,
-.primary-toolbar .button.raised.linked:insensitive:backdrop:last-child,
-.primary-toolbar .raised.linked .button:insensitive:backdrop:last-child,
+.toolbar .button.raised.linked:insensitive:backdrop:last-child,
+.toolbar .raised.linked .button:insensitive:backdrop:last-child,
 .inline-toolbar.toolbar .button:insensitive:backdrop:last-child,
 .inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive:backdrop,
 .linked .button:backdrop:only-child,
-.primary-toolbar .button.raised.linked:backdrop:only-child,
-.primary-toolbar .raised.linked .button:backdrop:only-child,
+.toolbar .button.raised.linked:backdrop:only-child,
+.toolbar .raised.linked .button:backdrop:only-child,
 .inline-toolbar.toolbar .button:backdrop:only-child,
 .inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop,
 .linked .button:backdrop:insensitive:only-child,
-.primary-toolbar .button.raised.linked:backdrop:insensitive:only-child,
-.primary-toolbar .raised.linked .button:backdrop:insensitive:only-child,
+.toolbar .button.raised.linked:backdrop:insensitive:only-child,
+.toolbar .raised.linked .button:backdrop:insensitive:only-child,
 .inline-toolbar.toolbar .button:backdrop:insensitive:only-child,
 .inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive:backdrop {
     box-shadow: none; 
@@ -1243,7 +1243,6 @@ GtkComboBox .button *:hover {
     box-shadow: -1 0 inset mix(@scrollbar_slider, @scrollbar_trough, 0.8);
 }
 
-
 .scrollbar.button.top:hover:backdrop,
 .scrollbar.button.bottom:hover:backdrop,
 .scrollbar.button.right:hover:backdrop,
@@ -1572,9 +1571,9 @@ GtkCheckButton:selected:focus {
  * Toolbars *
  ************/
 .toolbar {
-    border-style: solid;
+    border-style: none;
     border-color: darker (@theme_bg_color);
-    border-width: 1 0 1 0;
+/*    border-width: 1 0 1 0; */
     padding: 4;
 }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 3b42d93..7b1ef6f 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -84,6 +84,7 @@
 
 @define-color button_active_gradient_color_a #a2a9a2;
 @define-color button_active_gradient_color_b shade (@button_active_gradient_color_a, 0.83);
+ define-color button_active_text darker(@theme_selected_bg_color);
 @define-color button_active_text_shadow alpha(white, 0.3);
 @define-color button_text_shadow alpha(white, 0.4);
 @define-color primary_toolbar_button_text_shadow alpha(black, 0.1);