1 files changed, 18 insertions, 49 deletions

diff --git a/common/gtk-3.0/3.14/sass/_lightdm.scss b/common/gtk-3.0/3.14/sass/_lightdm.scss
index 9b14d09..9b2fa76 100644
--- a/common/gtk-3.0/3.14/sass/_lightdm.scss
+++ b/common/gtk-3.0/3.14/sass/_lightdm.scss
@@ -14,7 +14,7 @@
   }
 
   .menubar .menuitem:insensitive {
-    color: darken($panel_fg, 20%);
+    color: transparentize($panel_fg, 0.5);
 
     GtkLabel { color: inherit; }
   }
@@ -34,9 +34,11 @@
 /* the top half of the login-window, in GtkDialog terms, the content */
 #content_frame {
   padding-bottom: 14px;
-  background-color: transparentize($bg_color, 0.05);
+  background-color: if($variant == 'light', $bg_color, $base_color);
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
+  border: solid transparentize(black, 0.9);
+  border-width: 1px 1px 0 1px;
 }
 
 #content_frame .button {
@@ -53,8 +55,11 @@
   padding-bottom: 0px;
   border-style: none;
   background-color: $osd_bg_color;
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: solid transparentize(black, 0.9);
+  border-width: 0 1px 1px 1px;
+  box-shadow: inset 0 1px darken($osd_bg_color, 10%);
 }
 
 #buttonbox_frame .button{
@@ -76,7 +81,7 @@
 /* the user's avatar box */
 #user_image {
   padding: 3px;
-  border-radius: 3px;
+  border-radius: 2px;
 }
 
 /* the border around the user's avatar box */
@@ -84,54 +89,18 @@
 
 /* the shutdown button */
 #shutdown_button.button {
-  color: $selected_fg_color;
-  outline-color: transparentize($selected_fg_color, 0.7);
-  border-color: $destructive_color;
-  background-color: $destructive_color;
-  background-image: none;
-  background-clip: border-box;
-
-  &:hover {
-    color: $selected_fg_color;
-    outline-color: transparentize($selected_fg_color, 0.7);
-    border-color: lighten($destructive_color, 9%);
-    background-color: lighten($destructive_color, 9%);
-    background-image: none;
-  }
-  &:active, &:checked {
-    color: $selected_fg_color;
-    outline-color: transparentize($selected_fg_color, 0.7);
-    border-color: darken($destructive_color, 7%);
-    background-color: darken($destructive_color, 7%);
-    background-image: none;
-  }
+  @include button(suggested_destructive, $destructive_color);
+
+  &:hover { @include button(suggested_destructive, lighten($destructive_color, 10%)); }
+  &:active, &:checked { @include button(suggested_destructive, darken($destructive_color, 10%)); }
 }
 
 /* the restart button */
 #restart_button.button {
-  $_restart_bg: #51CF74;
-
-  color: $selected_fg_color;
-  outline-color: transparentize($selected_fg_color, 0.7);
-  border-color: $_restart_bg;
-  background-color: $_restart_bg;
-  background-image: none;
-  background-clip: border-box;
-
-  &:hover {
-    color: $selected_fg_color;
-    outline-color: transparentize($selected_fg_color, 0.7);
-    border-color: lighten($_restart_bg, 9%);
-    background-color: lighten($_restart_bg, 9%);
-    background-image: none;
-  }
-  &:active, &:checked {
-    color: $selected_fg_color;
-    outline-color: transparentize($selected_fg_color, 0.7);
-    border-color: darken($_restart_bg, 7%);
-    background-color: darken($_restart_bg, 7%);
-    background-image: none;
-  }
+  @include button(suggested_destructive, $suggested_color);
+
+  &:hover { @include button(suggested_destructive, lighten($suggested_color, 10%)); }
+  &:active, &:checked { @include button(suggested_destructive, darken($suggested_color, 10%)); }
 }
 
 /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */