[gnome-themes-standard] inline toolbar button fix - buttons on inline toolbars are always linked

[Jakub Steiner <jimmac src gnome org>]

commit ad2e7d70830e8d43ec920e92491acfd22a8aa55a
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri Jun 6 16:37:56 2014 +0200

    inline toolbar button fix
      - buttons on inline toolbars are always linked

 themes/Adwaita/gtk-3.0/_common.scss           |   50 ++++++++++++++-----------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   34 +++++++++--------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   34 +++++++++--------
 3 files changed, 64 insertions(+), 54 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 2e6c6cf..4e46639 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -249,28 +249,6 @@
     }
   }
 
-  // linked buttons
-  .linked &, .linked &:backdrop {
-    border-radius: 0;
-    border-left-style: none;
-    &:dir(rtl) {
-      border-right-style: none;
-      border-left-style: solid
-    };
-    &:first-child {
-      border-radius: 3px 0 0 3px;
-      border-left-style: solid;
-    }
-    &:last-child {
-      border-radius: 0 3px 3px 0;
-      &:dir(rtl) { border-right-style: solid; }
-    }
-    &:only-child {
-      border-radius: 3px;
-      border-style: solid;
-    }
-  }
-
   // headerbar buttons
   .header-bar & {
     &.text-button {
@@ -286,11 +264,38 @@
   .inline-toolbar & {
     border-radius: 2px;
     border-width: 1px;
+    @extend %linked_buttons;
   }
   
   .primary-toolbar & { icon-shadow: none; } // tango icons don't need added shadows
+  .linked &, .linked &:backdrop {
+    @extend %linked_buttons;
+  }
 }
 
+%linked_buttons {
+  border-radius: 0;
+  border-left-style: none;
+  &:dir(rtl) {
+    border-right-style: none;
+    border-left-style: solid
+  };
+  &:first-child {
+    border-radius: 3px 0 0 3px;
+    border-left-style: solid;
+  }
+  &:last-child {
+    border-radius: 0 3px 3px 0;
+    &:dir(rtl) { border-right-style: solid; }
+  }
+  &:only-child {
+    border-radius: 3px;
+    border-style: solid;
+  }
+}
+
+
+
 /* menu buttons */
 .menuitem.button {
   color: $fg_color;
@@ -1298,6 +1303,7 @@ GtkMessageDialog {
 
 .dialog-action-area.linked {
   & .button {
+    padding: 6px;
     border-radius: 0;
     @include button(normal, $noedge: true);
     @extend %middle_button;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 1515091..e3f4689 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -365,22 +365,6 @@
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-  .linked .button, .linked .button:backdrop {
-    border-radius: 0;
-    border-left-style: none; }
-    .linked .button:dir(rtl), .linked .button:backdrop:dir(rtl) {
-      border-right-style: none;
-      border-left-style: solid; }
-    .linked .button:first-child, .linked .button:backdrop:first-child {
-      border-radius: 3px 0 0 3px;
-      border-left-style: solid; }
-    .linked .button:last-child, .linked .button:backdrop:last-child {
-      border-radius: 0 3px 3px 0; }
-      .linked .button:last-child:dir(rtl), .linked .button:backdrop:last-child:dir(rtl) {
-        border-right-style: solid; }
-    .linked .button:only-child, .linked .button:backdrop:only-child {
-      border-radius: 3px;
-      border-style: solid; }
   .header-bar .button.text-button {
     padding: 6px 8px 5px; }
   .header-bar .button.image-button {
@@ -391,6 +375,23 @@
   .primary-toolbar .button {
     icon-shadow: none; }
 
+.inline-toolbar .button, .linked .button, .linked .button:backdrop {
+  border-radius: 0;
+  border-left-style: none; }
+  .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl) {
+    border-right-style: none;
+    border-left-style: solid; }
+  .inline-toolbar .button:first-child, .linked .button:first-child {
+    border-radius: 3px 0 0 3px;
+    border-left-style: solid; }
+  .inline-toolbar .button:last-child, .linked .button:last-child {
+    border-radius: 0 3px 3px 0; }
+    .inline-toolbar .button:last-child:dir(rtl), .linked .button:last-child:dir(rtl) {
+      border-right-style: solid; }
+  .inline-toolbar .button:only-child, .linked .button:only-child {
+    border-radius: 3px;
+    border-style: solid; }
+
 /* menu buttons */
 .menuitem.button, .menuitem.button:insensitive, .menuitem.button:active:insensitive {
   color: #eeeeec;
@@ -1472,6 +1473,7 @@ GtkMessageDialog {
   -GtkDialog-action-area-border: 0; }
 
 .dialog-action-area.linked .button {
+  padding: 6px;
   border-radius: 0;
   border-width: 1px;
   border-style: solid;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 48f3948..46e33d5 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -365,22 +365,6 @@
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-  .linked .button, .linked .button:backdrop {
-    border-radius: 0;
-    border-left-style: none; }
-    .linked .button:dir(rtl), .linked .button:backdrop:dir(rtl) {
-      border-right-style: none;
-      border-left-style: solid; }
-    .linked .button:first-child, .linked .button:backdrop:first-child {
-      border-radius: 3px 0 0 3px;
-      border-left-style: solid; }
-    .linked .button:last-child, .linked .button:backdrop:last-child {
-      border-radius: 0 3px 3px 0; }
-      .linked .button:last-child:dir(rtl), .linked .button:backdrop:last-child:dir(rtl) {
-        border-right-style: solid; }
-    .linked .button:only-child, .linked .button:backdrop:only-child {
-      border-radius: 3px;
-      border-style: solid; }
   .header-bar .button.text-button {
     padding: 6px 8px 5px; }
   .header-bar .button.image-button {
@@ -391,6 +375,23 @@
   .primary-toolbar .button {
     icon-shadow: none; }
 
+.inline-toolbar .button, .linked .button, .linked .button:backdrop {
+  border-radius: 0;
+  border-left-style: none; }
+  .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl) {
+    border-right-style: none;
+    border-left-style: solid; }
+  .inline-toolbar .button:first-child, .linked .button:first-child {
+    border-radius: 3px 0 0 3px;
+    border-left-style: solid; }
+  .inline-toolbar .button:last-child, .linked .button:last-child {
+    border-radius: 0 3px 3px 0; }
+    .inline-toolbar .button:last-child:dir(rtl), .linked .button:last-child:dir(rtl) {
+      border-right-style: solid; }
+  .inline-toolbar .button:only-child, .linked .button:only-child {
+    border-radius: 3px;
+    border-style: solid; }
+
 /* menu buttons */
 .menuitem.button, .menuitem.button:insensitive, .menuitem.button:active:insensitive {
   color: #2e3436;
@@ -1472,6 +1473,7 @@ GtkMessageDialog {
   -GtkDialog-action-area-border: 0; }
 
 .dialog-action-area.linked .button {
+  padding: 6px;
   border-radius: 0;
   border-width: 1px;
   border-style: solid;