[gtk+] Adwaita: inline toolbar buttons fixes

[Lapo Calamandrei <lapo src gnome org>]

commit cdf5ecada9518bdd97c25fcb58e475bb58b37d31
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Thu Aug 21 11:52:20 2014 +0200

    Adwaita: inline toolbar buttons fixes
    
    Properly styled single buttons in inline toolbars and fixed
    a superflous border chiming in in backdrop.

 gtk/resources/theme/Adwaita/_common.scss           |    9 ++++---
 gtk/resources/theme/Adwaita/gtk-contained-dark.css |   26 +++++++++++++++----
 gtk/resources/theme/Adwaita/gtk-contained.css      |   26 +++++++++++++++----
 3 files changed, 45 insertions(+), 16 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 1a273df..44428fc 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -496,15 +496,16 @@ $_dot_color: if($variant=='light', $selected_bg_color,
   &:backdrop:insensitive:active { @include button(backdrop-insensitive-active);}
   &:backdrop:insensitive:checked { @include button(backdrop-insensitive-active);}
 }
-.inline-toolbar.toolbar GtkToolButton { // .inline-toolbar.toolbar here for
-                                        // higher specificity than the previous
-                                        // "button look" selector
+.inline-toolbar.toolbar GtkToolButton,
+.inline-toolbar.toolbar GtkToolButton:backdrop { // .inline-toolbar.toolbar here for
+                                                 // higher specificity than the
+                                                 // previous "button look" selector
   & > .button.flat { @extend %linked_middle; }
   &:dir(rtl) > .button.flat { @extend %linked_middle:dir(rtl); }
   &:first-child > .button.flat { @extend %linked:first-child; }
   &:last-child > .button.flat { @extend %linked:last-child; }
   &:last-child:dir(rtl) > .button.flat { @extend %linked:last-child:dir(rtl); }
-  &:only-child > .button.flat { @extend %linked; }
+  &:only-child > .button.flat { @extend %linked:only-child; }
 }
 
 %linked_middle {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css 
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index a8c475c..251bb01 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -640,22 +640,36 @@
     background-image: linear-gradient(to bottom, #303434);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
 
-.inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .osd 
.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .osd 
.button:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked 
.button:hover, .linked .button:active, .linked .button:checked, .linked .button:backdrop, .inline-toolbar 
GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, 
GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry 
.button:backdrop, .linked > GtkComboBox > .button:dir(ltr) {
+.inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat,
+.inline-toolbar GtkToolButton:backdrop > .button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat, .osd .button, .osd .button:hover, .osd 
.button:active, .osd .button:checked, .osd .button:insensitive, .osd .button:backdrop, .inline-toolbar 
.button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:hover, .linked .button:active, 
.linked .button:checked, .linked .button:backdrop, GtkComboBox.combobox-entry .entry, 
GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > 
.button:dir(ltr) {
   border-radius: 0;
   border-left-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:dir(rtl) > 
.button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl), 
.inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), .inline-toolbar GtkToolButton:only-child > 
.button.flat:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry 
.button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) {
+  .inline-toolbar GtkToolButton > .button.flat:dir(rtl),
+  .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:dir(rtl) > 
.button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat,
+  .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
+  .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, .osd .button:dir(rtl), 
.inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), 
GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) {
     border-radius: 0;
     border-right-style: none;
     border-left-style: solid; }
 
-.osd .button:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar 
GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > 
.button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat:first-child, GtkComboBox.combobox-entry 
.entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > 
.button {
+.osd .button:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar 
GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat,
+.inline-toolbar GtkToolButton:backdrop:first-child > .button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat, GtkComboBox.combobox-entry 
.entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > 
.button {
   border-radius: 3px 0 0 3px;
   border-left-style: solid; }
-.osd .button:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar 
GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, 
.inline-toolbar GtkToolButton:only-child > .button.flat:last-child, GtkComboBox.combobox-entry 
.entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button {
+.osd .button:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar 
GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat,
+.inline-toolbar GtkToolButton:backdrop:last-child > .button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat, GtkComboBox.combobox-entry 
.entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button {
   border-radius: 0 3px 3px 0; }
-  .osd .button:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked 
.button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), 
.inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:only-child > 
.button.flat:last-child:dir(rtl), GtkComboBox.combobox-entry .entry:last-child:dir(rtl), 
GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) {
+  .osd .button:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked 
.button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl),
+  .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar 
GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child:dir(rtl) > .button.flat,
+  .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
+  .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, 
GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry 
.button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) {
     border-right-style: solid; }
