[gnome-themes-standard/wip/sass] slightly more legible syntax

[Jakub Steiner <jimmac src gnome org>]

commit a5cb30fc35e00bac4b1f359a30fd6f85a03c320a
Author: Jakub Steiner <jimmac gmail com>
Date:   Fri May 16 18:01:47 2014 +0200

    slightly more legible syntax

 themes/Adwaita/gtk-3.0/_drawing.scss          |    5 +-
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |  120 +++++++++++++++++++++----
 2 files changed, 104 insertions(+), 21 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index 799d678..8010df0 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -9,9 +9,8 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
 
 @mixin button_box_shadow($shadow1, $shadow2:false) {
   //needed to stack box shadows
-  $var: $shadow1;
-  @if $shadow2 {$var: $shadow1, $shadow2;}
-  box-shadow: $var;
+  @if $shadow2 {box-shadow: $shadow1, $shadow2;}
+  @else { box-shadow: $shadow1; }
 }
 
 @mixin button_normal ($c) {
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 20d4d7c..81f7548 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -165,6 +165,7 @@ GtkGrid:insensitive {
   padding: 2px 4px;
   background-color: transparent;
   border: 1px solid #212424;
+  background-color: #393f3f;
   background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
   /* Suggested and Destructive Action buttons */ }
@@ -174,6 +175,9 @@ GtkGrid:insensitive {
   .toolbar GtkComboBox .button:hover,
   .spinbutton.vertical .button:hover {
     border: 1px solid #212424;
+    background-color: #393f3f;
+    background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
     background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f); }
   .button:active,
   .toolbar .button.raised:active,
@@ -181,15 +185,22 @@ GtkGrid:insensitive {
   .toolbar GtkComboBox .button:active,
   .spinbutton.vertical .button:active {
     border: 1px solid #212424;
-    background-image: linear-gradient(to bottom, #090909, #151717 5%, #212424);
-    box-shadow: inset 0 1px 2px black; }
+    background-color: #393f3f;
+    background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2), 0 1px rgba(238, 238, 236, 0.1);
+    background-image: linear-gradient(to bottom, #090909, #151717 5%, #212424); }
   .button:backdrop,
   .toolbar .button.raised:backdrop,
   .toolbar .raised .button:backdrop,
   .toolbar GtkComboBox .button:backdrop,
   .spinbutton.vertical .button:backdrop {
     border: 1px solid #212424;
-    background-image: linear-gradient(to bottom, #393f3f);
+    background-color: #393f3f;
+    background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+    background-image: none;
+    box-shadow: none;
     color: white; }
     .button:backdrop:active,
     .toolbar .button.raised:backdrop:active,
@@ -197,7 +208,11 @@ GtkGrid:insensitive {
     .toolbar GtkComboBox .button:backdrop:active,
     .spinbutton.vertical .button:backdrop:active {
       border: 1px solid #090909;
-      background-image: linear-gradient(to bottom, #212424);
+      background-color: #212424;
+      background-image: linear-gradient(to bottom, #393f3f, #212424 40%, #090909);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+      background-image: none;
+      box-shadow: none;
       box-shadow: none;
       border: 1px solid black;
       color: #eeeeec; }
@@ -207,20 +222,44 @@ GtkGrid:insensitive {
   .toolbar GtkComboBox .button:insensitive,
   .spinbutton.vertical .button:insensitive {
     border: 1px solid #212424;
-    background-image: linear-gradient(to bottom, rgba(57, 63, 63, 0.5)); }
+    background-color: #393f3f;
+    background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+    box-shadow: 0 1px rgba(238, 238, 236, 0.1);
+    background-color: rgba(57, 63, 63, 0.5);
+    background-image: none; }
+    .button:insensitive:active,
+    .toolbar .button.raised:insensitive:active,
+    .toolbar .raised .button:insensitive:active,
+    .toolbar GtkComboBox .button:insensitive:active,
+    .spinbutton.vertical .button:insensitive:active {
+      border: 1px solid #212424;
+      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+      box-shadow: 0 1px rgba(238, 238, 236, 0.1);
+      background-color: rgba(57, 63, 63, 0.5);
+      background-image: none;
+      box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2), 0 1px rgba(238, 238, 236, 0.1); }
   .button:backdrop:insensitive,
   .toolbar .button.raised:backdrop:insensitive,
   .toolbar .raised .button:backdrop:insensitive,
   .toolbar GtkComboBox .button:backdrop:insensitive,
   .spinbutton.vertical .button:backdrop:insensitive {
     border: 1px solid rgba(33, 36, 36, 0.5);
-    background-image: linear-gradient(to bottom, rgba(57, 63, 63, 0)); }
+    background-color: rgba(57, 63, 63, 0.5);
+    background-image: linear-gradient(to bottom, rgba(81, 90, 90, 0.5), rgba(57, 63, 63, 0.5) 40%, rgba(33, 
36, 36, 0.5));
+    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+    box-shadow: 0 1px rgba(238, 238, 236, 0.1);
+    background-color: rgba(57, 63, 63, 0);
+    background-image: none; }
   .button.suggested-action,
   .toolbar .button.raised.suggested-action,
   .toolbar .raised .button.suggested-action,
   .toolbar GtkComboBox .suggested-action.button,
   .spinbutton.vertical .button.suggested-action {
     border: 1px solid #215d9c;
+    background-color: #2a76c6;
     background-image: linear-gradient(to bottom, #4a90d9, #2a76c6 40%, #215d9c);
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
     color: #333333; }
@@ -234,14 +273,20 @@ GtkGrid:insensitive {
     .spinbutton.vertical .button.suggested-action:active,
     .spinbutton.vertical .button.suggested-action:hover:active {
       border: 1px solid #215d9c;
-      background-image: linear-gradient(to bottom, #184472, #1c5187 5%, #215d9c);
-      box-shadow: inset 0 1px 2px #0f2b48; }
+      background-color: #2a76c6;
+      background-image: linear-gradient(to bottom, #4a90d9, #2a76c6 40%, #215d9c);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+      box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2), 0 1px rgba(238, 238, 236, 0.1);
+      background-image: linear-gradient(to bottom, #184472, #1c5187 5%, #215d9c); }
     .button.suggested-action:hover,
     .toolbar .button.raised.suggested-action:hover,
     .toolbar .raised .button.suggested-action:hover,
     .toolbar GtkComboBox .suggested-action.button:hover,
     .spinbutton.vertical .button.suggested-action:hover {
       border: 1px solid #215d9c;
+      background-color: #2a76c6;
+      background-image: linear-gradient(to bottom, #4a90d9, #2a76c6 40%, #215d9c);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
       background-image: linear-gradient(to bottom, #5b9add, #3180d4 40%, #2a76c6); }
     .button.suggested-action:backdrop,
     .toolbar .button.raised.suggested-action:backdrop,
@@ -249,7 +294,11 @@ GtkGrid:insensitive {
     .toolbar GtkComboBox .suggested-action.button:backdrop,
     .spinbutton.vertical .button.suggested-action:backdrop {
       border: 1px solid #215d9c;
-      background-image: linear-gradient(to bottom, #2a76c6); }
+      background-color: #2a76c6;
+      background-image: linear-gradient(to bottom, #4a90d9, #2a76c6 40%, #215d9c);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+      background-image: none;
+      box-shadow: none; }
     .button.suggested-action:insensitive,
     .toolbar .button.raised.suggested-action:insensitive,
     .toolbar .raised .button.suggested-action:insensitive,
@@ -257,14 +306,24 @@ GtkGrid:insensitive {
     .spinbutton.vertical .button.suggested-action:insensitive {
       color: white;
       border: 1px solid #212424;
-      background-image: linear-gradient(to bottom, rgba(57, 63, 63, 0.5)); }
+      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+      box-shadow: 0 1px rgba(238, 238, 236, 0.1);
+      background-color: rgba(57, 63, 63, 0.5);
+      background-image: none; }
       .button.suggested-action:insensitive:backdrop,
       .toolbar .button.raised.suggested-action:insensitive:backdrop,
       .toolbar .raised .button.suggested-action:insensitive:backdrop,
       .toolbar GtkComboBox .suggested-action.button:insensitive:backdrop,
       .spinbutton.vertical .button.suggested-action:insensitive:backdrop {
         border: 1px solid rgba(33, 36, 36, 0.5);
-        background-image: linear-gradient(to bottom, rgba(57, 63, 63, 0)); }
+        background-color: rgba(57, 63, 63, 0.5);
+        background-image: linear-gradient(to bottom, rgba(81, 90, 90, 0.5), rgba(57, 63, 63, 0.5) 40%, 
rgba(33, 36, 36, 0.5));
+        box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+        box-shadow: 0 1px rgba(238, 238, 236, 0.1);
+        background-color: rgba(57, 63, 63, 0);
+        background-image: none; }
     .button.suggested-action GtkLabel:backdrop:insensitive,
     .toolbar .button.raised.suggested-action GtkLabel:backdrop:insensitive,
     .toolbar .raised .button.suggested-action GtkLabel:backdrop:insensitive,
@@ -277,6 +336,7 @@ GtkGrid:insensitive {
   .toolbar GtkComboBox .destructive-action.button,
   .spinbutton.vertical .button.destructive-action {
     border: 1px solid #a60c0c;
+    background-color: #d51010;
     background-image: linear-gradient(to bottom, #ef2929, #d51010 40%, #a60c0c);
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
     color: #333333; }
@@ -290,14 +350,20 @@ GtkGrid:insensitive {
     .spinbutton.vertical .button.destructive-action:active,
     .spinbutton.vertical .button.destructive-action:hover:active {
       border: 1px solid #a60c0c;
-      background-image: linear-gradient(to bottom, #760909, #8e0b0b 5%, #a60c0c);
-      box-shadow: inset 0 1px 2px #470505; }
+      background-color: #d51010;
+      background-image: linear-gradient(to bottom, #ef2929, #d51010 40%, #a60c0c);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+      box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2), 0 1px rgba(238, 238, 236, 0.1);
+      background-image: linear-gradient(to bottom, #760909, #8e0b0b 5%, #a60c0c); }
     .button.destructive-action:hover,
     .toolbar .button.raised.destructive-action:hover,
     .toolbar .raised .button.destructive-action:hover,
     .toolbar GtkComboBox .destructive-action.button:hover,
     .spinbutton.vertical .button.destructive-action:hover {
       border: 1px solid #a60c0c;
+      background-color: #d51010;
+      background-image: linear-gradient(to bottom, #ef2929, #d51010 40%, #a60c0c);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
       background-image: linear-gradient(to bottom, #f03c3c, #e81111 40%, #d51010); }
     .button.destructive-action:backdrop,
     .toolbar .button.raised.destructive-action:backdrop,
@@ -305,7 +371,11 @@ GtkGrid:insensitive {
     .toolbar GtkComboBox .destructive-action.button:backdrop,
     .spinbutton.vertical .button.destructive-action:backdrop {
       border: 1px solid #a60c0c;
-      background-image: linear-gradient(to bottom, #d51010); }
+      background-color: #d51010;
+      background-image: linear-gradient(to bottom, #ef2929, #d51010 40%, #a60c0c);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+      background-image: none;
+      box-shadow: none; }
     .button.destructive-action:insensitive,
     .toolbar .button.raised.destructive-action:insensitive,
     .toolbar .raised .button.destructive-action:insensitive,
@@ -313,14 +383,24 @@ GtkGrid:insensitive {
     .spinbutton.vertical .button.destructive-action:insensitive {
       color: white;
       border: 1px solid #212424;
-      background-image: linear-gradient(to bottom, rgba(57, 63, 63, 0.5)); }
+      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+      box-shadow: 0 1px rgba(238, 238, 236, 0.1);
+      background-color: rgba(57, 63, 63, 0.5);
+      background-image: none; }
       .button.destructive-action:insensitive:backdrop,
       .toolbar .button.raised.destructive-action:insensitive:backdrop,
       .toolbar .raised .button.destructive-action:insensitive:backdrop,
       .toolbar GtkComboBox .destructive-action.button:insensitive:backdrop,
       .spinbutton.vertical .button.destructive-action:insensitive:backdrop {
         border: 1px solid rgba(33, 36, 36, 0.5);
-        background-image: linear-gradient(to bottom, rgba(57, 63, 63, 0)); }
+        background-color: rgba(57, 63, 63, 0.5);
+        background-image: linear-gradient(to bottom, rgba(81, 90, 90, 0.5), rgba(57, 63, 63, 0.5) 40%, 
rgba(33, 36, 36, 0.5));
+        box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+        box-shadow: 0 1px rgba(238, 238, 236, 0.1);
+        background-color: rgba(57, 63, 63, 0);
+        background-image: none; }
     .button.destructive-action GtkLabel:backdrop:insensitive,
     .toolbar .button.raised.destructive-action GtkLabel:backdrop:insensitive,
     .toolbar .raised .button.destructive-action GtkLabel:backdrop:insensitive,
@@ -354,13 +434,17 @@ GtkGrid:insensitive {
   .button.titlebutton:hover {
     padding: 8px;
     border: 1px solid #212424;
+    background-color: #393f3f;
     background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
   .button.titlebutton:active {
     padding: 8px;
     border: 1px solid #212424;
-    background-image: linear-gradient(to bottom, #090909, #151717 5%, #212424);
-    box-shadow: inset 0 1px 2px black; }
+    background-color: #393f3f;
+    background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2), 0 1px rgba(238, 238, 236, 0.1);
+    background-image: linear-gradient(to bottom, #090909, #151717 5%, #212424); }
 
 .linked .button {
   padding: 6px;