[gnome-themes-standard] adwaita: improve scales and entry in dark variation

[Cosimo Cecchi <cosimoc src gnome org>]

commit a803d7ed0a8a64294afe5ea12a08aafe3d50eec9
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Apr 29 21:28:29 2011 -0400

    adwaita: improve scales and entry in dark variation

 themes/Adwaita/gtk-3.0/gtk-dark.css    |   11 ++++++++---
 themes/Adwaita/gtk-3.0/gtk-widgets.css |   14 +++++++-------
 themes/Adwaita/gtk-3.0/gtk.css         |   12 +++++++++---
 3 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 458b4c2..6ab6aec 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -25,6 +25,7 @@
 
 @define-color insensitive_bg_color #0b0b0d;
 @define-color insensitive_fg_color #585458;
+ define-color insensitive_border_color shade (@internal_element_color, 0.70);
 
 @define-color inactive_frame_color shade (@theme_bg_color, 1.19);
 
@@ -70,6 +71,10 @@
 @define-color active_switch_bg_color_a shade (@theme_selected_bg_color, 0.85);
 @define-color active_switch_bg_color_b @theme_selected_bg_color;
 
+ define-color scale_fill shade (@insensitive_border_color, 0.90);
+ define-color scale_border_a shade (@internal_element_color, 0.90);
+ define-color scale_border_b shade (@internal_element_color, 0.65);
+
 /* FIXME: needs dark colors from here */
 @define-color link_color #4a90d9;
 @define-color warning_color #f57900;
@@ -93,9 +98,9 @@
 @define-color chrome_bg_color #1e1a17;
 @define-color chrome_fg_color #fff;
 
- define-color scale_fill #2c85e2;
- define-color scale_border_a #1864b2;
- define-color scale_border_b #3e90e5;
+ define-color scale_progress_fill #2c85e2;
+ define-color scale_progress_border #1864b2;
+ define-color scale_progress_border_b #3e90e5;
 
 @import url("gtk-widgets-assets-dark.css");
 @import url("gtk-widgets.css");
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 9cdf3e5..a7d5205 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -79,7 +79,7 @@
 *:insensitive {
     background-color: @insensitive_bg_color;
     color: @insensitive_fg_color;
-    border-color: shade (@internal_element_color, 1.37);
+    border-color: @insensitive_border_color;
 }
 
 *:active {
@@ -276,9 +276,9 @@ GtkScale.trough {
 
     -adwaita-border-gradient: -gtk-gradient (linear,
                                              left top, left bottom,
-                                             from (@internal_element_color),
-                                             to (shade (@internal_element_color, 1.25)));
-    background-color: shade (@internal_element_color, 1.37);
+                                             from (@scale_border_a),
+                                             to (@scale_border_b));
+    background-color: @scale_fill;
 }
 
 GtkScale.trough.horizontal {
@@ -298,7 +298,7 @@ GtkScale.trough:insensitive {
 }
 
 GtkScale.progressbar {
-    background-color: @scale_fill;
+    background-color: @scale_progress_fill;
 
     border-width: 1;
     border-radius: 3;
@@ -306,8 +306,8 @@ GtkScale.progressbar {
 
     -adwaita-border-gradient: -gtk-gradient (linear,
                                              left top, left bottom,
-                                             from (@scale_border_a),
-                                             to (@scale_border_b));    
+                                             from (@scale_progress_border_a),
+                                             to (@scale_progress_border_b));    
 }
 
 GtkScale.mark {
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 63146a1..334f186 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -64,6 +64,7 @@
 
 @define-color insensitive_bg_color #f4f4f2;
 @define-color insensitive_fg_color #a7aba7;
+ define-color insensitive_border_color shade (@internal_element_color, 1.37);
 
 @define-color trough_bg_color_a #ccccc7;
 @define-color trough_bg_color_b #e4e4e1;
@@ -78,11 +79,16 @@
 @define-color progressbar_background_b #1f72c6;
 @define-color progressbar_border #3277bf;
 
- define-color scale_fill #2c85e2;
- define-color scale_border #1864b2;
+ define-color internal_element_color #888a85;
+
+ define-color scale_fill @insensitive_border_color;
+ define-color scale_border_a @internal_element_color;
+ define-color scale_border_b shade (@internal_element_color, 1.25);
+ define-color scale_progress_fill #2c85e2;
+ define-color scale_progress_border_a #1864b2;
+ define-color scale_progress_border_b #3e90e5;
 
 @define-color highlighted_border #8a8f8a;
- define-color internal_element_color #888a85;
 
 @define-color notebook_border #a6a6a6;
 @define-color notebook_active_tab_border #1372d3;