[gnome-themes-standard] osd: improve OSD theming for scales, add shadows

[Cosimo Cecchi <cosimoc src gnome org>]

commit 3880f60d8ee2c44dbdcae8f713c63361afa8e8b9
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Apr 19 20:32:58 2012 -0400

    osd: improve OSD theming for scales, add shadows

 themes/Adwaita/gtk-3.0/gtk-main-common.css |    9 ++++-
 themes/Adwaita/gtk-3.0/gtk-widgets.css     |   53 +++++++++++++++++++---------
 2 files changed, 44 insertions(+), 18 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-common.css b/themes/Adwaita/gtk-3.0/gtk-main-common.css
index 7ca574a..3bbe2ea 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-common.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-common.css
@@ -10,8 +10,13 @@
 @define-color osd_fg #ededed;
 @define-color osd_bg alpha(@osd_base, 0.80);
 
+ define-color osd_text_shadow alpha(black, 0.75);
+
+ define-color osd_active_fg shade(@osd_fg, 1.10);
+
 @define-color osd_toolbar_bg_a alpha(@osd_base, 0.80);
 @define-color osd_toolbar_bg_b alpha(#101010, 0.80);
+ define-color osd_toolbar_bg_c alpha(shade(@osd_base, 1.02), 0.80);
 
 @define-color osd_button_bg_a alpha(@osd_highlight, 0.16);
 @define-color osd_button_bg_b alpha(@osd_lowlight, 0.05);
@@ -25,8 +30,10 @@
 @define-color osd_button_bg_active_b alpha(@osd_highlight, 0.23);
 @define-color osd_button_bg_active_c alpha(@osd_lowlight, 0.17);
 
- define-color osd_button_border alpha(@osd_highlight, 0.50);
+ define-color osd_button_border alpha(@osd_highlight, 0.40);
 @define-color osd_button_fg shade(@osd_fg, 0.80);
 @define-color osd_button_inset shade(@osd_fg, 0.67);
 
+ define-color osd_button_shadow alpha(black, 0.35);
+
 @define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index dd4db04..f580ea8 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1935,6 +1935,8 @@ GtkCheckButton:selected:focus {
 .osd {
     color: @osd_fg;
     background-color: @osd_bg;
+
+    text-shadow: 0 1px @osd_text_shadow;
 }
 
 .osd.toolbar {
@@ -1945,13 +1947,13 @@ GtkCheckButton:selected:focus {
     background-image: -gtk-gradient(linear, left top, left bottom,
                                     from(@osd_toolbar_bg_a),
                                     color-stop(0.63, @osd_toolbar_bg_b),
-                                    to(@osd_toolbar_bg_a));
+                                    to(@osd_toolbar_bg_c));
     background-color: transparent;
 
     -GtkToolbar-button-relief: normal;
 }
 
-.osd.toolbar .button {
+.osd .button {
     padding: 4px;
 
     background-image: -gtk-gradient(linear, left top, left bottom,
@@ -1966,31 +1968,31 @@ GtkCheckButton:selected:focus {
 
     color: @osd_button_fg;
 
-    text-shadow: none;
-    icon-shadow: none;
+    text-shadow: 0 -1px @osd_button_shadow;
+    icon-shadow: 0 -1px @osd_button_shadow;
     box-shadow: inset -1px 0 @osd_button_inset;
 }
 
-.osd.toolbar .button,
-.osd.toolbar .button:prelight,
-.osd.toolbar .button:active {
+.osd .button,
+.osd .button:prelight,
+.osd .button:active {
     background-color: transparent;
 }
 
-.osd.toolbar .button:nth-child(first) {
+.osd .button:nth-child(first) {
     border-radius: 4px 0 0 4px;
     border-left-width: 1px;
     box-shadow: inset -1px 0 @osd_button_inset;
 }
 
-.osd.toolbar .button:nth-child(last) {
+.osd .button:nth-child(last) {
     box-shadow: none;
     border-radius: 0 4px 4px 0;
     border-right-width: 1px;
 }
 
-.osd.toolbar GtkToolButton .button,
-.osd.toolbar .button:only-child {
+.osd GtkToolButton .button,
+.osd .button:only-child {
     border-width: 1px;
     border-radius: 4px;
     border-style: solid;
@@ -1998,23 +2000,32 @@ GtkCheckButton:selected:focus {
     box-shadow: none;
 }
 
-.osd.toolbar .separator {
-    color: @osd_button_inset;
+.osd .separator {
+    color: shade(@osd_lowlight, 0.80);
 }
 
-.osd.toolbar .button:hover {
+.osd .button:hover {
     background-image: -gtk-gradient(linear, left top, left bottom,
                                     from(@osd_button_bg_hover_a),
                                     color-stop(0.68, @osd_button_bg_hover_b),
                                     to(@osd_button_bg_hover_c));
 }
 
-.osd.toolbar .button *:hover {
+.osd .button *:hover {
     color: shade(@osd_button_fg, 1.20);
 }
 
-.osd.toolbar .button:active,
-.osd.toolbar .button:active:hover {
+.osd .button *:hover:active,
+.osd .button *:active {
+    color: @osd_active_fg;
+}
+
+.osd .button *:insensitive {
+    color: shade(@osd_button_fg, 0.75);
+}
+
+.osd .button:active,
+.osd .button:active:hover {
     background-image: -gtk-gradient(linear, left top, left bottom,
                                     from(@osd_button_bg_active_a),
                                     color-stop(0.68, @osd_button_bg_active_b),
@@ -2025,6 +2036,14 @@ GtkCheckButton:selected:focus {
     background-color: @osd_trough_bg;
 }
 
+.osd GtkScale.trough {
+    border-color: @osd_button_border;
+    background-image: -gtk-gradient(linear, left top, left bottom,
+                                    from(shade(@osd_button_border, 0.70)),
+                                    to(shade(@osd_button_border, 0.90)));
+    background-color: transparent;
+}
+
 .osd.progressbar {
     background-color: @osd_fg;
 }