[gnome-themes-standard] Widgets: combobox entries more consistent with the rest.

[Lapo Calamandrei <lapo src gnome org>]

commit 8fda6ba12aed42dc8b5349bdb795f32a0bad4adc
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Thu Jan 19 14:06:49 2012 +0100

    Widgets: combobox entries more consistent with the rest.

 themes/Adwaita/gtk-3.0/gnome-applications.css      |   10 +++--
 themes/Adwaita/gtk-3.0/gtk-dark.css                |    2 +-
 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |   20 +++++++-
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   45 +++++++++++++++++--
 4 files changed, 64 insertions(+), 13 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index 9e34c15..cc048bc 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -505,7 +505,9 @@ EphyToolbar .location-entry .button:focus {
                                     left top, left bottom,
                                     from(@entry_background_a),
                                     to(@entry_background_b));
-    box-shadow: 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4), 1 0 inset @inset_dark_color;
+    box-shadow: 1 0 inset @inset_dark_color,
+                0 1 inset @entry_inset,
+                0 2 inset alpha(@entry_inset, 0.4);
 }
 
 EphyToolbar .location-entry .button:active,
@@ -514,9 +516,9 @@ EphyToolbar .location-entry .button:active:hover {
                                     left top, left bottom,
                                     from(shade(@entry_background_a, 0.9)),
                                     to(@entry_background_b));
-    box-shadow: 0 1 inset @entry_inset, 
-                0 2 inset alpha(@entry_inset, 0.4), 
-                1 0 inset @inset_dark_color;
+    box-shadow: 1 0 inset @inset_dark_color,
+                0 1 inset @entry_inset, 
+                0 2 inset alpha(@entry_inset, 0.4);
 }
 
 EphyToolbar .location-entry .button:hover,
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 84509bc..4a26b4c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -115,7 +115,7 @@
 @define-color expander_row_selected_color alpha (@theme_base_color, 0.60);
 
 @define-color inset_light_color alpha(white, 0.05);
- define-color inset_dark_color alpha(black, 0.15);
+ define-color inset_dark_color alpha(black, 0.25);
 
 @define-color keyboard_focus_border_a alpha (@theme_fg_color, 0.30);
 @define-color keyboard_focus_border_b alpha (@theme_fg_color, 0.10);
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 0406995..4e957bf 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -105,9 +105,23 @@ GtkSwitch.slider {
 
 .entry:focus {
     box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
-               -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
-               1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7),
-               -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
+                -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
+                1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7),
+                -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
+}
+
+GtkComboBox.combobox-entry .entry:focus:first-child {
+    box-shadow: 2 2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
+                -1 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
+                1 1 inset alpha(lighter(@theme_selected_bg_color), 0.7),
+                0 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
+}
+
+GtkComboBox.combobox-entry .entry:focus:last-child {
+    box-shadow: 1 2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
+                -2 -2 inset alpha(lighter(@theme_selected_bg_color), 0.2),
+                0 1 inset alpha(lighter(@theme_selected_bg_color), 0.7),
+                -1 -1 inset alpha(lighter(@theme_selected_bg_color), 0.7);
 }
 
 .spinbutton .button:active,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 939a2f9..4fea018 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -208,7 +208,9 @@ GtkTreeView .separator:backdrop,
 }
 
 .entry:focus {
-    box-shadow: 1 2 inset alpha(@theme_selected_bg_color, 0.1), 1 1 inset alpha(@theme_selected_bg_color, 0.1), -1 -1 inset alpha(@theme_selected_bg_color, 0.2);
+    box-shadow: 1 2 inset alpha(@theme_selected_bg_color, 0.1),
+                1 1 inset alpha(@theme_selected_bg_color, 0.1),
+                -1 -1 inset alpha(@theme_selected_bg_color, 0.2);
 }
 
 .entry.progressbar {
@@ -1073,11 +1075,11 @@ GtkComboBox .separator {
 }
 
 GtkComboBox.combobox-entry .button:first-child {
-    padding-right: 5;
+    padding-right: 4;
 }
 
 GtkComboBox.combobox-entry .button:last-child {
-    padding-left: 5;
+    padding-left: 4;
 }
 
 
@@ -1109,14 +1111,47 @@ GtkComboBox.combobox-entry .button:last-child {
     border-left-width: 0;
 }
 
+GtkComboBox.combobox-entry .entry:focus:first-child {
+    box-shadow: 1 2 inset alpha(@theme_selected_bg_color, 0.1),
+                1 1 inset alpha(@theme_selected_bg_color, 0.1),
+                0 -1 inset alpha(@theme_selected_bg_color, 0.2);
+}
+
+GtkComboBox.combobox-entry .entry:focus:last-child {
+    box-shadow: -1 2 inset alpha(@theme_selected_bg_color, 0.1),
+                -1 1 inset alpha(@theme_selected_bg_color, 0.1),
+                0 -1 inset alpha(@theme_selected_bg_color, 0.2);
+}
+
+GtkComboBox.combobox-entry .button:last-child,
+GtkComboBox.combobox-entry .button:hover:last-child,
 GtkComboBox.combobox-entry .button:active:last-child,
 GtkComboBox.combobox-entry .button:hover:active:last-child {
-    box-shadow: 1 0 inset @inset_dark_color, 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4);;
+    box-shadow: 1 0 inset @inset_dark_color, 
+                0 1 inset @entry_inset,
+                0 2 inset alpha(@entry_inset, 0.4);
 }
 
+GtkComboBox.combobox-entry .button:first-child,
+GtkComboBox.combobox-entry .button:hover:first-child,
 GtkComboBox.combobox-entry .button:active:first-child,
 GtkComboBox.combobox-entry .button:hover:active:first-child {
-    box-shadow: -1 0 inset @inset_dark_color, 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4);;
+    box-shadow: -1 0 inset @inset_dark_color, 
+                0 1 inset @entry_inset,
+                0 2 inset alpha(@entry_inset, 0.4);
+}
+
+GtkComboBox.combobox-entry .button:insensitive:first-child {
+    box-shadow: -1 0 inset @inset_dark_color;
+}
+
+GtkComboBox.combobox-entry .button:insensitive:last-child {
+    box-shadow: 1 0 inset @inset_dark_color;
+}
+
+GtkComboBox.combobox-entry .button:backdrop:first-child,
+GtkComboBox.combobox-entry .button:backdrop:last-child {
+    box-shadow: none;
 }
 
 GtkComboBox.combobox-entry .button *:active,