[gnome-themes-standard] Removed _ prefix from calculated color names. Fixed window close button transition. Used a flat grad

[Jakub Steiner <jimmac src gnome org>]

commit dce83380b2a9a14837b63bd72a142e90d81e89f5
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Mon May 26 19:44:08 2014 +0200

    Removed _ prefix from calculated color names.
    Fixed window close button transition.
    Used a flat gradient istead of background color on insensitive entries.

 themes/Adwaita/gtk-3.0/_colors.scss           |   16 ++++----
 themes/Adwaita/gtk-3.0/_common.scss           |   45 ++++++++++++-------------
 themes/Adwaita/gtk-3.0/_drawing.scss          |   30 ++++++++--------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   12 +++----
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   12 +++----
 5 files changed, 55 insertions(+), 60 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_colors.scss b/themes/Adwaita/gtk-3.0/_colors.scss
index 35b8379..036fd68 100644
--- a/themes/Adwaita/gtk-3.0/_colors.scss
+++ b/themes/Adwaita/gtk-3.0/_colors.scss
@@ -18,13 +18,13 @@ $success_color: $selected_bg_color;
 $destructive_color: if($variant =='light', #ef2929, darken(#ef2929,10%));
 
 //insensitive state derived colors
-$_insensitive_fg_color: if($variant =='light', lighten($fg_color, 30%), lighten($fg_color, 10%));
-$_insensitive_bg_color: transparent;
-$_insensitive_borders_color: $borders_color;
+$insensitive_fg_color: if($variant =='light', lighten($fg_color, 30%), lighten($fg_color, 10%));
+$insensitive_bg_color: $bg_color;
+$insensitive_borders_color: $borders_color;
 
 //colors for the backdrop state, derived from the main colors.
-$_backdrop_base_color: if($variant =='light', darken($base_color,1%), darken($base_color,5%));
-$_backdrop_bg_color: $bg_color;
-$_backdrop_fg_color: if($variant =='light', lighten($fg_color,10%), $fg_color);
-$_backdrop_insensitive_color: if($variant =='light', darken($_backdrop_bg_color,15%), 
lighten($_insensitive_fg_color,5%));
-$_backdrop_borders_color: $borders_color;
+$backdrop_base_color: if($variant =='light', darken($base_color,1%), darken($base_color,5%));
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: if($variant =='light', lighten($fg_color,10%), $fg_color);
+$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), 
lighten($insensitive_fg_color,5%));
+$backdrop_borders_color: $borders_color;
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 3b5a219..42f6286 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -98,8 +98,8 @@
     color: $fg_color;
   }
   &:insensitive {
-    background-color: $_insensitive_bg_color;
-    color: $_insensitive_fg_color;
+    background-color: $insensitive_bg_color;
+    color: $insensitive_fg_color;
   }
   &:selected {
     background-color: $selected_bg_color;
@@ -171,10 +171,9 @@ GtkGrid:insensitive {
                                  // 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: 0 1px $borders_edge; /* not working */
+    color: $insensitive_fg_color;
+    background-image: linear-gradient(to bottom, $bg_color); 
+    box-shadow: 0 1px $borders_edge;
   }
   &:focus {
     border-color: $selected_bg_color;
@@ -187,14 +186,14 @@ GtkGrid:insensitive {
     background-color: $selected_bg_color;
   }
   &:backdrop {
-    color: $_backdrop_fg_color;
-    border-color: $_backdrop_borders_color;
-    background-image: linear-gradient(to bottom, $_backdrop_base_color);
+    color: $backdrop_fg_color;
+    border-color: $backdrop_borders_color;
+    background-image: linear-gradient(to bottom, $backdrop_base_color);
     box-shadow: none; // let's make it flat
   }
   &:backdrop:insensitive {
-    color: $_backdrop_insensitive_color;
-    background-image: linear-gradient(to bottom, $_backdrop_bg_color);
+    color: $backdrop_insensitive_color;
+    background-image: linear-gradient(to bottom, $backdrop_bg_color);
   }
   
   &.progressbar {
@@ -310,8 +309,8 @@ GtkColorButton.button { // Uniform padding on the GtkColorButton.button
   &:active:selected:backdrop {
       text-shadow: none;
       icon-shadow: none;
-      color: $_insensitive_fg_color;
-      background-color: $_insensitive_bg_color;
+      color: $insensitive_fg_color;
+      background-color: $insensitive_bg_color;
       background-image: none;
       border: none;
       box-shadow: none;
@@ -360,17 +359,17 @@ GtkColorButton.button { // Uniform padding on the GtkColorButton.button
   //  padding-left: 6px;
   //  padding-right: 6px;
     &:insensitive {
-      color: transparentize($_insensitive_fg_color,0.7);
+      color: transparentize($insensitive_fg_color,0.7);
     }
     &:active {
       box-shadow: inset 0 2px 3px -1px transparentize(black,0.8); 
     }
     &:backdrop {
-      border-color: transparentize($_backdrop_borders_color,0.7);
+      border-color: transparentize($backdrop_borders_color,0.7);
     }
     &:backdrop:insensitive {
       border-width: 0 0 0 1px;
-      color: transparentize($_backdrop_insensitive_color,0.7);
+      color: transparentize($backdrop_insensitive_color,0.7);
     }
   }
   &.vertical {
@@ -415,17 +414,17 @@ GtkComboBox {
   @include _button_text_shadow;
 
   &:insensitive { 
-    color: $_insensitive_fg_color;
+    color: $insensitive_fg_color;
     text-shadow: none;
     icon-shadow: none;
   }
   &:backdrop { 
-    color: $_backdrop_fg_color; 
+    color: $backdrop_fg_color; 
     text-shadow: none;
     icon-shadow: none;
   }
   &:backdrop:insensitive { 
-    color: transparentize($_backdrop_insensitive_color,0.5); 
+    color: transparentize($backdrop_insensitive_color,0.5); 
   }
   
   .separator {
@@ -472,7 +471,7 @@ GtkComboBox {
   padding: 6px;
 
   &:backdrop {
-    border-color: $_backdrop_borders_color;
+    border-color: $backdrop_borders_color;
     background-color: $bg_color;
     background-image: none;
     box-shadow: none;
@@ -498,7 +497,7 @@ GtkComboBox {
                   0 1 / 0 1px stretch; //FIXME use a proper color
     &:backdrop {
       border-image: linear-gradient(to bottom, 
-                                    transparentize($_backdrop_borders_color,
+                                    transparentize($backdrop_borders_color,
                                                    0.5))
                     0 1 / 1px 1px;  //FIXME use a proper color
     }
@@ -705,8 +704,8 @@ GtkScrolledWindow.frame {
   padding: 8px;
   border-color: transparent;
   background-image: none;
-  box-shadow: inset 0 1px transparentize(white,1); // this is needed to avoid
-                                                   // the weird transition
+  box-shadow: inset 0 1px transparentize(white,1),
+              0 1px transparentize($borders_edge,1);
   &:hover {
     @include button(normal);
   }
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index efe6dd7..7a0bf78 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -141,8 +141,8 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
   //
   // insensitive button
   //
-    color: $_insensitive_fg_color;
-    border-color: $_insensitive_borders_color;
+    color: $insensitive_fg_color;
+    border-color: $insensitive_borders_color;
     background-image: none;
     text-shadow: none;
     icon-shadow: none;
@@ -160,10 +160,10 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
   //
   // insensitive pushed button
   //
-    color: $_insensitive_fg_color;
-    border-color: $_insensitive_borders_color;
+    color: $insensitive_fg_color;
+    border-color: $insensitive_borders_color;
     background-image: linear-gradient(to bottom, 
-                        transparentize($_insensitive_borders_color,.8)); 
+                        transparentize($insensitive_borders_color,.8)); 
                         //FIXME? better to use mix() probably
     @if $noshadow { 
       // white with 0 alpha to avoid an ugly transition, since no color means
@@ -177,8 +177,8 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
   }
 
   @else if $t==backdrop { // backdrop button
-    color: $_backdrop_fg_color;
-    border-color: $_backdrop_borders_color;
+    color: $backdrop_fg_color;
+    border-color: $backdrop_borders_color;
     background-image: none;
     text-shadow: none;
     icon-shadow: none;
@@ -186,25 +186,25 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
   }
 
   @else if $t==backdrop-active { // backdrop pushed button
-    color: $_backdrop_fg_color;
-    border-color: $_backdrop_borders_color;
+    color: $backdrop_fg_color;
+    border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom, 
-                        transparentize($_backdrop_borders_color,.7));
+                        transparentize($backdrop_borders_color,.7));
     box-shadow: inset 0 1px transparentize(white,1);
   }
 
   @else if $t==backdrop-insensitive { // backdrop insensitive button
-    color: $_backdrop_insensitive_color;
-    border-color: $_backdrop_borders_color;
+    color: $backdrop_insensitive_color;
+    border-color: $backdrop_borders_color;
     box-shadow: inset 0 1px transparentize(white,1);
   }
 
   @else if $t==backdrop-insensitive-active { // backdrop insensitive 
                                              // pushed button
-    color: $_backdrop_insensitive_color;
-    border-color: $_backdrop_borders_color;
+    color: $backdrop_insensitive_color;
+    border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom,
-                        transparentize($_backdrop_borders_color,.9));
+                        transparentize($backdrop_borders_color,.9));
     box-shadow: inset 0 1px transparentize(white,1);
   }
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index f825117..9511466 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -68,7 +68,7 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:insensitive {
-    background-color: transparent;
+    background-color: #393f3f;
     color: white; }
   .gtkstyle-fallback:selected {
     background-color: #2a76c6;
@@ -120,10 +120,8 @@ GtkGrid:insensitive {
   background-color: transparent; }
   .entry:insensitive {
     color: white;
-    background-image: none;
-    background-color: transparent;
-    box-shadow: 0 1px rgba(238, 238, 236, 0.1);
-    /* not working */ }
+    background-image: linear-gradient(to bottom, #393f3f);
+    box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
   .entry:focus {
     border-color: #2a76c6;
     box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.4), inset 0 0 2px 1px rgba(42, 118, 198, 0.5), 0 1px 
rgba(238, 238, 236, 0.1);
@@ -353,7 +351,7 @@ GtkColorButton.button {
     text-shadow: none;
     icon-shadow: none;
     color: white;
-    background-color: transparent;
+    background-color: #393f3f;
     background-image: none;
     border: none;
     box-shadow: none; }
@@ -734,7 +732,7 @@ GtkScrolledWindow.frame {
   padding: 8px;
   border-color: transparent;
   background-image: none;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
   .button.titlebutton:hover {
     border-width: 1px;
     border-style: solid;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 607ca89..91b4876 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -68,7 +68,7 @@
     background-color: lightgray;
     color: #2e3436; }
   .gtkstyle-fallback:insensitive {
-    background-color: transparent;
+    background-color: #ededed;
     color: #748489; }
   .gtkstyle-fallback:selected {
     background-color: #4a90d9;
@@ -120,10 +120,8 @@ GtkGrid:insensitive {
   background-color: transparent; }
   .entry:insensitive {
     color: #748489;
-    background-image: none;
-    background-color: transparent;
-    box-shadow: 0 1px white;
-    /* not working */ }
+    background-image: linear-gradient(to bottom, #ededed);
+    box-shadow: 0 1px white; }
   .entry:focus {
     border-color: #4a90d9;
     box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.4), inset 0 0 2px 1px rgba(74, 144, 217, 0.5), 0 1px 
white;
@@ -353,7 +351,7 @@ GtkColorButton.button {
     text-shadow: none;
     icon-shadow: none;
     color: #748489;
-    background-color: transparent;
+    background-color: #ededed;
     background-image: none;
     border: none;
     box-shadow: none; }
@@ -734,7 +732,7 @@ GtkScrolledWindow.frame {
   padding: 8px;
   border-color: transparent;
   background-image: none;
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
   .button.titlebutton:hover {
     border-width: 1px;
     border-style: solid;