[gnome-themes-standard] toolbars: adapt to GTK master changes for GtkToolbar

[Cosimo Cecchi <cosimoc src gnome org>]

commit ef530bd211b9a582623e8c9ef7729f1418638420
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Aug 7 17:13:44 2012 +0200

    toolbars: adapt to GTK master changes for GtkToolbar
    
    Since it now allocates the border-width, we have to compensate that
    in the paddings we set in the theme.

 themes/Adwaita/gtk-3.0/gnome-applications.css |    4 +++-
 themes/Adwaita/gtk-3.0/gtk-widgets.css        |   15 ++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index 5f3f7d9..fdda299 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -236,7 +236,9 @@ GtkIconView.documents-main-view.check:active {
                                     from(@documents_selection_toolbar_a),
                                     to(@documents_selection_toolbar_b));
     color: @theme_base_color;
-    border-width: 1px 0 0 0;
+
+    border-top-width: 1px;
+    padding-top: 2px;
     border-color: @documents_selection_toolbar_border;
     border-style: solid;
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index fbdc15c..746bafc 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -2002,7 +2002,7 @@ GtkCheckButton:selected:focus {
 .toolbar {
     border-style: none;
     border-color: darker (@theme_bg_color);
-    padding: 4px;
+    padding: 3px;
 }
 
 .toolbar .button {
@@ -2017,9 +2017,8 @@ GtkCheckButton:selected:focus {
  * Menubar Toolbars *
  ********************/
 .toolbar.menubar {
-    border-style: none;
-
     -GtkToolbar-button-relief: normal;
+
     padding-left: 4px;
     padding-right: 4px;
 }
@@ -2033,8 +2032,7 @@ GtkCheckButton:selected:focus {
  */
 .primary-toolbar .toolbar,
 .primary-toolbar.toolbar {
-    border-width: 1px 0 1px 0;
-    border-radius: 0;
+    border-width: 1px 0;
     border-style: solid;
     border-top-color: @toolbar_border_top;
     border-bottom-color: @toolbar_border_bottom;
@@ -2083,16 +2081,15 @@ GtkCheckButton:selected:focus {
 
 .inline-toolbar.toolbar {
     border-width: 1px;
-    border-radius: 0;
     border-style: solid;
 
     -GtkToolbar-button-relief: normal;
-
-    padding: 4px;
 }
 
 .inline-toolbar.toolbar:last-child {
-    border-width: 0 1px 1px 1px;
+    border-top-width: 0;
+    padding-top: 4px;
+
     border-radius: 0 0 3px 3px;
 }