[gnome-themes-standard] fixed box-shadow on insensitive buttons, fixed missing text/icon shadow on combos

[Jakub Steiner <jimmac src gnome org>]

commit cd295981e1d15a1f8c233b07e03c699d17c4b520
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed May 21 16:15:04 2014 +0200

    fixed box-shadow on insensitive buttons, fixed missing text/icon shadow on combos

 themes/Adwaita/gtk-3.0/_common.scss           |   21 +++++++++----
 themes/Adwaita/gtk-3.0/_drawing.scss          |    5 +--
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   16 ++++++----
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   40 +++++++++++++-----------
 4 files changed, 49 insertions(+), 33 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 31e291d..c6dc0ab 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -180,9 +180,6 @@ GtkGrid:insensitive {
     background-image: none;
     box-shadow: none; /* let's make it flat */
   }
-  GtkLabel { // what's this?
-    text-shadow: 0 1px red;
-  }  
 }
 
 .linked .entry {
@@ -356,9 +353,21 @@ 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); }
+  @include _button_text_shadow;
+
+  &:insensitive { 
+    color: $_insensitive_fg_color;
+    text-shadow: none;
+    icon-shadow: none;
+  }
+  &:backdrop { 
+    color: $_insensitive_fg_color; 
+    text-shadow: none;
+    icon-shadow: none;
+  }
+  &:backdrop:insensitive { 
+    color: transparentize($_insensitive_fg_color,0.5); 
+  }
   
   .separator {
     /* always disable separators */
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index 45917a2..f5db690 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -32,7 +32,7 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
 //
 
   $_dark: transparentize(black,0.8);
-  $_bright: transparentize(white,0.4);
+  $_bright: transparentize(white,0.2);
 
   @if lightness($tc) < 50% {
     text-shadow: 0 1px $_bright;
@@ -144,8 +144,7 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
   //
     color: $_insensitive_fg_color;
     border-color: $_insensitive_borders_color;
-    @include _button_box_shadow(none,
-                                $widget_bottom_hilight);
+    @include _button_box_shadow($widget_bottom_hilight);
     background-image: linear-gradient(to bottom, transparentize($_backdrop_borders_color,.9));
   }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 78b9f7c..385efd1 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -133,8 +133,6 @@ GtkGrid:insensitive {
     background-image: none;
     box-shadow: none;
     /* let's make it flat */ }
-  .entry GtkLabel, .linked .entry GtkLabel {
-    text-shadow: 0 1px red; }
 
 .linked .entry:first-child {
   border-top-right-radius: 0;
@@ -255,7 +253,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: white;
       border-color: #1c1f1f;
-      box-shadow: none, 0 1px rgba(238, 238, 236, 0.1);
+      box-shadow: 0 1px rgba(238, 238, 236, 0.1);
       background-image: linear-gradient(to bottom, rgba(28, 31, 31, 0.1)); }
   .button.suggested-action,
   .toolbar .button.raised.suggested-action,
@@ -479,11 +477,17 @@ GtkGrid:insensitive {
 GtkComboBox {
   padding: 0;
   -GtkComboBox-arrow-scaling: 0.5;
-  -GtkComboBox-shadow-type: none; }
+  -GtkComboBox-shadow-type: none;
+  text-shadow: 0 -1px rgba(0, 0, 0, 0.2);
+  icon-shadow: 0 -1px rgba(0, 0, 0, 0.2); }
   GtkComboBox:insensitive {
-    color: white; }
+    color: white;
+    text-shadow: none;
+    icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: white; }
+    color: white;
+    text-shadow: none;
+    icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
     color: rgba(255, 255, 255, 0.5); }
   GtkComboBox .separator {
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 192f9aa..bf1603a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -133,8 +133,6 @@ GtkGrid:insensitive {
     background-image: none;
     box-shadow: none;
     /* let's make it flat */ }
-  .entry GtkLabel, .linked .entry GtkLabel {
-    text-shadow: 0 1px red; }
 
 .linked .entry:first-child {
   border-top-right-radius: 0;
@@ -160,8 +158,8 @@ GtkGrid:insensitive {
   color: #2e3436;
   background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
   border-color: #a1a1a1;
-  text-shadow: 0 1px rgba(255, 255, 255, 0.6);
-  icon-shadow: 0 1px rgba(255, 255, 255, 0.6);
+  text-shadow: 0 1px rgba(255, 255, 255, 0.8);
+  icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05);
   /* Suggested and Destructive Action buttons */ }
   .button:hover,
@@ -174,8 +172,8 @@ GtkGrid:insensitive {
     color: #2e3436;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
-    text-shadow: 0 1px rgba(255, 255, 255, 0.6);
-    icon-shadow: 0 1px rgba(255, 255, 255, 0.6);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.8);
+    icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
   .button:active,
   .toolbar .button.raised:active,
@@ -187,8 +185,8 @@ GtkGrid:insensitive {
     color: #2e3436;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray);
-    text-shadow: 0 1px rgba(255, 255, 255, 0.6);
-    icon-shadow: 0 1px rgba(255, 255, 255, 0.6);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.8);
+    icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
   .button:backdrop,
   .toolbar .button.raised:backdrop,
@@ -255,7 +253,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: #748489;
       border-color: #a1a1a1;
-      box-shadow: none, 0 1px rgba(255, 255, 255, 0.05);
+      box-shadow: 0 1px rgba(255, 255, 255, 0.05);
       background-image: linear-gradient(to bottom, rgba(161, 161, 161, 0.1)); }
   .button.suggested-action,
   .toolbar .button.raised.suggested-action,
@@ -462,8 +460,8 @@ GtkGrid:insensitive {
     color: #2e3436;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
-    text-shadow: 0 1px rgba(255, 255, 255, 0.6);
-    icon-shadow: 0 1px rgba(255, 255, 255, 0.6);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.8);
+    icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
 .spinbutton.vertical .button:first-child {
   border-radius: 3px 3px 0 0; }
@@ -479,11 +477,17 @@ GtkGrid:insensitive {
 GtkComboBox {
   padding: 0;
   -GtkComboBox-arrow-scaling: 0.5;
-  -GtkComboBox-shadow-type: none; }
+  -GtkComboBox-shadow-type: none;
+  text-shadow: 0 1px rgba(255, 255, 255, 0.8);
+  icon-shadow: 0 1px rgba(255, 255, 255, 0.8); }
   GtkComboBox:insensitive {
-    color: #748489; }
+    color: #748489;
+    text-shadow: none;
+    icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: #748489; }
+    color: #748489;
+    text-shadow: none;
+    icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
     color: rgba(116, 132, 137, 0.5); }
   GtkComboBox .separator {
@@ -671,8 +675,8 @@ GtkPopover {
     color: #2e3436;
     background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
     border-color: #a1a1a1;
-    text-shadow: 0 1px rgba(255, 255, 255, 0.6);
-    icon-shadow: 0 1px rgba(255, 255, 255, 0.6);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.8);
+    icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
   .button.titlebutton:active {
     border-width: 1px;
@@ -680,8 +684,8 @@ GtkPopover {
     color: #2e3436;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray);
-    text-shadow: 0 1px rgba(255, 255, 255, 0.6);
-    icon-shadow: 0 1px rgba(255, 255, 255, 0.6);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.8);
+    icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
   .button.titlebutton:backdrop {
     border-width: 1px;