[gnome-themes-standard] Widget theme: some more fixes for latest gtk+ changes, not there yet.

[Lapo Calamandrei <lapo src gnome org>]

commit 068acf65272ff3726bd49b20e7fa004dfe7be47a
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Tue Jan 10 18:21:17 2012 +0100

    Widget theme: some more fixes for latest gtk+ changes, not there yet.

 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   38 +++++++-----------
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   16 ++++----
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   42 ++++----------------
 3 files changed, 30 insertions(+), 66 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 9c6a2bc..074098f 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -18,13 +18,12 @@
 /* Pushed button background */
 .button:active, 
 .button:active:hover, 
-.button:active:focus,
-.button:active:hover:focus,
 .toolbar .button:active,
 .toolbar .button:active:hover,
-.toolbar .button:active:focus,
-.toolbar .button:active:hover:focus,
-/*.primary-toolbar .button:active:focus, */
+.primary-toolbar .button.raised:active,
+.primary-toolbar .raised .button:active,
+.primary-toolbar .button.raised:active:hover,
+.primary-toolbar .raised .button:active:hover,
 .trough,
 .trough.highlight,
 .trough row,
@@ -47,12 +46,8 @@
 /* Primary and inline toolbars pushed button background */
 .primary-toolbar .button:active,
 .primary-toolbar .button:active:hover,
-.primary-toolbar .button:active:focus,
-.primary-toolbar .button:active:focus:hover,
 .inline-toolbar .button:active,
