[gnome-themes-standard] buttons: fixup color wildcard overrides

[Cosimo Cecchi <cosimoc src gnome org>]

commit bea812728f8aaf23898365c0c29a97ce37b4aed1
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Aug 16 23:10:30 2012 +0200

    buttons: fixup color wildcard overrides
    
    Since "color" is an inherit property, it's just wrong to set it
    wildcarded, and again in the dark theme overrides.
    Simplify the theme by separating color settings out of wildcard
    selectors.

 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |    2 -
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   28 +++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)
---
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 8f3ed66..880f95d 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -23,13 +23,11 @@ GtkComboBox {
 .button *:active,
 GtkComboBox *:active {
     text-shadow: 0 1px @button_active_text_shadow;
-    color: @theme_selected_bg_color; /* Not sure about this one */
 }
 
 .button *:active:insensitive,
 GtkComboBox *:active:insensitive {
     text-shadow: none;
-    color: @insensitive_fg_color;
 }
 
 .toolbar .button.raised *,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 363620c..b5e589d 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -923,26 +923,40 @@ GtkComboBox.combobox-entry .button {
     text-shadow: 0 1px @primary_toolbar_button_text_shadow;
 }
 
+.button:insensitive {
+    color: @insensitive_fg_color;
+}
+
+.button:insensitive:backdrop {
+    color: @unfocused_insensitive_fg_color;
+}
+
+.button:active {
+    color: @button_active_text;
+}
+
+.button:active:insensitive {
+    color: @insensitive_fg_color;
+}
+
+.button:active:backdrop,
+.button:active:insensitive:backdrop {
+    color: @theme_unfocused_bg_color;
+}
+
 .primary-toolbar .button *:active,
 .inline-toolbar .button *:active,
 .button *:active {
-    color: @button_active_text;
     text-shadow: 0 1px @button_active_text_shadow;
 }
 
 .button *:insensitive,
 .button *:active:insensitive {
-    color: @insensitive_fg_color;
     text-shadow: none;
 }
 
-.button *:insensitive:backdrop {
-    color: @unfocused_insensitive_fg_color;
-}
-
 .button *:active:backdrop,
 .button *:active:insensitive:backdrop {
-    color: @theme_unfocused_bg_color;
     text-shadow: none;
     icon-shadow: none;
 }