[gnome-themes-standard/lapo-work] Widget theme: comboboxes on primary toolbar will always be styled as raised buttons, misc cleanups.

[Lapo Calamandrei <lapo src gnome org>]

commit 01dcb794626ac1a1c4d25c92388301c803f46f2d
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Nov 30 20:20:57 2011 +0100

    Widget theme: comboboxes on primary toolbar will always be styled as raised buttons, misc cleanups.

 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   19 +++++++++-----
 .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css   |   25 +++++++++----------
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   23 ++++++++----------
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   23 +++++++++++++++---
 4 files changed, 53 insertions(+), 37 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 8a56a31..384d80e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -3,7 +3,9 @@
 .primary-toolbar .button.raised,
 .primary-toolbar .raised .button,
 .primary-toolbar .button.raised:focus,
-.primary-toolbar .raised .button:focus {
+.primary-toolbar .raised .button:focus,
+.primary-toolbar GtkComboBox .button,
+.primary-toolbar GtkComboBox .button:focus {
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
                                      from (@button_gradient_color_a),
@@ -24,7 +26,7 @@
     background-image: -gtk-gradient (linear,
     				     left top, left bottom,
                                      from (@button_border),
-				     to (shade(@theme_bg_color, 0.94)));
+				     to (alpha(@button_border, 0)));
 }
 
 /* Flipped pushed button background for vertical progressbar through and the like */
@@ -32,14 +34,15 @@
     background-image: -gtk-gradient (linear,
     				     left top, right top,
                                      from (@button_border),
-				     to (shade(@theme_bg_color, 0.94)));
+				     to (alpha(@button_border, 0)));
 }
 
 /* Prelit button background */
 .button:hover,
 .toolbar .button:hover,
 .primary-toolbar .button.raised:hover,
