[gnome-themes-standard] Widget theme: some initial gradients refresh.

[Lapo Calamandrei <lapo src gnome org>]

commit 7d3057504a858afd9154b7d9837f5c4e2bfa85ed
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Thu Dec 22 16:01:30 2011 +0100

    Widget theme: some initial gradients refresh.

 themes/Adwaita/gtk-3.0/gtk-dark.css                |   13 +++---
 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   41 +++++++++++---------
 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |    5 ++
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |    2 +
 themes/Adwaita/gtk-3.0/gtk.css                     |   23 ++++++++---
 5 files changed, 54 insertions(+), 30 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 4d970a0..02e07a0 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -95,14 +95,15 @@
 @define-color focused_entry_border @theme_selected_bg_color;
 @define-color focused_entry_inset alpha (@theme_selected_bg_color, 0.50);
 
- define-color toolbar_gradient_base #252624;
- define-color toolbar_gradient_step1 #323331;
- define-color toolbar_gradient_step2 #444642;
- define-color toolbar_gradient_final #51534f;
+ define-color toolbar_gradient_a shade(@theme_bg_color, 0.75);
+ define-color toolbar_gradient_b shade(@theme_bg_color, 0.8);
+ define-color toolbar_gradient_c shade(@theme_bg_color, 0.9);
 
 @define-color toolbar_active_button_color #222222;
- define-color toolbar_border_top #2e3436;
- define-color toolbar_border_bottom #5e605b;
+ define-color toolbar_border_top shade(@borders, 0.7);
+ define-color toolbar_border_bottom shade(@borders, 1.05);
+
+ define-color toolbar_button_prelight alpha(black, 0.3);
 
 @define-color primary_toolbar_entry_bg #ffffff;
 @define-color primary_toolbar_entry_fg #2e3436;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index f4b994e..973fccd 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -9,10 +9,9 @@
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
                                      from (@button_gradient_color_a),
-                                     color-stop (0.2, @button_gradient_color_a),
-                                     color-stop (0.8, @button_gradient_color_b),
                                      to (@button_gradient_color_b));
-   background-color: transparent;
+
+    background-color: transparent;
 }
 
 /* Pushed button background */
@@ -36,6 +35,14 @@
     background-color: transparent; 
 }
 
+/* Flipped pushed button background for vertical progressbar through and the like */
+.trough.vertical {
+    background-image: -gtk-gradient (linear,
+    				     left top, right top,
+                                     from (@borders),
+				     to (shade(@theme_bg_color, 0.95)));
+}
+
 /* Primary and inline toolbars pushed button background */
 .primary-toolbar .button:active,
 .primary-toolbar .button:active:hover,
@@ -52,14 +59,6 @@
     background-color: transparent;
 }
 
-/* Flipped pushed button background for vertical progressbar through and the like */
-.trough.vertical {
-    background-image: -gtk-gradient (linear,
-    				     left top, right top,
-                                     from (@borders),
-				     to (shade(@theme_bg_color, 0.95)));
-}
-
 /* Prelit button background */
 .button:hover,
 .button:hover:focus,
@@ -83,9 +82,9 @@
     background-color: transparent;
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
-				     from (alpha (@theme_base_color, 0.0)),
-				     color-stop (0.54, alpha (shade (@theme_base_color, 0.92), 0.49)),
-			             to (alpha (@theme_base_color, 0.0)));
+				     from (alpha (@toolbar_button_prelight, 0)),
+				     color-stop (0.54, @toolbar_button_prelight),
+			             to (alpha (@toolbar_button_prelight, 0)));
 }
 
 /* Insensitive button background */
@@ -153,12 +152,12 @@ GtkComboBox.combobox-entry .button:hover:focus,
     background-image: -gtk-gradient(linear,
                                     left top, left bottom,
                                     from(@entry_background_a),
-                                    color-stop(0.20, @entry_background_b),
+                                    color-stop(0.15, @entry_background_b),
                                     color-stop(0.85, @entry_background_c),
                                     to(@entry_background_d));
 }
 
-/* ComboboxEntry pushed button background */
+/* Entry pushed button background */
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,
 GtkComboBox.combobox-entry .button:active,