-.inline-toolbar .button:active:hover,
-.inline-toolbar .button:active:focus,
-.inline-toolbar .button:active:focus:hover {
+.inline-toolbar .button:active:hover {
     background-image: -gtk-gradient (linear,
     				     left top, left bottom,
                                      from (shade(@borders, 0.95)),
@@ -62,15 +57,10 @@
 
 /* Prelit button background */
 .button:hover,
-.button:hover:focus,
 .toolbar .button:hover,
-.toolbar .button:hover:focus,
 .primary-toolbar .button.raised:hover,
-.primary-toolbar .button.raised:hover:focus,
 .primary-toolbar .raised .button:hover,
-.primary-toolbar .raised .button:hover:focus,
-.primary-toolbar GtkComboBox .button:hover,
-.primary-toolbar GtkComboBox .button:hover:focus {
+.primary-toolbar GtkComboBox .button:hover {
     background-color: transparent;
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
@@ -78,8 +68,7 @@
 				     to (@button_hover_gradient_color_b));
 }
 
-.primary-toolbar .button:hover,
-.primary-toolbar .button:hover:focus {
+.primary-toolbar .button:hover {
     background-color: transparent;
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
@@ -144,12 +133,12 @@
 .entry,
 GtkComboBox.combobox-entry .button,
 GtkComboBox.combobox-entry .button:hover,
-GtkComboBox.combobox-entry .button:focus,
-GtkComboBox.combobox-entry .button:hover:focus,
+/*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:hover /*,
 .primary-toolbar GtkComboBox.combobox-entry .button:focus
-.primary-toolbar GtkComboBox.combobox-entry .button:hover:focus {
+.primary-toolbar GtkComboBox.combobox-entry .button:hover:focus */ {
 /*    background-image: -gtk-gradient(linear,
                                     left top, left bottom,
                                     from(@entry_background_a),
@@ -168,10 +157,11 @@ GtkComboBox.combobox-entry .button:hover:focus,
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,
 GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:focus,
+/*GtkComboBox.combobox-entry .button:active:focus, */
 .spinbutton .button:active,
-.spinbutton .button:active:focus,
 .spinbutton .button:active:hover,
+/*.spinbutton .button:active:focus,
+.spinbutton .button:active:hover, */
 column-header.button:active,
 column-header .button:active,
 column-header.button:active:hover,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 2d83f0c..64c13cf 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -4,9 +4,9 @@
 .entry,
 GtkComboBox.combobox-entry .entry,
 GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:focus,
+/*GtkComboBox.combobox-entry .button:focus,
 GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:focus:active,
+GtkComboBox.combobox-entry .button:focus:active,*/
 .button:active,
 .button:active:hover,
 .button:insensitive,
@@ -50,17 +50,17 @@ GtkSwitch.trough:active {
 /* primary toolbar - generic element borders */
 .primary-toolbar .entry,
 .primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button /*,
 .primary-toolbar GtkComboBox.combobox-entry .button:hover,
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:active:focus,
 .primary-toolbar GtkComboBox.combobox-entry .button:active:hover,
 .primary-toolbar GtkComboBox.combobox-entry .button:active:hover:focus,
 .primary-toolbar GtkComboBox.combobox-entry .button:focus,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
-.primary-toolbar .button:active,
+.primary-toolbar GtkComboBox.combobox-entry .button:insensitive, */
+.primary-toolbar .button:active, /*
 .primary-toolbar .button:active:insensitive,
-.primary-toolbar .button:active:hover,
+.primary-toolbar .button:active:hover, */
 .primary-toolbar .button.raised:insensitive,
 .primary-toolbar .raised .button:insensitive,
 .inline-toolbar.toolbar .button:active,
@@ -84,8 +84,8 @@ GtkSwitch.trough:active {
 .primary-toolbar GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .button.raised:focus:active,
 .primary-toolbar .raised .button:focus:active,
-.primary-toolbar .button.raised:focus:active:hover,
-.primary-toolbar .raised .button:focus:active:hover,
+/*.primary-toolbar .button.raised:focus:active:hover,
+.primary-toolbar .raised .button:focus:active:hover,*/
 .primary-toolbar .button.raised.default:active,
 .primary-toolbar .raised .button.default:active,
 .inline-toolbar.toolbar .button:focus:active,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 3ea12b5..33c508a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -232,7 +232,8 @@ GtkTreeView .separator:backdrop,
 /*****************
  * GtkSpinButton *
  *****************/
-.spinbutton .button {
+.spinbutton .button,
+.spinbutton .button:focus {
     color: @internal_element_color;
     padding: 2 6;
     border-width: 0;
@@ -247,22 +248,7 @@ GtkTreeView .separator:backdrop,
     box-shadow: none;
 }
 
-.spinbutton .button:active,
-.spinbutton .button:focus,
-.spinbutton .button:active:focus,
-.spinbutton .button:insensitive,
-.spinbutton .button:backdrop {
-    border-image: none;
-    border-radius: 0;
-}
-
-.spinbutton .button,
-.spinbutton .button:hover,
-.spinbutton .button:focus,
-.spinbutton .button:focus:hover,
-.spinbutton .button:insensitive,
-.spinbutton .button:backdrop,
-.spinbutton .button:insensitive:backdrop {
+.spinbutton .button {
     background-color: transparent;
     background-image: none;
 }
@@ -281,24 +267,12 @@ GtkTreeView .separator:backdrop,
     color: @internal_element_prelight;
 }
 
-.spinbutton .button:first-child,
-.spinbutton .button:first-child:hover,
-.spinbutton .button:first-child:active,
-.spinbutton .button:first-child:focus,
-.spinbutton .button:first-child:active:focus,
-.spinbutton .button:first-child:insensitive,
-.spinbutton .button:first-child:backdrop {
+.spinbutton .button:first-child {
     border-radius: 2 0 0 2;
     box-shadow: none;
 }
 
-.spinbutton .button:last-child,
-.spinbutton .button:last-child:hover,
-.spinbutton .button:last-child:active,
-.spinbutton .button:last-child:focus,
-.spinbutton .button:last-child:active:focus,
-.spinbutton .button:last-child:insensitive,
-.spinbutton .button:last-child:backdrop {
+.spinbutton .button:last-child {
     border-radius: 0 2 2 0;
 }
 
@@ -551,7 +525,7 @@ GtkComboBox.combobox-entry .button {
 
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 .primary-toolbar .button,
-.primary-toolbar .button:focus,
+/*.primary-toolbar .button:focus,*/
 .primary-toolbar .button:insensitive,
 .primary-toolbar .button:backdrop,
 .primary-toolbar .button:insensitive:backdrop {
@@ -560,11 +534,11 @@ GtkComboBox.combobox-entry .button {
 }
 
 /* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button,
+.primary-toolbar .button /*,
 .primary-toolbar .button:hover,
 .primary-toolbar .button:focus,
 .primary-toolbar .button:insensitive,
-.primary-toolbar .button:backdrop {
+.primary-toolbar .button:backdrop */ {
     border-image: none;
 
     /* setting border-style: none; here would override the border-width values