Merge branch 'testing'

1 files changed, 19 insertions, 21 deletions

diff --git a/common/gtk-3.0/3.14/_drawing.scss b/common/gtk-3.0/3.14/_drawing.scss
index dd32535..378e5d9 100644
--- a/common/gtk-3.0/3.14/_drawing.scss
+++ b/common/gtk-3.0/3.14/_drawing.scss
@@ -85,34 +85,32 @@
     background-image: linear-gradient(to bottom, transparentize($_header_entry_bg, 0.35));
   }
 
-  @if $t==osd {
-    color: $osd_text_color;
-    border-color: $osd_borders_color;
-    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
-    background-clip: padding-box;
-
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
+  @else if $t==osd {
+  //
+  // normal osd button
+  //
+    color: $osd_fg_color;
+    border-color: transparentize($osd_fg_color, 0.7);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
   }
 
-  @if $t==osd-focus {
-    color: $osd_text_color;
+  @else if $t==osd-focus {
+  //
+  // active osd button
+  //
+    color: $selected_bg_color;
     border-color: $selected_bg_color;
-    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
-    background-clip: padding-box;
-
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
   }
 
-  @if $t==osd-insensitive {
+  @else if $t==osd-insensitive {
+  //
+  // insensitive osd button
+  //
     color: $osd_insensitive_fg_color;
-    border-color: $osd_borders_color;
+    border-color: transparentize($osd_fg_color, 0.8);
     background-image: linear-gradient(to bottom, $osd_insensitive_bg_color);
-    background-clip: padding-box;
-
-    text-shadow: none;
-    icon-shadow: none;
   }
 }