[gnome-themes-standard] fixed linked button specificity problem wrt backdrop state



commit 687b1627c760617a0dd8c7eeef0e6aba6538b585
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Thu May 22 13:01:54 2014 +0200

    fixed linked button specificity problem wrt backdrop state

 themes/Adwaita/gtk-3.0/_common.scss           |   10 ++++------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   20 +++++++++-----------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   20 +++++++++-----------
 3 files changed, 22 insertions(+), 28 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 0de8ef2..d6eceb8 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -307,22 +307,20 @@ GtkGrid:insensitive {
   }
 }
 
-.linked .button {
-  @extend .button;
-  padding: 6px;
+.linked .button, .linked .button:backdrop {
+//  padding: 6px;
   border-radius: 0;
   border-right-width: 0;
   &:first-child {
     border-radius: 3px 0 0 3px;
-    border-width: 1px 0 1px 1px;
   }
   &:last-child {
     border-radius: 0 3px 3px 0;
-    border-width: 1px;
+    border-right-width: 1px;
   }
   &:only-child {
     border-radius: 3px;
-    border-width: 1px;
+    border-right-width: 1px;
   }
 }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 16ce2de..50cc9e9 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -156,7 +156,7 @@ GtkGrid:insensitive {
 /***********
  * Buttons *
  ***********/
-.button, .linked .button, GtkComboBox .button,
+.button, GtkComboBox .button,
 .toolbar .button.raised,
 .toolbar .raised .button,
 .toolbar GtkComboBox .button,
@@ -432,19 +432,17 @@ GtkGrid:insensitive {
     border: none;
     box-shadow: none; }
 
-.linked .button {
-  padding: 6px;
+.linked .button, .linked .button:backdrop {
   border-radius: 0;
   border-right-width: 0; }
-  .linked .button:first-child {
-    border-radius: 3px 0 0 3px;
-    border-width: 1px 0 1px 1px; }
-  .linked .button:last-child {
+  .linked .button:first-child, .linked .button:backdrop:first-child {
+    border-radius: 3px 0 0 3px; }
+  .linked .button:last-child, .linked .button:backdrop:last-child {
     border-radius: 0 3px 3px 0;
-    border-width: 1px; }
-  .linked .button:only-child {
+    border-right-width: 1px; }
+  .linked .button:only-child, .linked .button:backdrop:only-child {
     border-radius: 3px;
-    border-width: 1px; }
+    border-right-width: 1px; }
 
 .header-bar .button.text-button {
   padding: 6px 8px 5px;
@@ -513,7 +511,7 @@ GtkComboBox {
     border-left: 0; }
   GtkComboBox.combobox-entry .button:last-child {
     border-radius: 0 3px 3px 0; }
-  GtkComboBox .linked .button, .linked GtkComboBox .button, GtkComboBox .button {
+  GtkComboBox .button {
     padding: 4px 6px; }
 
 /***************
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 7fb3fc2..cd479c3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -156,7 +156,7 @@ GtkGrid:insensitive {
 /***********
  * Buttons *
  ***********/
-.button, .linked .button, GtkComboBox .button,
+.button, GtkComboBox .button,
 .toolbar .button.raised,
 .toolbar .raised .button,
 .toolbar GtkComboBox .button,
@@ -432,19 +432,17 @@ GtkGrid:insensitive {
     border: none;
     box-shadow: none; }
 
-.linked .button {
-  padding: 6px;
+.linked .button, .linked .button:backdrop {
   border-radius: 0;
   border-right-width: 0; }
-  .linked .button:first-child {
-    border-radius: 3px 0 0 3px;
-    border-width: 1px 0 1px 1px; }
-  .linked .button:last-child {
+  .linked .button:first-child, .linked .button:backdrop:first-child {
+    border-radius: 3px 0 0 3px; }
+  .linked .button:last-child, .linked .button:backdrop:last-child {
     border-radius: 0 3px 3px 0;
-    border-width: 1px; }
-  .linked .button:only-child {
+    border-right-width: 1px; }
+  .linked .button:only-child, .linked .button:backdrop:only-child {
     border-radius: 3px;
-    border-width: 1px; }
+    border-right-width: 1px; }
 
 .header-bar .button.text-button {
   padding: 6px 8px 5px;
@@ -513,7 +511,7 @@ GtkComboBox {
     border-left: 0; }
   GtkComboBox.combobox-entry .button:last-child {
     border-radius: 0 3px 3px 0; }
-  GtkComboBox .linked .button, .linked GtkComboBox .button, GtkComboBox .button {
+  GtkComboBox .button {
     padding: 4px 6px; }
 
 /***************


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]