[gnome-themes-standard] combobox: fix the active state of the entry button in the dark theme

[Cosimo Cecchi <cosimoc src gnome org>]

commit 00676a69af14b5ba58670c920326b4c4160c4c52
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Aug 10 16:44:08 2011 +0200

    combobox: fix the active state of the entry button in the dark theme

 themes/Adwaita/gtk-3.0/gtk-dark.css                |    7 ++++---
 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |    4 ----
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   14 +++++++++++---
 themes/Adwaita/gtk-3.0/gtk.css                     |    3 +++
 4 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 0de7b82..33ce806 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -51,18 +51,21 @@
 
 @define-color highlighted_border @button_border;
 @define-color internal_element_color #888a85;
+ define-color internal_element_prelight #333333;
 @define-color internal_element_insensitive shade (@internal_element_color, 0.75);
 
-
 @define-color progressbar_background_a #5893df;
 @define-color progressbar_background_b #2465ba;
 @define-color progressbar_pattern #000000;
 
+ define-color entry_text_color #000000;
 @define-color entry_background_a #848684;
 @define-color entry_background_b #babcba;
 @define-color entry_background_c #e7e8e7;
 @define-color entry_background_d #f3f3f3;
 
+ define-color frame_color #707070;
+
 @define-color focused_entry_border @theme_selected_bg_color;
 @define-color focused_entry_inset alpha (@theme_selected_bg_color, 0.50);
 
@@ -88,8 +91,6 @@
 @define-color trough_bg_color_a #30312f;
 @define-color trough_bg_color_b #41433f;
 
- define-color frame_color #756a7f;
-
 @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;
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
index 9443eab..29dbd59 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -15,10 +15,6 @@ GtkIconView.view.cell:selected:focused {
     -adwaita-focus-border-dashes: true;
 }
 
-.entry {
-    color: #000000;
-}
-
 .entry:insensitive {
     background-image: none;
 }
\ No newline at end of file
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 29e33e8..4278ba6 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -134,6 +134,8 @@ GtkStatusbar {
     -GtkEntry-progress-border: 0;
 
     /* border-image defined in the -assets variants */
+
+    color: @entry_text_color;
 }
 
 .entry,
@@ -142,7 +144,7 @@ GtkComboBox.combobox-entry .button:prelight {
     background-image: -gtk-gradient(linear,
                                     left top, left bottom,
                                     from(@entry_background_a),
-                                    color-stop(0.30, @entry_background_b),
+                                    color-stop(0.20, @entry_background_b),
                                     color-stop(0.85, @entry_background_c),
                                     to(@entry_background_d));
 }
@@ -493,6 +495,12 @@ GtkComboBox.combobox-entry .button {
     border-radius: 0 3 3 0;
 
     padding: 2 3;
+    -adwaita-focus-fill-color: alpha (@theme_base_color, 0.0);
+}
+
+GtkComboBox.combobox-entry .button *:active,
+GtkComboBox.combobox-entry .button *:prelight {
+    color: @internal_element_prelight;
 }
 
 GtkComboBox.combobox-entry .button:active,
@@ -500,11 +508,11 @@ GtkComboBox.combobox-entry .button:hover:active {
     background-image: -gtk-gradient(linear,
                                     left top, left bottom,
                                     from(shade(@entry_background_a, 0.95)),
-                                    color-stop(0.30, shade(@entry_background_b, 0.95)),
+                                    color-stop(0.20, shade(@entry_background_b, 0.95)),
                                     color-stop(0.85, shade(@entry_background_c, 0.95)),
                                     to(shade(@entry_background_d, 0.95)));
 
-    box-shadow: 1 0 inset shade(@frame_color, 1.50), 2 0 inset shade(@frame_color, 1.60);
+    box-shadow: 1 0 inset shade(@frame_color, 1.50);
 }
 
 /**************
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 712bcf6..c9ffafe 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -88,12 +88,15 @@
 @define-color progressbar_background_b #1f72c6;
 @define-color progressbar_pattern #000000;
 
+ define-color entry_text_color @theme_text_color;
+
 @define-color entry_background_a #e1e1e1;
 @define-color entry_background_b #f8f8f8;
 @define-color entry_background_c #fafafa;
 @define-color entry_background_d @theme_base_color;
 
 @define-color internal_element_color #888a85;
+ define-color internal_element_prelight @theme_text_color;
 @define-color internal_element_insensitive shade (@internal_element_color, 1.6);
 
 @define-color scale_fill @insensitive_border_color;