[gnome-themes-standard] Widget theme: correct background for focused pushed buttons and switch tweaks.

[Lapo Calamandrei <lapo src gnome org>]

commit 57b339e9f09116f27403fdff15667aebab80d494
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Sun Dec 18 19:03:55 2011 +0100

    Widget theme: correct background for focused pushed buttons and switch tweaks.

 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   10 +++++++---
 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |    4 +---
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |    9 +++------
 3 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index e51eb7a..c5c037e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -16,10 +16,14 @@
 }
 
 /* Pushed button background */
-.button:active,
-.button:hover:active,
+.button:active, 
+.button:active:hover, 
+.button:active:focus,
+.button:active:hover:focus,
 .toolbar .button:active,
-.toolbar .button:hover:active,
+.toolbar .button:active:hover,
+.toolbar .button:active:focus,
+.toolbar .button:active:hover:focus,
 /*.primary-toolbar .button:active:focus, */
 .trough,
 .trough.highlight,
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 8f56247..7404616 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -93,9 +93,7 @@ GtkSwitch.slider {
                                      to (@switch_slider_color));
 
     -adwaita-switch-grip-color: shade (@switch_slider_color, 0.9);
-}
-
-GtkSwitch.slider {
     border-color: mix (@button_border, black, 0.4);
     box-shadow: 0 -1 inset alpha(white, 0.04), 0 1 inset shade(@theme_bg_color, 1.1), 0 2 inset alpha(@button_border, 0.2);
 }
+
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 853c41e..94f336c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1498,6 +1498,8 @@ GtkTreeMenu .menuitem * {
 .radio:active,
 .check:active,
 .radio:insensitive,
+.radio:active:hover,
+.check:active:hover,
 .check:insensitive,
 .radio:selected:hover,
 .check:selected:hover {
@@ -1663,11 +1665,6 @@ GtkSwitch.trough:active {
     color: @switch_trough_active_color;
 }
 
-/*GtkSwitch.trough:insensitive {
-    background-image: none;
-    background-color: shade (@theme_bg_color, 0.9);
-}*/
-
 GtkSwitch.trough:insensitive {
     background-image: none;
     background-color: @insensitive_bg_color;
@@ -1714,7 +1711,7 @@ GtkSwitch.slider:insensitive {
 }
 
 GtkSwitch.slider:insensitive {
-    border-color: @insensitive_border_color;
+    border-color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5);
 }
 
 GtkSwitch.slider:window-unfocused {