[gnome-themes-standard] make some ifs more legible

[Jakub Steiner <jimmac src gnome org>]

commit 60e6974d860904f89c214985843a9e78d4ef8456
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue May 27 11:43:59 2014 +0200

    make some ifs more legible

 themes/Adwaita/gtk-3.0/_common.scss           |   17 +++++++----------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |    2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 1ed7e6e..32f2f74 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -161,8 +161,7 @@ GtkGrid:insensitive {
                                       $base_color 90%
                                       );
 
-  $_entry_shade: transparentize(black, 0.5);
-  @if $variant == 'dark' { $entry_shade: transparentize(black, 0.4); }
+  $_entry_shade: if($variant=='light', transparentize(black, 0.5), transparentize(black, 0.4));
 
   box-shadow: inset 0 2px 2px -2px $_entry_shade,
               0 1px $borders_edge; /* not working */
@@ -458,9 +457,8 @@ GtkComboBox {
   border-style: solid;
   border-color: $borders_color;
   border-radius: 7px 7px 0 0;
-
-  $_top_hilight: white; //FIXME?
-  @if $variant == 'dark' { $_top_hilight: transparentize(white,0.9); }
+  
+  $_top_hilight: if($variant=='light', white, transparentize(white,0.9));
 
   background-color: transparent;
   background-image: linear-gradient(to bottom,
@@ -679,11 +677,10 @@ GtkScrolledWindow.frame {
   border-radius: 7px 7px 0 0;
   /* lamefun trick to get rounded borders regardless of CSD use */
   border-width: 0px;
-  $_wm_border: transparentize(black, 0.8); // this needs to be transparent,
-                                           // see bug #722563
-  @if $variant == 'dark' {
-    $_wm_border: transparentize(black, 0.4);
-  }
+  
+  // this needs to be transparent
+  // see bug #722563
+  $_wm_border: if($variant=='light', transparentize(black, 0.8), transparentize(black, 0.4)); 
   box-shadow: 0 2px 10px 4px transparentize(black, 0.9),
               0 0 0 1px $_wm_border;
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 9511466..2569598 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -115,7 +115,7 @@ GtkGrid:insensitive {
   transition: all 200ms ease-out;
   border: 1px solid #1c1f1f;
   background-image: linear-gradient(to bottom, #2b2b2b 0%, #333333 90%);
-  box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.5), 0 1px rgba(238, 238, 236, 0.1);
+  box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1);
   /* not working */
   background-color: transparent; }
   .entry:insensitive {