-.osd .button:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar 
GtkToolButton:only-child > .button.flat:only-child, GtkComboBox.combobox-entry .entry:only-child, 
GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button {
+.osd .button:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar 
GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat,
+.inline-toolbar GtkToolButton:backdrop:only-child > .button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat, GtkComboBox.combobox-entry 
.entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button {
   border-radius: 3px;
   border-style: solid; }
 
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 6fccd29..8726da6 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -632,22 +632,36 @@
     background-image: linear-gradient(to bottom, #ededed);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
 
-.inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .osd 
.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .osd 
.button:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked 
.button:hover, .linked .button:active, .linked .button:checked, .linked .button:backdrop, .inline-toolbar 
GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, 
GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry 
.button:backdrop, .linked > GtkComboBox > .button:dir(ltr) {
+.inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat,
+.inline-toolbar GtkToolButton:backdrop > .button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat, .osd .button, .osd .button:hover, .osd 
.button:active, .osd .button:checked, .osd .button:insensitive, .osd .button:backdrop, .inline-toolbar 
.button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:hover, .linked .button:active, 
.linked .button:checked, .linked .button:backdrop, GtkComboBox.combobox-entry .entry, 
GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > 
.button:dir(ltr) {
   border-radius: 0;
   border-left-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:dir(rtl) > 
.button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl), 
.inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), .inline-toolbar GtkToolButton:only-child > 
.button.flat:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry 
.button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) {
+  .inline-toolbar GtkToolButton > .button.flat:dir(rtl),
+  .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:dir(rtl) > 
.button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat,
+  .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat,
+  .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, .osd .button:dir(rtl), 
.inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), 
GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) {
     border-radius: 0;
     border-right-style: none;
     border-left-style: solid; }
 
-.osd .button:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar 
GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > 
.button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat:first-child, GtkComboBox.combobox-entry 
.entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > 
.button {
+.osd .button:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar 
GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat,
+.inline-toolbar GtkToolButton:backdrop:first-child > .button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat, GtkComboBox.combobox-entry 
.entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > 
.button {
   border-radius: 3px 0 0 3px;
   border-left-style: solid; }
-.osd .button:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar 
GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, 
.inline-toolbar GtkToolButton:only-child > .button.flat:last-child, GtkComboBox.combobox-entry 
.entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button {
+.osd .button:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar 
GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat,
+.inline-toolbar GtkToolButton:backdrop:last-child > .button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat, GtkComboBox.combobox-entry 
.entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button {
   border-radius: 0 3px 3px 0; }
-  .osd .button:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked 
.button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), 
.inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:only-child > 
.button.flat:last-child:dir(rtl), GtkComboBox.combobox-entry .entry:last-child:dir(rtl), 
GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) {
+  .osd .button:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked 
.button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl),
+  .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar 
GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child:dir(rtl) > .button.flat,
+  .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat,
+  .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, 
GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry 
.button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) {
     border-right-style: solid; }
-.osd .button:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar 
GtkToolButton:only-child > .button.flat:only-child, GtkComboBox.combobox-entry .entry:only-child, 
GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button {
+.osd .button:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar 
GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat,
+.inline-toolbar GtkToolButton:backdrop:only-child > .button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat, GtkComboBox.combobox-entry 
.entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button {
   border-radius: 3px;
   border-style: solid; }