-.primary-toolbar .raised .button:hover {
+.primary-toolbar .raised .button:hover,
+.primary-toolbar GtkComboBox .button:hover {
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
 				     from (@button_hover_gradient_color_a),
@@ -48,7 +51,7 @@
 
 .primary-toolbar .button:hover,
 .primary-toolbar .button:hover:focus {
-    background-color: transparent;
+    background-color: none;
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
 				     from (alpha (@theme_base_color, 0.0)),
@@ -57,7 +60,8 @@
 }
 
 /* Insensitive button background */
-.button:insensitive {
+.button:insensitive,
+.primary-toolbar GtkComboBox .button:insensitive {
     background-image: none;
     background-color: @insensitive_bg_color;
 
@@ -71,7 +75,8 @@
 }
 
 /* Pushed + Insensitive button background */
-.button:active:insensitive {
+.button:active:insensitive,
+.primary-toolbar GtkComboBox .button:active:insensitive {
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
 				     from (shade (@insensitive_bg_color, 0.95)),
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
index e8f13bc..10264e2 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -59,7 +59,11 @@ GtkSwitch.trough:active {
 .inline-toolbar.toolbar .button:active,
 .inline-toolbar.toolbar .button:active:hover,
 .inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:active {
+.inline-toolbar.toolbar GtkToolButton .button:active,
+.primary-toolbar GtkSwitch.trough,
+.primary-toolbar GtkSwitch.trough:insensitive,
+.primary-toolbar GtkComboBox .button:active,
+.primary-toolbar GtkComboBox .button:insensitive {
     border-image: url("borders/primary-toolbar-generic-border-dark.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
@@ -75,7 +79,8 @@ GtkSwitch.trough:active {
 .primary-toolbar .button.raised.default:active,
 .primary-toolbar .raised .button.default:active,
 .inline-toolbar.toolbar .button:focus:active,
-.inline-toolbar.toolbar .button.default:active { 
+.inline-toolbar.toolbar .button.default:active,
+.primary-toolbar GtkComboBox .button:active:focus { 
     border-image: url("borders/primary-toolbar-generic-border-focused-dark.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
@@ -86,7 +91,9 @@ GtkSwitch.trough:active {
 .primary-toolbar .raised .button,
 .primary-toolbar .button.raised:hover,
 .primary-toolbar .raised .button:hover,
-.inline-toolbar.toolbar .button {
+.inline-toolbar.toolbar .button,
+.primary-toolbar GtkComboBox .button,
+.primary-toolbar GtkComboBox .button:hover {
     border-image: url("borders/primary-toolbar-button-border-dark.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
@@ -100,21 +107,13 @@ GtkSwitch.trough:active {
 .primary-toolbar .button.raised:focus:hover,
 .primary-toolbar .raised .button:focus:hover,
 .inline-toolbar.toolbar .button:focus,
-.inline-toolbar.toolbar .button.default { 
+.inline-toolbar.toolbar .button.default,
+.primary-toolbar GtkComboBox .button:focus { 
     border-image: url("borders/primary-toolbar-button-border-focused-dark.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
 }
 
-/* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button,
-.primary-toolbar .button:hover,
-.primary-toolbar .button:focus,
-.primary-toolbar .button:insensitive {
-    border-image: none;
-    border-style: none;
-}
-
 /* column-headers borders */
 column-header.button,
 column-header .button,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 1a852c0..c87a298 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -61,7 +61,9 @@ GtkSwitch.trough:active {
 .inline-toolbar.toolbar .button:insensitive,
 .inline-toolbar.toolbar GtkToolButton .button:active,
 .primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkSwitch.trough:insensitive {
+.primary-toolbar GtkSwitch.trough:insensitive,
+.primary-toolbar GtkComboBox .button:active,
+.primary-toolbar GtkComboBox .button:insensitive {
     border-image: url("borders/primary-toolbar-generic-border.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
@@ -77,7 +79,8 @@ GtkSwitch.trough:active {
 .primary-toolbar .button.raised.default:active,
 .primary-toolbar .raised .button.default:active,
 .inline-toolbar.toolbar .button:focus:active,
-.inline-toolbar.toolbar .button.default:active { 
+.inline-toolbar.toolbar .button.default:active,
+.primary-toolbar GtkComboBox .button:active:focus { 
     border-image: url("borders/primary-toolbar-generic-border-focused.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
@@ -88,7 +91,9 @@ GtkSwitch.trough:active {
 .primary-toolbar .raised .button,
 .primary-toolbar .button.raised:hover,
 .primary-toolbar .raised .button:hover,
-.inline-toolbar.toolbar .button {
+.inline-toolbar.toolbar .button,
+.primary-toolbar GtkComboBox .button,
+.primary-toolbar GtkComboBox .button:hover {
     border-image: url("borders/primary-toolbar-button-border.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
@@ -102,21 +107,13 @@ GtkSwitch.trough:active {
 .primary-toolbar .button.raised:focus:hover,
 .primary-toolbar .raised .button:focus:hover,
 .inline-toolbar.toolbar .button:focus,
-.inline-toolbar.toolbar .button.default { 
+.inline-toolbar.toolbar .button.default,
+.primary-toolbar GtkComboBox .button:focus { 
     border-image: url("borders/primary-toolbar-button-border-focused.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
 }
 
-/* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button,
-.primary-toolbar .button:hover,
-.primary-toolbar .button:focus,
-.primary-toolbar .button:insensitive {
-    border-image: none;
-    border-style: none;
-}
-
 /* column-headers borders */
 column-header.button,
 column-header .button,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 8bea5f0..094808c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -424,6 +424,21 @@ GtkScrolledWindow.frame {
     background-color: none;
 }
 
+/* Remove borders from primary toolbar buttons*/
+.primary-toolbar .button,
+.primary-toolbar .button:hover,
+.primary-toolbar .button:focus,
+.primary-toolbar .button:insensitive {
+    border-image: none;
+    border-style: none;
+}
+
+/*.primary-toolbar GtkComboBox .button {
+    border-style: solid;
+    border-width: 1;
+    border-color: red;
+}*/
+
 .button.raised *,
 .raised .button *,
 .inline-toolbar .button * {
@@ -758,7 +773,7 @@ GtkLinkButton * {
 
     border-style: none;
     border-image: none;
-    background-color: transparent;
+    background-color: none;
     background-image: none;
 }
 
@@ -1061,12 +1076,12 @@ GtkTreeMenu .menuitem * {
 .menuitem.check:insensitive,
 .menuitem.radio:insensitive {
     background-image: none;
-    background-color: transparent;
+    background-color: none;
 }
 
 .menuitem.check:active,
 .menuitem.radio:active {
-    background-color: transparent;
+    background-color: none;
 }
 
 .menuitem.check:active {
@@ -1263,7 +1278,7 @@ GtkTreeMenu .menuitem * {
 .sidebar .radio:focus,
 .sidebar .radio:selected {
     background-image: none;
-    background-color: transparent;
+    background-color: none;
 }
 
 /****************