@@ -212,13 +211,19 @@ GtkComboBox.combobox-entry .button:insensitive:window-unfocused {
 .primary-toolbar.toolbar,
 .inline-toolbar.toolbar  {
     background-color: transparent;
-    background-image: -gtk-gradient (linear,
+/*   background-image: -gtk-gradient (linear,
 				     left top,
 				     left bottom,
 				     from (@toolbar_gradient_base),
 				     color-stop (0.16, @toolbar_gradient_step1),
 				     color-stop (0.90, @toolbar_gradient_step2),
-				     to (@toolbar_gradient_final));
+				     to (@toolbar_gradient_final));*/
+   background-image: -gtk-gradient (linear,
+				     left top,
+				     left bottom,
+				     from (@toolbar_gradient_a),
+				     color-stop (0.50, @toolbar_gradient_b),
+				     to (@toolbar_gradient_c));
 }
 
 /* Unfocused window primary and inline toolbars background */
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 2c44386..3ca8a8e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -105,3 +105,8 @@ GtkSwitch.slider {
 .scrollbar.trough.horizontal {
     box-shadow: none;
 }
+
+.primary-toolbar .toolbar,
+.primary-toolbar.toolbar {
+    box-shadow: 0 3 inset alpha(black, 0.05), 0 2 inset alpha(black, 0.05), 0 1 inset alpha(black, 0.05);
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 954e96e..5e125b1 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1593,6 +1593,7 @@ GtkCheckButton:selected:focus {
 
     -GtkWidget-window-dragging: true;
     -GtkToolbar-button-relief: normal;
+    box-shadow: 0 3 inset alpha(black, 0.02), 0 2 inset alpha(black, 0.02), 0 1 inset alpha(black, 0.02);
 }
 
 .primary-toolbar .toolbar:insensitive,
@@ -1606,6 +1607,7 @@ GtkCheckButton:selected:focus {
 .primary-toolbar .toolbar:window-unfocused,
 .primary-toolbar.toolbar:window-unfocused {
     border-color: @unfocused_borders;
+    box-shadow: none;
 }
 
 /* progressbars on primary toolbar entries are special */
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index f34372c..9592434 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -77,8 +77,8 @@
 @define-color focused_entry_border #579eea;
 @define-color focused_entry_inset alpha (#d7e4f1, 0.50);
 
- define-color button_gradient_color_a #f4f6f4;
- define-color button_gradient_color_b #d7dad7;
+ define-color button_gradient_color_a shade(@theme_bg_color, 1.05);
+ define-color button_gradient_color_b shade(@theme_bg_color, 0.94);
 @define-color borders #a7aba7;
 
 @define-color button_active_gradient_color_a #a2a9a2;
@@ -153,13 +153,24 @@
 @define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.05);
 @define-color notebook_tab_gradient_b @theme_bg_color;
 
- define-color toolbar_gradient_base #aaaa9e;
+/* define-color toolbar_gradient_base #aaaa9e;
 @define-color toolbar_gradient_step1 #bcbcb4;
 @define-color toolbar_gradient_step2 #d9d9d7;
- define-color toolbar_gradient_final #e5e5e2;
+ define-color toolbar_gradient_final #e5e5e2;*/
 
- define-color toolbar_border_top shade (@theme_bg_color, 0.56);
- define-color toolbar_border_bottom shade (@theme_bg_color, 0.83);
+/* define-color toolbar_gradient_base shade(@toolbar_gradient_step2, 0.9);
+ define-color toolbar_gradient_step1 shade(@toolbar_gradient_step2, 0.95);
+ define-color toolbar_gradient_step2 #babdb6;
+ define-color toolbar_gradient_final shade(@toolbar_gradient_step2, 1.15);*/
+
+ define-color toolbar_gradient_a shade(@borders, 1.15);
+ define-color toolbar_gradient_b shade(@borders, 1.25);
+ define-color toolbar_gradient_c shade(@borders, 1.3);
+
+ define-color toolbar_border_top shade(@borders, 0.9); /*shade (@theme_bg_color, 0.7);*/
+ define-color toolbar_border_bottom shade(@borders, 1.1); /*shade (@theme_bg_color, 0.7);*/
+
+ define-color toolbar_button_prelight alpha(white, 0.4);
 
 @define-color toolbar_active_button_color #909081;