[gnome-themes-standard] shadow stacking helper function fix - PROPERLY modified _shadow helper function to deal with 'none

[Jakub Steiner <jimmac src gnome org>]

commit 67e6b03b23f1fc278bb52b999d9acbe4efca8cba
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed May 28 00:56:12 2014 +0200

    shadow stacking helper function fix
      - PROPERLY modified _shadow helper function to deal with 'none'...

 themes/Adwaita/gtk-3.0/_common.scss           |    5 ++++-
 themes/Adwaita/gtk-3.0/_drawing.scss          |   17 ++++++++++++-----
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |    8 +++++++-
 themes/Adwaita/gtk-3.0/gtk-contained.css      |    8 +++++++-
 4 files changed, 30 insertions(+), 8 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index c3fa5ff..541b939 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -362,7 +362,10 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the GtkColorButton
       &.button.button.button:first-child { border-bottom-width: 0; }
       &.button.button.button:last-child { border-top-width: 0; }
     }
-    &.entry { border-radius: 0; }
+    &.entry {
+      @include entry(normal);
+      border-radius: 0;
+    }
   }
 }
 
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index a7697de..dd8fbc3 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -3,15 +3,22 @@
 // generic drawing of more complex things
 
 $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
-                                             //most widgets, FIXME 1px
+                                   //most widgets
 
 @mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
 //
 // Helper function to stack up to 4 box-shadows;
 //
-  @if $shadow2!=none {box-shadow: $shadow1, $shadow2;}
-  @else if $shadow3!=none {box-shadow: $shadow1, $shadow2, $shadow3;}
-  @else if $shadow4!=none {box-shadow: $shadow1, $shadow2, $shadow3, shadow4;}
+
+  @if $shadow2!=none {
+    @if $shadow3!=none {
+      @if $shadow4!=none {
+        box-shadow: $shadow1, $shadow2, $shadow3, $shadow4;
+      }
+      @else { box-shadow: $shadow1, $shadow2, $shadow3;}
+    }
+    @else { box-shadow: $shadow1, $shadow2; }
+  }
   @else { box-shadow: $shadow1; }
 }
 
@@ -35,7 +42,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
                                     $base_color 90%);
   $_entry_edge: $widget_edge;
   @if $noedge { $_entry_edge: none; }
-
+  
   @if $t==normal {
     border-color: $borders_color;
     @include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 3d205e4..0179330 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -126,7 +126,7 @@ GtkGrid:insensitive {
     border-width: 1px;
     background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
     border-color: #2a76c6;
-    box-shadow: inset 0 2px 2px -2px #191919, inset 0 0 2px 1px #314050; }
+    box-shadow: inset 0 2px 2px -2px #191919, inset 0 0 2px 1px #314050, 0 1px rgba(238, 238, 236, 0.1); }
   .entry:insensitive {
     background-color: transparent;
     border-style: solid;
@@ -519,6 +519,12 @@ GtkColorButton.button {
   .spinbutton.vertical .button.button.button.button:last-child {
     border-top-width: 0; }
   .spinbutton.vertical.entry {
+    background-color: transparent;
+    border-style: solid;
+    border-width: 1px;
+    background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
+    border-color: #1c1f1f;
+    box-shadow: inset 0 2px 2px -2px #191919, 0 1px rgba(238, 238, 236, 0.1);
     border-radius: 0; }
 
 /**************
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 20369cf..cad4305 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -126,7 +126,7 @@ GtkGrid:insensitive {
     border-width: 1px;
     background-image: linear-gradient(to bottom, #f7f7f7, white 90%);
     border-color: #4a90d9;
-    box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #dae8f7; }
+    box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #dae8f7, 0 1px white; }
   .entry:insensitive {
     background-color: transparent;
     border-style: solid;
@@ -519,6 +519,12 @@ GtkColorButton.button {
   .spinbutton.vertical .button.button.button.button:last-child {
     border-top-width: 0; }
   .spinbutton.vertical.entry {
+    background-color: transparent;
+    border-style: solid;
+    border-width: 1px;
+    background-image: linear-gradient(to bottom, #f7f7f7, white 90%);
+    border-color: #a1a1a1;
+    box-shadow: inset 0 2px 2px -2px #7f7f7f, 0 1px white;
     border-radius: 0; }
 
 /**************