button and entry drawing tweaks

1 files changed, 12 insertions, 8 deletions

diff --git a/common/gnome-shell/3.18/sass/_drawing.scss b/common/gnome-shell/3.18/sass/_drawing.scss
index 7cf8812..c074950 100644
--- a/common/gnome-shell/3.18/sass/_drawing.scss
+++ b/common/gnome-shell/3.18/sass/_drawing.scss
@@ -47,7 +47,7 @@
   @if $t==osd-focus {
     color: $selected_fg_color;
     background-color: $selected_bg_color;
-    border: 1px solid $selected_bg_color;
+    border: 1px solid $osd_entry_border;
     box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 
@@ -76,7 +76,7 @@
     color: $fg_color;
     background-color: $button_bg;
     border: 1px solid $button_border;
-    box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
+    box-shadow: inset 0 1px transparentize($button_bg, 0.95);
   }
 
   @else if $t==focus {
@@ -86,7 +86,7 @@
     color: $fg_color;
     background-color: $button_bg;
     border: 1px solid $selected_bg_color;
-    box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
+    box-shadow: inset 0 1px transparentize($button_bg, 0.95);
   }
 
   @else if $t==focus-hover {
@@ -96,7 +96,7 @@
     color: $fg_color;
     background-color: $button_bg;
     border: 1px solid $selected_bg_color;
-    box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
+    box-shadow: inset 0 1px transparentize($button_bg, 0.95);
   }
 
   @else if $t==hover {
@@ -106,7 +106,7 @@
     color: $fg_color;
     background-color: lighten($button_bg, 5%);
     border: 1px solid $button_border;
-    box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95);
+    box-shadow: inset 0 1px transparentize(lighten($button_bg, 5%), 0.95);
   }
 
   @else if $t==active {
@@ -115,7 +115,7 @@
   //
     color: $selected_fg_color;
     background-color: $selected_bg_color;
-    border: 1px solid $selected_bg_color;
+    border: 1px solid if($variant=='light', $selected_bg_color, $button_border);
     box-shadow: inset 0 1px transparentize($selected_bg_color, 0.95);
   }
 
@@ -126,7 +126,7 @@
     color: $insensitive_fg_color;
     border: 1px solid transparentize($button_border, 0.45);
     background-color: transparentize($button_bg, 0.45);
-    box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
+    box-shadow: inset 0 1px transparentize($button_bg, 0.95);
   }
 
   @else if $t==osd {
@@ -136,6 +136,7 @@
     color: $osd_fg_color;
     border: 1px solid $osd_button_border;
     background-color: $osd_button_bg;
+    box-shadow: inset 0 1px transparentize(black, 0.95);
   }
 
   @else if $t==osd-hover {
@@ -145,6 +146,7 @@
     color: $osd_fg_color;
     border: 1px solid $osd_button_border;
     background-color: opacify(lighten($osd_button_bg, 7%), 0.1);
+    box-shadow: inset 0 1px transparentize(black, 0.95);
   }
 
   @else if $t==osd-active {
@@ -152,8 +154,9 @@
   // active osd button
   //
     color: $selected_fg_color;
-    border: 1px solid $selected_bg_color;
+    border: 1px solid $osd_button_border;
     background-color: $selected_bg_color;
+    box-shadow: inset 0 1px transparentize($selected_bg_color, 0.95);
   }
 
   @else if $t==osd-insensitive {
@@ -163,5 +166,6 @@
     color: $osd_insensitive_fg_color;
     border: 1px solid $osd_button_border;
     background-color: transparentize($osd_button_bg, 0.15);
+    box-shadow: inset 0 1px transparentize(black, 0.95);
   }
 }