[gnome-themes-standard] make osd buttons always linked

[Jakub Steiner <jimmac src gnome org>]

commit 17beb8e5d6baee17ed1674d3d9bd9cb88fde0eb1
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri Jun 6 18:13:52 2014 +0200

    make osd buttons always linked

 themes/Adwaita/gtk-3.0/_common.scss           |   21 +++++++++++++++++----
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   12 ++++++------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   12 ++++++------
 3 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 1dad323..1f8b21e 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -227,10 +227,23 @@
     padding: 6px;
     border-width: 1px;
     @include button(osd);
-    &:hover { @include button(osd-hover); }
-    &:active { @include button(osd-active); }
-    &:insensitive { @include button(osd-insensitive); }
-    &:backdrop { @include button(osd-backdrop); }
+    @extend %linked_buttons;
+    &:hover {
+      @include button(osd-hover);
+      @extend %linked_buttons;
+    }
+    &:active {
+      @include button(osd-active); 
+      @extend %linked_buttons;
+    }
+    &:insensitive {
+      @include button(osd-insensitive);
+      @extend %linked_buttons;
+    }
+    &:backdrop {
+      @include button(osd-backdrop);
+      @extend %linked_buttons;
+    }
   }
   // Suggested and Destructive Action buttons
   @each $b_type, $b_color in (suggested-action, $selected_bg_color),
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 2eb65c8..4e0ea92 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -383,20 +383,20 @@
   .primary-toolbar .button {
     icon-shadow: none; }
 
-.inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:backdrop {
+.osd .button, .osd .button:hover, .osd .button:active, .osd .button:insensitive, .osd .button:backdrop, 
.inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:backdrop {
   border-radius: 0;
   border-left-style: none; }
-  .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl) {
+  .osd .button:dir(rtl), .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 {
+  .osd .button:first-child, .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 {
+  .osd .button:last-child, .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) {
+    .osd .button:last-child:dir(rtl), .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 {
+  .osd .button:only-child, .inline-toolbar .button:only-child, .linked .button:only-child {
     border-radius: 3px;
     border-style: solid; }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index d73f1d2..dca1288 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -383,20 +383,20 @@
   .primary-toolbar .button {
     icon-shadow: none; }
 
-.inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:backdrop {
+.osd .button, .osd .button:hover, .osd .button:active, .osd .button:insensitive, .osd .button:backdrop, 
.inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:backdrop {
   border-radius: 0;
   border-left-style: none; }
-  .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl) {
+  .osd .button:dir(rtl), .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 {
+  .osd .button:first-child, .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 {
+  .osd .button:last-child, .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) {
+    .osd .button:last-child:dir(rtl), .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 {
+  .osd .button:only-child, .inline-toolbar .button:only-child, .linked .button:only-child {
     border-radius: 3px;
     border-style: solid; }