[gnome-themes-standard] some more hacking, entry and the like mostly

[Jakub Steiner <jimmac src gnome org>]

commit 3c6db4550a53f2ffc2a790fe1b9d48092e3bd835
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Sat May 17 18:29:09 2014 +0200

    some more hacking, entry and the like mostly

 themes/Adwaita/gtk-3.0/_common.scss           |   54 +++++++++++------------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   12 +++--
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   58 ++++++++++--------------
 3 files changed, 58 insertions(+), 66 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index d3cf470..0029534 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -58,8 +58,6 @@ debug {
     background-color: $theme_bg_color;
 }
 
-/* using these wildcard causes tons of problems, we need to avoid them as much as possible
-   commented for now
 .background:backdrop {
     text-shadow: none;
     icon-shadow: none;
@@ -67,6 +65,13 @@ debug {
     color: lighten($theme_fg_color,10%);
 }
 
+/*
+   These wildcard seems unavoidable, need to investigate.
+   Wildcards are bad and troublesome, use them with care,
+   or better, just don't.
+   Everytime a wildcard is used a kitten dies, painfully.
+*/
+
 *:selected,
 *:selected:focus {
     background-color: $theme_selected_bg_color;
@@ -78,18 +83,6 @@ debug {
     color: $theme_selected_fg_color;
 }
 
-*:insensitive {
-    background-color: $insensitive_bg_color;
-    color: $insensitive_fg_color;
-    border-color: darken($theme_bg_color,20%);
-}
-
-*:insensitive:backdrop {
-    text-shadow: none;
-    icon-shadow: none;
-    color: lighten($theme_fg_color,10%);
-}
-*/
 
 *:insensitive {
     -gtk-image-effect: dim;
@@ -135,10 +128,6 @@ GtkGrid:insensitive {
     background-color: transparent;
 }
 
-GtkLabel {        //this is a test
-  color: inherit;
-}
-
 // spinner animation
 
 @keyframes spin {
@@ -169,25 +158,34 @@ GtkLabel {        //this is a test
   color: $theme_fg_color;
   border-radius: 3px;
   transition: all 200ms ease-out;
-  border: 1px solid darken($theme_bg_color,30%);
+  border: 1px solid $borders-color;
   background-image: linear-gradient(to bottom,
-                                      darken($theme_base_color,20%) 1%,
-                                      darken($theme_base_color,10%) 10%,
-                                      $theme_base_color
+                                      darken($theme_base_color,5%) 0%,
+                                      $theme_base_color 90%
                                       );
-  background-color: transparent;
-  &:insensitive, &:backdrop:insensitive {
+  box-shadow: inset 0 2px 2px -2px transparentize(black,0.6),
+              0 1px $borders_edge; // not working 
+
+  background-color: transparent; // this needs to be 'transparent'
+                                 // if we need a flat bg, let's abuse a gradient
+
+  &:insensitive {
     color: $insensitive_fg_color;
     background-image: none;
     background-color: $insensitive_bg_color;
-    box-shadow: inset 0 1px $borders_edge,
-                0 1px $borders_edge; /* doesn't have margin to paint on :( */
+    box-shadow: 0 1px $borders_edge; // not working
   }
   &:focus {
     border-color: $theme_selected_bg_color;
-    box-shadow: inset 0 0 2px 1px transparentize($theme_selected_bg_color,.5);
+    box-shadow: inset 0 2px 2px -2px transparentize(black,0.6),
+                inset 0 0 0 1px $theme_selected_bg_color, /* focus indicator */
+                0 1px $borders_edge; /* not working */
+  }
+  &:backdrop {
+    background-image: none;
+    box-shadow: none; /* let's make it flat */
   }
-  GtkLabel {
+  GtkLabel { // what's this?
     text-shadow: 0 1px red;
   }  
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index a90758b..509918c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -1,13 +1,17 @@
 /*
-Syntax error: Undefined variable: "$borders_color".
-        on line 490 of _common.scss
+Syntax error: Undefined variable: "$borders-color".
+        on line 161 of _common.scss
         from line 23 of ./gtk-contained-dark.scss
 
 Backtrace:
-_common.scss:490
+_common.scss:161
 ./gtk-contained-dark.scss:23
 /usr/local/share/gems/gems/sass-3.3.7/lib/sass/script/tree/variable.rb:49:in `_perform'
 /usr/local/share/gems/gems/sass-3.3.7/lib/sass/script/tree/node.rb:50:in `perform'
+/usr/local/share/gems/gems/sass-3.3.7/lib/sass/script/tree/list_literal.rb:62:in `_perform'
+org/jruby/RubyArray.java:2361:in `map'
+/usr/local/share/gems/gems/sass-3.3.7/lib/sass/script/tree/list_literal.rb:61:in `_perform'
+/usr/local/share/gems/gems/sass-3.3.7/lib/sass/script/tree/node.rb:50:in `perform'
 /usr/local/share/gems/gems/sass-3.3.7/lib/sass/tree/visitors/perform.rb:366:in `visit_prop'
 org/jruby/RubyBasicObject.java:1665:in `__send__'
 org/jruby/RubyKernel.java:2090:in `send'
@@ -79,4 +83,4 @@ org/jruby/RubyProc.java:249:in `call'
 body:before {
   white-space: pre;
   font-family: monospace;
-  content: "Syntax error: Undefined variable: \"$borders_color\".\A         on line 490 of _common.scss\A    
     from line 23 of ./gtk-contained-dark.scss"; }
+  content: "Syntax error: Undefined variable: \"$borders-color\".\A         on line 161 of _common.scss\A    
     from line 23 of ./gtk-contained-dark.scss"; }
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 8a91b19..bda373a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -40,38 +40,26 @@ debug {
   color: #2e3436;
   background-color: #ededed; }
 
-/* using these wildcard causes tons of problems, we need to avoid them as much as possible
-   commented for now
 .background:backdrop {
-    text-shadow: none;
-    icon-shadow: none;
-
-    color: lighten($theme_fg_color,10%);
-}
-
+  text-shadow: none;
+  icon-shadow: none;
+  color: #454f52; }
+
+/*
+   These wildcard seems unavoidable, need to investigate.
+   Wildcards are bad and troublesome, use them with care,
+   or better, just don't.
+   Everytime a wildcard is used a kitten dies, painfully.
+*/
 *:selected,
 *:selected:focus {
-    background-color: $theme_selected_bg_color;
-    color: $theme_selected_fg_color;
-}
+  background-color: #729fcf;
+  color: white; }
 
 *:selected:backdrop {
-    background-color: $theme_selected_bg_color;
-    color: $theme_selected_fg_color;
-}
-
-*:insensitive {
-    background-color: $insensitive_bg_color;
-    color: $insensitive_fg_color;
-    border-color: darken($theme_bg_color,20%);
-}
+  background-color: #729fcf;
+  color: white; }
 
-*:insensitive:backdrop {
-    text-shadow: none;
-    icon-shadow: none;
-    color: lighten($theme_fg_color,10%);
-}
-*/
 *:insensitive {
   -gtk-image-effect: dim; }
 
@@ -108,9 +96,6 @@ GtkGrid,
 GtkGrid:insensitive {
   background-color: transparent; }
 
-GtkLabel {
-  color: inherit; }
-
 @keyframes spin {
   to {
     -gtk-icon-transform: rotate(1turn); } }
@@ -135,17 +120,22 @@ GtkLabel {
   border-radius: 3px;
   transition: all 200ms ease-out;
   border: 1px solid #a1a1a1;
-  background-image: linear-gradient(to bottom, #cccccc 1%, #e6e6e6 10%, white);
+  background-image: linear-gradient(to bottom, #f2f2f2 0%, white 90%);
+  box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.4), 0 1px rgba(255, 255, 255, 0.05);
   background-color: transparent; }
-  .entry:insensitive, .entry:backdrop:insensitive {
+  .entry:insensitive {
     color: #748489;
     background-image: none;
     background-color: transparent;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05);
-    /* doesn't have margin to paint on :( */ }
+    box-shadow: 0 1px rgba(255, 255, 255, 0.05); }
   .entry:focus {
     border-color: #729fcf;
-    box-shadow: inset 0 0 2px 1px rgba(114, 159, 207, 0.5); }
+    box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.4), inset 0 0 0 1px #729fcf, 0 1px rgba(255, 255, 255, 
0.05);
+    /* not working */ }
+  .entry:backdrop {
+    background-image: none;
+    box-shadow: none;
+    /* let's make it flat */ }
   .entry GtkLabel, .linked .entry GtkLabel {
     text-shadow: 0 1px red; }