[gnome-themes-standard/wip/sass] let's not define same thing in two places



commit 9a5ec2a5fe7fb7d6be43461d6108c7b88d19ab3e
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed May 21 11:59:57 2014 +0200

    let's not define same thing in two places

 themes/Adwaita/gtk-3.0/_common.scss           |   12 +++++-------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   14 ++++++--------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   14 ++++++--------
 3 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 323d488..ecb67c2 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -260,13 +260,6 @@ GtkGrid:insensitive {
   }
 }
 
-/* GtkComboBoxes text color*/
-GtkComboBox {
-  &:insensitive { color: $insensitive_fg_color; }
-  &:backdrop { color: $insensitive_fg_color; }
-  &:backdrop:insensitive { color: transparentize($insensitive_fg_color,0.5); }
-}
-
 /* menu/popover buttons */
 .menuitem.button, {
   color: $theme_fg_color;
@@ -334,6 +327,11 @@ GtkComboBox {
 
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
+  
+  &:insensitive { color: $insensitive_fg_color; }
+  &:backdrop { color: $insensitive_fg_color; }
+  &:backdrop:insensitive { color: transparentize($insensitive_fg_color,0.5); }
+  
   .separator {
     /* always disable separators */
     -GtkWidget-wide-separators: true;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 924a93c..dbfd2f7 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -405,14 +405,6 @@ GtkGrid:insensitive {
       icon-shadow: none;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
 
-/* GtkComboBoxes text color*/
-GtkComboBox:insensitive {
-  color: white; }
-GtkComboBox:backdrop {
-  color: white; }
-GtkComboBox:backdrop:insensitive {
-  color: rgba(255, 255, 255, 0.5); }
-
 /* menu/popover buttons */
 .menuitem.button, .menuitem.button:active, .menuitem.button:insensitive, .menuitem.button:active:insensitive 
{
   color: #eeeeec;
@@ -460,6 +452,12 @@ GtkComboBox {
   padding: 0;
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none; }
+  GtkComboBox:insensitive {
+    color: white; }
+  GtkComboBox:backdrop {
+    color: white; }
+  GtkComboBox:backdrop:insensitive {
+    color: rgba(255, 255, 255, 0.5); }
   GtkComboBox .separator {
     /* always disable separators */
     -GtkWidget-wide-separators: true;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 9012d4a..7724f53 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -405,14 +405,6 @@ GtkGrid:insensitive {
       icon-shadow: none;
       box-shadow: 0 1px rgba(255, 255, 255, 0.05); }
 
-/* GtkComboBoxes text color*/
-GtkComboBox:insensitive {
-  color: #748489; }
-GtkComboBox:backdrop {
-  color: #748489; }
-GtkComboBox:backdrop:insensitive {
-  color: rgba(116, 132, 137, 0.5); }
-
 /* menu/popover buttons */
 .menuitem.button, .menuitem.button:active, .menuitem.button:insensitive, .menuitem.button:active:insensitive 
{
   color: #2e3436;
@@ -460,6 +452,12 @@ GtkComboBox {
   padding: 0;
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none; }
+  GtkComboBox:insensitive {
+    color: #748489; }
+  GtkComboBox:backdrop {
+    color: #748489; }
+  GtkComboBox:backdrop:insensitive {
+    color: rgba(116, 132, 137, 0.5); }
   GtkComboBox .separator {
     /* always disable separators */
     -GtkWidget-wide-separators: true;


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