[gnome-themes-standard] gtk3: fix propagation for insensitive colors

[Cosimo Cecchi <cosimoc src gnome org>]

commit 5362ef1a25499e6b266fcb5c86786113a5c4ab0f
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Aug 20 01:47:52 2013 +0200

    gtk3: fix propagation for insensitive colors
    
    Since 30609ba766dd055f41002dcb813225d619b1d951 we stopped using
    wildcard selectors to propagate insensitive state colors. Turns out that
    part of the commit was wrong, as typically the insensitive state is set
    on a widget down the hierarchy, and not the toplevel, so relying on
    inheritance from .background won't work.
    
    This commit partially reverts some of the changes from
    30609ba766dd055f41002dcb813225d619b1d951 to make insensitive colors work
    correctly again.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=706009

 themes/Adwaita/gtk-3.0/gnome-applications.css |    4 +-
 themes/Adwaita/gtk-3.0/gtk-widgets.css        |   31 +++++++++++-------------
 2 files changed, 16 insertions(+), 19 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index a6aa3ca..f9fe6e5 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -97,8 +97,8 @@ NautilusToolbar .button:active {
 }
 
 NautilusToolbar .button:insensitive,
-NautilusToolbar .button:active:insensitive {
-    text-shadow: none;
+NautilusToolbar .button:active *:insensitive {
+    icon-shadow: none;
 }
 
 NautilusQueryEditor .primary-toolbar.toolbar {
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 53c5dfd..e750982 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -61,10 +61,6 @@
     background-color: @theme_bg_color;
 }
 
-.background:insensitive {
-    color: @insensitive_fg_color;
-}
-
 .background:backdrop {
     /* I want everything nice and flat in the unfocused window */
     text-shadow: none;
@@ -73,13 +69,6 @@
     color: @theme_unfocused_fg_color;
 }
 
-.background:insensitive:backdrop {
-    /* I want everything nice and flat in the unfocused window */
-    text-shadow: none;
-    icon-shadow: none;
-    color: @unfocused_insensitive_fg_color;
-}
-
 /* FIXME: why do we still need this? */
 GtkClutterOffscreen {
     background-color: @theme_bg_color;
@@ -100,9 +89,17 @@ GtkClutterOffscreen {
 
 *:insensitive {
     background-color: @insensitive_bg_color;
+    color: @insensitive_fg_color;
     border-color: @insensitive_borders;
 }
 
+*:insensitive:backdrop {
+    /* I want everything nice and flat in the unfocused window */
+    text-shadow: none;
+    icon-shadow: none;
+    color: @unfocused_insensitive_fg_color;
+}
+
 .gtkstyle-fallback {
     background-color: @theme_bg_color;
     color: @theme_fg_color;
@@ -1208,7 +1205,7 @@ GtkComboBox.combobox-entry .button {
 }
 
 .button:insensitive,
-.button:active:insensitive {
+.button:active *:insensitive {
     color: @insensitive_fg_color;
     text-shadow: none;
 }
@@ -1218,7 +1215,7 @@ GtkComboBox.combobox-entry .button {
 }
 
 .button:active:backdrop,
-.button:active:insensitive:backdrop {
+.button:active:backdrop *:insensitive {
     color: @theme_unfocused_bg_color;
     text-shadow: none;
     icon-shadow: none;
@@ -2863,9 +2860,9 @@ GtkOverlay.osd {
 }
 
 .osd.button:insensitive,
-.osd.button:insensitive:active,
+.osd.button:active *:insensitive,
 .osd .button:insensitive,
-.osd .button:insensitive:active {
+.osd .button:active *:insensitive {
     color: @osd_button_fg_insensitive;
     text-shadow: none;
     icon-shadow: none;
@@ -2873,10 +2870,10 @@ GtkOverlay.osd {
 
 .osd.button:backdrop,
 .osd.button:backdrop:insensitive,
-.osd.button:backdrop:insensitive:active,
+.osd.button:backdrop:active *:insensitive,
 .osd .button:backdrop,
 .osd .button:backdrop:insensitive,
-.osd .button:backdrop:insensitive:active {
+.osd .button:backdrop:active *:insensitive {
     color: @osd_button_fg_backdrop;
     text-shadow: none;
     icon-shadow: none;