button and entry drawing tweaks

4 files changed, 91 insertions, 63 deletions

diff --git a/common/gnome-shell/3.16/gnome-shell-dark.css b/common/gnome-shell/3.16/gnome-shell-dark.css
index 8d1fc4c..e85a580 100644
--- a/common/gnome-shell/3.16/gnome-shell-dark.css
+++ b/common/gnome-shell/3.16/gnome-shell-dark.css
@@ -34,35 +34,35 @@ stage {
   color: #D3DAE3;
   background-color: #444a58;
   border: 1px solid #2b2e39;
-  box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
+  box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); }
   .button:focus, .notification-banner .notification-button:focus,
   .hotplug-notification-item:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
     border: 1px solid #5294E2;
-    box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
+    box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); }
   .button:hover, .notification-banner .notification-button:hover,
   .hotplug-notification-item:hover {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #505666;
     border: 1px solid #2b2e39;
-    box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); }
+    box-shadow: inset 0 1px rgba(80, 86, 102, 0.05); }
   .button:hover:focus, .notification-banner .notification-button:hover:focus,
   .hotplug-notification-item:hover:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
     border: 1px solid #5294E2;
-    box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
+    box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); }
   .button:active, .notification-banner .notification-button:active,
   .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus,
   .hotplug-notification-item:active:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
     background-color: #5294E2;
