[gnome-themes-standard/parser: 11/19] toolbars: more primary toolbar cleanups

[Cosimo Cecchi <cosimoc src gnome org>]

commit 609eeeb5334ea357dac4b739122e169221e2c54b
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon May 16 19:40:24 2011 -0400

    toolbars: more primary toolbar cleanups

 themes/Adwaita/gtk-3.0/gtk-widgets.css |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 9e77232..e5b0e5a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -23,7 +23,6 @@
 
     -GtkToolItemGroup-expander-size: 12;
     -GtkExpander-expander-size: 12;
-    -GtkToolbar-internal-padding: 4;     /* ??? */
 
     -GtkMenu-horizontal-padding: 0;
     -GtkMenu-vertical-padding: 0;
@@ -733,11 +732,13 @@ GtkComboBox .button:prelight {
 /* primary toolbar buttons */
 .primary-toolbar.toolbar .button {
     border-style: none;
-    border-width: 1;
     border-radius: 4;
+
     background-image: none;
     background-color: alpha (@theme_base_color, 0.0);
 
+    padding: 2;
+
     -adwaita-focus-border-radius: 3;
     -adwaita-focus-fill-color: alpha (@theme_base_color, 0.20);
     -adwaita-focus-border-gradient: -gtk-gradient (linear,
@@ -748,7 +749,6 @@ GtkComboBox .button:prelight {
 
 .primary-toolbar.toolbar .button:insensitive {
     border-style: none;
-    border-width: 0;
 
     color: @insensitive_fg_color;
 
@@ -758,7 +758,6 @@ GtkComboBox .button:prelight {
 }
 
 .primary-toolbar.toolbar .button:hover {
-    border-style: none;
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
 				     from (alpha (@theme_base_color, 0.0)),
@@ -773,28 +772,27 @@ GtkComboBox .button:prelight {
                                              from (shade (@toolbar_active_button_color, 0.8)),
                                              to (shade (@toolbar_active_button_color, 1.4)));
 
+    color: @theme_fg_color;
+
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
 				     from (shade (@toolbar_gradient_base, 0.95)),
 			             to (alpha (shade (@toolbar_gradient_base, 0.85), 0.0)));
-    
-    color: @theme_fg_color;
 }
 
 .primary-toolbar.toolbar .button:active:hover {
-    border-style: solid;
+    color: @theme_base_color;
+
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
 				     from (alpha (shade (@toolbar_gradient_base, 0.96), 0.7)),
 			             to (alpha (shade (@toolbar_gradient_base, 1.14), 0.0)));
-
-    color: @theme_base_color;
 }
 
 .primary-toolbar.toolbar .button:active:insensitive {
     border-color: @insensitive_border_color;
-
     -adwaita-border-gradient: none;
+
     background-image: none;
 }
 
@@ -826,13 +824,10 @@ GtkComboBox .button:prelight {
 }
 
 .primary-toolbar.toolbar .raised .button:hover {
-    border-color: @button_border;
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
 				     from (@button_hover_gradient_color_a),
 				     to (@button_hover_gradient_color_b));
-    border-width: 1;
-    border-style: solid;
 }
 
 .primary-toolbar.toolbar .raised .button:hover:active,
@@ -851,7 +846,6 @@ GtkComboBox .button:prelight {
 .primary-toolbar.toolbar .raised .button:insensitive:active {
     border-style: solid;
     border-width: 1;
-    background-image: none;
 }
 
 /* progressbars on primary toolbar entries are special */