[gnome-themes-standard] Widget theme: comboboxentry fixes.

[Lapo Calamandrei <lapo src gnome org>]

commit 33f0911b3e776b6b2b2c6768a609cb972239cff4
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Jan 11 18:09:36 2012 +0100

    Widget theme: comboboxentry fixes.

 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   17 +----
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   17 +-----
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   66 +++-----------------
 3 files changed, 15 insertions(+), 85 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 074098f..e96a89c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -133,31 +133,20 @@
 .entry,
 GtkComboBox.combobox-entry .button,
 GtkComboBox.combobox-entry .button:hover,
-/*GtkComboBox.combobox-entry .button:focus,
-GtkComboBox.combobox-entry .button:hover:focus,*/
 .primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover /*,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus
-.primary-toolbar GtkComboBox.combobox-entry .button:hover:focus */ {
-/*    background-image: -gtk-gradient(linear,
-                                    left top, left bottom,
-                                    from(@entry_background_a),
-                                    color-stop(0.15, @entry_background_b),
-                                    color-stop(0.85, @entry_background_c),
-                                    to(@entry_background_d)); */
+.primary-toolbar GtkComboBox.combobox-entry .button:hover {
+
     background-image: -gtk-gradient(linear,
                                     left top, left bottom,
                                     from(@entry_background_a),
-									/* color-stop(0.7, mix(@entry_background_a, @entry_background_b, 0.4)), */
                                     to(@entry_background_b));
     box-shadow: 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4);
 }
 
 /* Entry pushed button background */
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover:active,
+/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
 GtkComboBox.combobox-entry .button:active,
-/*GtkComboBox.combobox-entry .button:active:focus, */
 .spinbutton .button:active,
 .spinbutton .button:active:hover,
 /*.spinbutton .button:active:focus,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 831e8b8..9f9289d 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -4,9 +4,6 @@
 .entry,
 GtkComboBox.combobox-entry .entry,
 GtkComboBox.combobox-entry .button,
-/*GtkComboBox.combobox-entry .button:focus,
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:focus:active,*/
 .button:active,
 .button:active:hover,
 .button:insensitive,
@@ -93,8 +90,7 @@ GtkSwitch.trough:active {
 .primary-toolbar .button.raised,
 .primary-toolbar .raised .button,
 .inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button,
-.primary-toolbar GtkComboBox .button:hover {
+.primary-toolbar GtkComboBox .button {
     border-image: url("borders/primary-toolbar-button-border.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
@@ -129,16 +125,7 @@ column-header .button:active,
 column-header.button:active:hover,
 column-header .button:active:hover,
 column-header.button:active:focus,
-column-header .button:active:focus /*, 
-column-header .button:insensitive,
-column-header.button:focus:hover,
-column-header .button:focus:hover,
-column-header.button:active:focus:hover,
-column-header .button:active:focus:hover,
-column-header.button:active:focus,
-column-header .button:active:focus,
-column-header.button:active:hover,
-column-header .button:active:hover */ {
+column-header .button:active:focus {
     border-image: -gtk-gradient (linear,
                                  left top, left bottom,
                                  from (@borders),
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 40b14a1..a417af8 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -507,10 +507,10 @@ GtkComboBox.combobox-entry .button {
     text-shadow: @button_text_shadow 0 1;
 }
 
-.button *:active,
+.button *:active /*,
 .button *:active:hover,
 .button *:active:hover:focus,
-.button *:active:focus {
+.button *:active:focus */ {
     text-shadow: @button_active_text_shadow 0 1;
     color: darker(@theme_selected_bg_color); /* Not sure about this one */
 }
@@ -523,6 +523,8 @@ GtkComboBox.combobox-entry .button {
 .button *:active:backdrop,
 .button *:active:insensitive:backdrop {
     color: @theme_unfocused_bg_color;
+    text-shadow: none;
+    icon-shadow: none;
 }
 
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
@@ -1120,86 +1122,38 @@ GtkComboBox .separator {
     -GtkWidget-vertical-separator: 0;
 }
 
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:focus:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:active:focus:first-child,
-GtkComboBox.combobox-entry .button:insensitive:first-child,
-GtkComboBox.combobox-entry .button:backdrop:first-child {
+GtkComboBox.combobox-entry .button:first-child {
     padding-right: 5;
 }
 
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:focus:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:active:focus:last-child,
-GtkComboBox.combobox-entry .button:insensitive:last-child,
-GtkComboBox.combobox-entry .button:backdrop:last-child {
+GtkComboBox.combobox-entry .button:last-child {
     padding-left: 5;
 }
 
 
 GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .entry:focus:first-child,
-GtkComboBox.combobox-entry .entry:backdrop:first-child,
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:focus:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:active:hover:first-child,
-GtkComboBox.combobox-entry .button:active:focus:first-child,
-GtkComboBox.combobox-entry .button:active:focus:hover:first-child,
-GtkComboBox.combobox-entry .button:insensitive:first-child,
-GtkComboBox.combobox-entry .button:backdrop:first-child {
+GtkComboBox.combobox-entry .button:first-child {
     border-image-width: 3 0 4 3;
     border-radius: 3 0 0 3;
     border-right-width: 0;
 }
 
 GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .entry:focus:last-child,
-GtkComboBox.combobox-entry .entry:backdrop:last-child,
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:focus:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:active:hover:last-child,
-GtkComboBox.combobox-entry .button:active:focus:last-child,
-GtkComboBox.combobox-entry .button:active:focus:hover:last-child,
-GtkComboBox.combobox-entry .button:insensitive:last-child,
-GtkComboBox.combobox-entry .button:backdrop:last-child {
+GtkComboBox.combobox-entry .button:last-child {
     border-image-width: 3 3 4 0;
     border-radius: 0 3 3 0;
     border-left-width: 0;
 }
 
 .primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:active:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:active:hover:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:active:focus:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:active:focus:hover:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:backdrop:first-child {
+.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
     border-image-width: 4 0 4 4;
     border-radius: 3 0 0 3;
     border-right-width: 0;
 }
 
 .primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus:hover:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:active:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:active:focus:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:active:focus:hover:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:last-child
-.primary-toolbar GtkComboBox.combobox-entry .button:backdrop:last-child {
+.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
     border-image-width: 4 4 4 0;
     border-radius: 0 3 3 0;
     border-left-width: 0;