[gnome-themes-standard/lapo-work] Widget theme: Progressbars refresh.

[Lapo Calamandrei <lapo src gnome org>]

commit 4f3a2fe91ce6299d18da13c03b863cd87bcab201
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Mon Nov 21 12:39:23 2011 +0100

    Widget theme: Progressbars refresh.

 .../gtk-3.0/assets/progressbar-border-vertical.svg |   98 --------------------
 .../Adwaita/gtk-3.0/assets/progressbar-border.svg  |   97 -------------------
 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   11 ++
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   24 +----
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   52 ++++-------
 themes/Adwaita/gtk-3.0/gtk.css                     |    4 +-
 6 files changed, 35 insertions(+), 251 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 58fd9aa..1d89707 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -40,6 +40,9 @@
 .toolbar .button:active,
 .toolbar .button:hover:active,
 .primary-toolbar .button:active:focus,
+.trough,
+.trough row,
+.trough row:hover,
 GtkSwitch.trough {
     background-image: -gtk-gradient (linear,
     				     left top, left bottom,
@@ -47,6 +50,14 @@ GtkSwitch.trough {
 				     to (alpha (@button_active_gradient_color_b, 0.13)));
 }
 
+/* Flipped pushed button background for vertical progressbar through and the like */
+.trough.vertical {
+    background-image: -gtk-gradient (linear,
+    				     left top, right top,
+                                     from (@button_active_gradient_color_a),
+				     to (alpha (@button_active_gradient_color_b, 0.13)));
+}
+
 /* Pushed buttons background for window unfocused state */
 .button:active:window-unfocused,
 .button:hover:active:window-unfocused,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 5617507..acbcf23 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -8,6 +8,9 @@ GtkComboBox.combobox-entry .button:focus,
 .button:active,
 .button:active:hover,
 .button:insensitive,
+.trough,
+.trough row,
+.trough row:hover,
 GtkSwitch.trough,
 GtkSwitch.trough:insensitive {
     border-image: url("borders/generic-border.svg") 3 3 4 3 / 3 3 4 3 stretch;
@@ -131,27 +134,6 @@ GtkScale.progressbar.vertical {
     border-image: url("assets/trough-active-border-vertical.svg") 2 / 2 stretch;
 }
 
-/*GtkSwitch.slider {
-    border-image: url("assets/switch-slider-border.svg") 2 / 2 stretch;
-}
-
-GtkSwitch.slider:active {
-    border-image: url("assets/switch-slider-active-border.svg") 2 / 2 stretch;
-}*/
-
-.progressbar,
-.entry.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-    border-image: url("assets/progressbar-border.svg") 3 / 3 stretch;
-}
-
-.progressbar.vertical {
-    border-image: url("assets/progressbar-border-vertical.svg") 3 / 3 stretch;
-}
-
 /* generic element borders for :window-unfocused */
 .entry:window-unfocused,
 GtkComboBox.combobox-entry .entry:window-unfocused,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 2227ad2..79e1e29 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -237,62 +237,44 @@ GtkTreeView .separator,
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (@progressbar_background_a),
-                                     to (@progressbar_background_b));
+                                     color-stop (0.75, @progressbar_background_b),
+                                     to (shade(@progressbar_background_a, 0.85)));
 
     border-radius: 3;
     border-width: 1;
-    border-style: none;
-    /* border-image defined in the -assets variant */
+    border-style: solid;
+    border-color: @progressbar_border;
+    box-shadow: 1 1 alpha(white, 0.2) inset, -1 -1 alpha(white, 0.1) inset;
 
     -adwaita-progressbar-pattern: -gtk-gradient (linear,
                                                  left top, right bottom,
                                                  from (alpha (@progressbar_pattern, 0.00)),
                                                  color-stop (0.49, alpha (@progressbar_pattern, 0.00)),
-                                                 color-stop (0.50, alpha (@progressbar_pattern, 0.10)),
-                                                 to (alpha (@progressbar_pattern, 0.10)));
+                                                 color-stop (0.50, alpha (@progressbar_pattern, 0.25)),
+                                                 to (alpha (@progressbar_pattern, 0.25)));
 }
 
 .progressbar.vertical {
     background-image: -gtk-gradient (linear,
                                      left top, right top,
                                      from (@progressbar_background_a),
-                                     to (@progressbar_background_b));
+                                     color-stop (0.75, @progressbar_background_b),
+                                     to (shade(@progressbar_background_a, 0.85)));
 
     -adwaita-progressbar-pattern: -gtk-gradient (linear,
                                                  left bottom, right top,
                                                  from (alpha (@progressbar_pattern, 0.00)),
                                                  color-stop (0.49, alpha (@progressbar_pattern, 0.00)),
-                                                 color-stop (0.50, alpha (@progressbar_pattern, 0.10)),
-                                                 to (alpha (@progressbar_pattern, 0.10)));
+                                                 color-stop (0.50, alpha (@progressbar_pattern, 0.25)),
+                                                 to (alpha (@progressbar_pattern, 0.25)));
 }
 
 /* through component */
 GtkProgressBar,
 .trough row {
-    padding: 0;
-    -GtkProgressBar-xspacing: 22;
-    -GtkProgressBar-yspacing: 22;
-}
-
-.trough,
-.trough row,
-.trough row:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@trough_bg_color_a),
-                                     to (@trough_bg_color_b));
-
-    border-width: 1;
-    border-style: solid;
-    border-radius: 3;
-    border-color: shade (@inactive_frame_color, 0.8);
-}
-
-.trough.vertical {
-    background-image: -gtk-gradient (linear,
-                                     left top, right top,
-                                     from (@trough_bg_color_a),
-                                     to (@trough_bg_color_b));
+    padding: 0 0 1 0;
+    -GtkProgressBar-xspacing: 20;
+    -GtkProgressBar-yspacing: 20;
 }
 
 .trough row:selected,
@@ -657,7 +639,7 @@ GtkPathBar .button:focus:active:only-child {
  * tabs          *
  *****************/
 .notebook {
-    padding: 2;
+    padding: 1;
 
     border-color: @notebook_border;
     border-style: solid;
@@ -864,6 +846,7 @@ GtkComboBox .button *:prelight {
     background-color: shade (@theme_bg_color, 0.882);
     border-width: 0;
     border-radius: 0;
+    border-image: none;
 }
 
 .scrollbar.slider,
@@ -1527,7 +1510,8 @@ GtkCalendar.highlight {
     color: @error_fg_color;
 }
 
-.dim-label {
+.dim-label,
+.dim-label:prelight{
     color: mix (@theme_fg_color, @theme_bg_color, 0.50);
 }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index b62d15b..30f6a50 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -94,7 +94,9 @@
 
 @define-color progressbar_background_a #76b0ec;
 @define-color progressbar_background_b #1f72c6;
- define-color progressbar_pattern #000000;
+/* define-color progressbar_pattern #000000;*/
+ define-color progressbar_pattern @switch_slider_active_border;
+ define-color progressbar_border @switch_slider_active_border;
 
 @define-color entry_text_color @theme_text_color;