Merge branch 'testing'

1 files changed, 27 insertions, 10 deletions

diff --git a/common/gnome-shell/3.16/sass/_drawing.scss b/common/gnome-shell/3.16/sass/_drawing.scss
index 0e60551..03b9f15 100644
--- a/common/gnome-shell/3.16/sass/_drawing.scss
+++ b/common/gnome-shell/3.16/sass/_drawing.scss
@@ -34,6 +34,24 @@
     background-color: mix($entry_bg, $bg_color, 55%);
     border-color: 1px solid mix($entry_border, $bg_color, 55%);
   }
+
+  @if $t==osd {
+    color: $osd_fg_color;
+    background-color: transparentize(black, 0.8);
+    border: 1px solid transparentize(black, 0.6);
+  }
+
+  @if $t==osd-focus {
+    color: $osd_fg_color;
+    background-color: transparentize(black, 0.8);
+    border: 1px solid $selected_bg_color;
+  }
+
+  @if $t==osd-insensitive {
+    color: $osd_insensitive_fg_color;
+    background-color: transparentize(black, 0.9);
+    border-color: 1px solid transparentize(black, 0.6);
+  }
 }
 
 // Buttons
@@ -105,19 +123,18 @@
   //
   // normal osd button
   //
-    color: lighten($osd_fg_color, 10%);
-    outline-color: transparentize($osd_fg_color, 0.7);
-    border-color: transparentize($osd_fg_color, 0.7);
-    background-color: darken($osd_bg_color, 5%);
+    color: $osd_fg_color;
+    border: 1px solid transparentize(black, 0.55);
+    background-color: transparentize(black, 0.7);
   }
 
   @else if $t==osd-hover {
   //
   // active osd button
   //
-    color: $selected_fg_color;
-    border-color: $selected_bg_color;
-    background-color: darken($osd_bg_color, 5%);
+    color: $osd_fg_color;
+    border: 1px solid $selected_bg_color;
+    background-color: transparentize(black, 0.7);
   }
 
   @else if $t==osd-active {
@@ -125,7 +142,7 @@
   // active osd button
   //
     color: $selected_fg_color;
-    border-color: $selected_bg_color;
+    border: 1px solid $selected_bg_color;
     background-color: $selected_bg_color;
   }
 
@@ -134,7 +151,7 @@
   // insensitive osd button
   //
     color: $osd_insensitive_fg_color;
-    border-color: transparentize($osd_fg_color, 0.8);
-    background-image: $osd_insensitive_bg_color;
+    border: 1px solid transparentize(black, 0.55);
+    background-color: transparentize(black, 0.85);
   }
 }