-    border: 1px solid #5294E2;
+    border: 1px solid #2b2e39;
     box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
   .button:insensitive, .notification-banner .notification-button:insensitive,
   .hotplug-notification-item:insensitive {
@@ -70,30 +70,34 @@ stage {
     color: rgba(211, 218, 227, 0.45);
     border: 1px solid rgba(43, 46, 57, 0.55);
     background-color: rgba(68, 74, 88, 0.55);
-    box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
+    box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); }
 
 .modal-dialog-button-box .button {
   text-shadow: 0 1px rgba(64, 69, 82, 0);
   color: #BAC3CF;
   border: 1px solid rgba(26, 28, 34, 0.35);
-  background-color: rgba(102, 109, 132, 0.35); }
+  background-color: rgba(102, 109, 132, 0.35);
+  box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .modal-dialog-button-box .button:hover {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #BAC3CF;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(119, 127, 151, 0.45); }
+    background-color: rgba(119, 127, 151, 0.45);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .modal-dialog-button-box .button:focus {
     color: #5294E2; }
   .modal-dialog-button-box .button:active {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
-    border: 1px solid #5294E2;
-    background-color: #5294E2; }
+    border: 1px solid rgba(26, 28, 34, 0.35);
+    background-color: #5294E2;
+    box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
   .modal-dialog-button-box .button:insensitive {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #5d626e;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(102, 109, 132, 0.2); }
+    background-color: rgba(102, 109, 132, 0.2);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
 
 StEntry {
   padding: 7px;
@@ -767,14 +771,14 @@ StScrollBar {
     color: #D3DAE3;
     background-color: #505666;
     border: 1px solid #2b2e39;
-    box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); }
+    box-shadow: inset 0 1px rgba(80, 86, 102, 0.05); }
   .datemenu-today-button:active,
   .world-clocks-button:active,
   .message-list-section-title:active {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
     background-color: #5294E2;
-    border: 1px solid #5294E2;
+    border: 1px solid #2b2e39;
     box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
 
 .datemenu-today-button .date-label {
@@ -1235,12 +1239,14 @@ StScrollBar {
   text-shadow: 0 1px rgba(64, 69, 82, 0);
   color: #BAC3CF;
   border: 1px solid rgba(26, 28, 34, 0.35);
-  background-color: rgba(102, 109, 132, 0.35); }
+  background-color: rgba(102, 109, 132, 0.35);
+  box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .app-view-control:hover {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #BAC3CF;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(119, 127, 151, 0.45); }
+    background-color: rgba(119, 127, 151, 0.45);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .app-view-control:checked {
     color: #ffffff;
     background-color: #5294E2; }
@@ -1560,22 +1566,26 @@ StScrollBar {
   text-shadow: 0 1px rgba(64, 69, 82, 0);
   color: #BAC3CF;
   border: 1px solid rgba(26, 28, 34, 0.35);
-  background-color: rgba(102, 109, 132, 0.35); }
+  background-color: rgba(102, 109, 132, 0.35);
+  box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .keyboard-key:hover {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #BAC3CF;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(119, 127, 151, 0.45); }
+    background-color: rgba(119, 127, 151, 0.45);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .keyboard-key:active, .keyboard-key:checked {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
-    border: 1px solid #5294E2;
-    background-color: #5294E2; }
+    border: 1px solid rgba(26, 28, 34, 0.35);
+    background-color: #5294E2;
+    box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
   .keyboard-key:grayed {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #5d626e;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(102, 109, 132, 0.2); }
+    background-color: rgba(102, 109, 132, 0.2);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
 
 .keyboard-subkeys {
   color: #BAC3CF;
@@ -1651,25 +1661,25 @@ StScrollBar {
       color: #D3DAE3;
       background-color: #444a58;
       border: 1px solid #2b2e39;
-      box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
+      box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); }
       .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
         text-shadow: 0 1px rgba(64, 69, 82, 0);
         color: #D3DAE3;
         background-color: #505666;
         border: 1px solid #2b2e39;
-        box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); }
+        box-shadow: inset 0 1px rgba(80, 86, 102, 0.05); }
       .login-dialog .modal-dialog-button:default:active {
         text-shadow: 0 1px rgba(64, 69, 82, 0);
         color: #ffffff;
         background-color: #5294E2;
-        border: 1px solid #5294E2;
+        border: 1px solid #2b2e39;
         box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
       .login-dialog .modal-dialog-button:default:insensitive {
         text-shadow: 0 1px rgba(64, 69, 82, 0);
         color: rgba(211, 218, 227, 0.45);
         border: 1px solid rgba(43, 46, 57, 0.55);
         background-color: rgba(68, 74, 88, 0.55);
-        box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
+        box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); }
 
 .login-dialog-logo-bin {
   padding: 24px 0px; }
@@ -1880,7 +1890,7 @@ StScrollBar {
   .lg-dialog StEntry:focus {
     color: #ffffff;
     background-color: #5294E2;
-    border: 1px solid #5294E2;
+    border: 1px solid rgba(26, 28, 34, 0.35);
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
 
 .lg-dialog .shell-link {
diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css
index a7f19aa..7c174b3 100644
--- a/common/gnome-shell/3.16/gnome-shell.css
+++ b/common/gnome-shell/3.16/gnome-shell.css
@@ -34,28 +34,28 @@ stage {
   color: #5c616c;
   background-color: #fbfbfc;
   border: 1px solid #cfd6e6;
-  box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
+  box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); }
   .button:focus, .notification-banner .notification-button:focus,
   .hotplug-notification-item:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294E2;
-    box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
+    box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); }
   .button:hover, .notification-banner .notification-button:hover,
   .hotplug-notification-item:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: white;
     border: 1px solid #cfd6e6;
-    box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
   .button:hover:focus, .notification-banner .notification-button:hover:focus,
   .hotplug-notification-item:hover:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294E2;
-    box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
+    box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); }
   .button:active, .notification-banner .notification-button:active,
   .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus,
   .hotplug-notification-item:active:focus {
@@ -70,30 +70,34 @@ stage {
     color: rgba(92, 97, 108, 0.55);
     border: 1px solid rgba(207, 214, 230, 0.55);
     background-color: rgba(251, 251, 252, 0.55);
-    box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
+    box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); }
 
 .modal-dialog-button-box .button {
   text-shadow: 0 1px rgba(255, 255, 255, 0);
   color: #BAC3CF;
   border: 1px solid rgba(26, 28, 34, 0.35);
-  background-color: rgba(102, 109, 132, 0.35); }
+  background-color: rgba(102, 109, 132, 0.35);
+  box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .modal-dialog-button-box .button:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #BAC3CF;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(119, 127, 151, 0.45); }
+    background-color: rgba(119, 127, 151, 0.45);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .modal-dialog-button-box .button:focus {
     color: #5294E2; }
   .modal-dialog-button-box .button:active {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
-    border: 1px solid #5294E2;
-    background-color: #5294E2; }
+    border: 1px solid rgba(26, 28, 34, 0.35);
+    background-color: #5294E2;
+    box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
   .modal-dialog-button-box .button:insensitive {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5d626e;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(102, 109, 132, 0.2); }
+    background-color: rgba(102, 109, 132, 0.2);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
 
 StEntry {
   padding: 7px;
@@ -767,7 +771,7 @@ StScrollBar {
     color: #5c616c;
     background-color: white;
     border: 1px solid #cfd6e6;
-    box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
   .datemenu-today-button:active,
   .world-clocks-button:active,
   .message-list-section-title:active {
@@ -1235,12 +1239,14 @@ StScrollBar {
   text-shadow: 0 1px rgba(255, 255, 255, 0);
   color: #BAC3CF;
   border: 1px solid rgba(26, 28, 34, 0.35);
-  background-color: rgba(102, 109, 132, 0.35); }
+  background-color: rgba(102, 109, 132, 0.35);
+  box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .app-view-control:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #BAC3CF;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(119, 127, 151, 0.45); }
+    background-color: rgba(119, 127, 151, 0.45);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .app-view-control:checked {
     color: #ffffff;
     background-color: #5294E2; }
@@ -1560,22 +1566,26 @@ StScrollBar {
   text-shadow: 0 1px rgba(255, 255, 255, 0);
   color: #BAC3CF;
   border: 1px solid rgba(26, 28, 34, 0.35);
-  background-color: rgba(102, 109, 132, 0.35); }
+  background-color: rgba(102, 109, 132, 0.35);
+  box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .keyboard-key:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #BAC3CF;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(119, 127, 151, 0.45); }
+    background-color: rgba(119, 127, 151, 0.45);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .keyboard-key:active, .keyboard-key:checked {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
-    border: 1px solid #5294E2;
-    background-color: #5294E2; }
+    border: 1px solid rgba(26, 28, 34, 0.35);
+    background-color: #5294E2;
+    box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
   .keyboard-key:grayed {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5d626e;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: rgba(102, 109, 132, 0.2); }
+    background-color: rgba(102, 109, 132, 0.2);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
 
 .keyboard-subkeys {
   color: #BAC3CF;
@@ -1651,13 +1661,13 @@ StScrollBar {
       color: #5c616c;
       background-color: #fbfbfc;
       border: 1px solid #cfd6e6;
-      box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
+      box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); }
       .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
         color: #5c616c;
         background-color: white;
         border: 1px solid #cfd6e6;
-        box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
       .login-dialog .modal-dialog-button:default:active {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
         color: #ffffff;
@@ -1669,7 +1679,7 @@ StScrollBar {
         color: rgba(92, 97, 108, 0.55);
         border: 1px solid rgba(207, 214, 230, 0.55);
         background-color: rgba(251, 251, 252, 0.55);
-        box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
+        box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); }
 
 .login-dialog-logo-bin {
   padding: 24px 0px; }
@@ -1880,7 +1890,7 @@ StScrollBar {
   .lg-dialog StEntry:focus {
     color: #ffffff;
     background-color: #5294E2;
-    border: 1px solid #5294E2;
+    border: 1px solid rgba(26, 28, 34, 0.35);
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
 
 .lg-dialog .shell-link {
diff --git a/common/gnome-shell/3.16/sass/_drawing.scss b/common/gnome-shell/3.16/sass/_drawing.scss
index 7cf8812..c074950 100644
--- a/common/gnome-shell/3.16/sass/_drawing.scss
+++ b/common/gnome-shell/3.16/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);
   }
 }
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);
   }
 }