[gnome-themes-standard/wip/sass] special cased focused entry for dark variant

[Lapo Calamandrei <lapo src gnome org>]

commit ba96777947c6f76355336b59366b8a7c205058a9
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri Jun 6 15:02:08 2014 +0200

    special cased focused entry for dark variant

 themes/Adwaita/gtk-3.0/_colors.scss           |    2 +-
 themes/Adwaita/gtk-3.0/_drawing.scss          |   14 +++++++++++---
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   16 ++++++++--------
 3 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_colors.scss b/themes/Adwaita/gtk-3.0/_colors.scss
index be48c43..e223a12 100644
--- a/themes/Adwaita/gtk-3.0/_colors.scss
+++ b/themes/Adwaita/gtk-3.0/_colors.scss
@@ -7,7 +7,7 @@ $fg_color: if($variant =='light', #2e3436, #eeeeec);
 
 $selected_fg_color: #fff;
 $selected_bg_color: if($variant =='light', #4a90d9, darken(#4a90d9,20%));
-$selected_borders_color: if($variant == 'light',darken($selected_bg_color, 30%),                         
darken($selected_bg_color,15%));
+$selected_borders_color: if($variant == 'light',darken($selected_bg_color, 30%),                         
darken($selected_bg_color,20%));
                          // FIXME dark variant color
 $borders_color: if($variant =='light', darken($bg_color,30%), darken($bg_color,12%));
 $borders_edge: if($variant =='light', white, transparentize($fg_color,.9));
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index 358cc6d..1a55b7f 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -42,10 +42,18 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
                       $_entry_edge);
   }
   @if $t==focus {
-    border-color: $selected_bg_color; //FIXME doesn't work on dark
-    @include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
+    @if $variant == 'light' {
+      border-color: $selected_bg_color;
+      @include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
                       inset 0 0 2px 1px mix($selected_bg_color,$base_color,20%),
-                      $_entry_edge); //FIXME needs improvements wrt dark variant
+                        $_entry_edge);
+    }
+    @else {
+      border-color: $selected_borders_color;
+      @include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
+                        inset 0 0 1px 1px $selected_bg_color,
+                        $_entry_edge);
+    }
   }
   @if $t==insensitive {
     color: $insensitive_fg_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index b5d06ba..1515091 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -106,8 +106,8 @@
     border-style: solid;
     border-width: 1px;
     background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
-    border-color: #215d9c;
-    box-shadow: inset 0 2px 2px -2px #191919, inset 0 0 2px 1px #2f3b48, 0 1px rgba(238, 238, 236, 0.1); }
+    border-color: #0f2b48;
+    box-shadow: inset 0 2px 2px -2px #191919, inset 0 0 1px 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1); }
   .entry:insensitive {
     background-color: transparent;
     border-style: solid;
@@ -958,7 +958,7 @@ GtkSwitch {
     text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
     GtkSwitch.trough:active {
       color: white;
-      border-color: #14375d;
+      border-color: #0f2b48;
       background-color: #215d9c;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1);
       text-shadow: 0 0 2px 1px white; }
@@ -994,7 +994,7 @@ GtkSwitch {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px 
#2a2f2f; }
     GtkSwitch.slider:active {
-      border: 1px solid #14375d; }
+      border: 1px solid #0f2b48; }
     GtkSwitch.slider:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -1293,10 +1293,10 @@ GtkCheckButton.text-button:selected {
       background-image: linear-gradient(to bottom, #393f3f);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .scale.slider:active {
-      border: 1px solid #113050; }
+      border: 1px solid #0c233b; }
     .scale.slider.fine-tune:active {
       border: 4px solid transparent;
-      box-shadow: inset 0 2px white, inset 0 0 0 1px #113050; }
+      box-shadow: inset 0 2px white, inset 0 0 0 1px #0c233b; }
   .scale.trough {
     border-width: 1px;
     border-style: solid;
@@ -1305,7 +1305,7 @@ GtkCheckButton.text-button:selected {
     background-color: #2d3232;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
     .scale.trough.highlight {
-      border-color: #14375d;
+      border-color: #0f2b48;
       background-color: #215d9c;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
       .scale.trough.highlight:backdrop {
@@ -1338,7 +1338,7 @@ GtkProgressBar {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: #14375d;
+  border-color: #0f2b48;
   background-color: #215d9c;
   box-shadow: inset 0 1px 0 rgba(238, 238, 236, 0); }
   .progressbar.vertical {