[gnome-shell/wip/sass] theme: login/shield in progress

[Jakub Steiner <jimmac src gnome org>]

commit 993b542b341c6b113d8f32cc8a2b0b21f8dec89c
Author: Jakub Steiner <jimmac gmail com>
Date:   Thu Feb 5 17:42:19 2015 +0100

    theme: login/shield in progress

 data/theme/_common.scss                  |  182 +++++++++++++--
 data/theme/_gnome-shell-old.scss         |  319 ------------------------
 data/theme/gnome-shell-high-contrast.css |  396 ++++++++++--------------------
 data/theme/gnome-shell.css               |  396 ++++++++++--------------------
 js/ui/screenShield.js                    |    2 +-
 5 files changed, 440 insertions(+), 855 deletions(-)
---
diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index dfe8921..7d90fd8 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -29,6 +29,8 @@ $panel-corner-radius: 6px;
 /* GLOBALS */
 $font-size: 11;
 $font-family: Cantarell, Sans-Serif;
+$_bubble_bg_color: transparentize(darken($bg_color,8%),.05);
+$_bubble_border_color: transparentize($fg_color,0.8);
 
 stage {
   font-family: $font-family;
@@ -178,7 +180,7 @@ StScrollBar {
 /* End Session Dialog */
 .end-session-dialog {
     spacing: 42px;
-    border: 3px solid transparentize($fg_color,0.8);
+    border: 3px solid $_bubble_border_color;
 }
 
   .end-session-dialog-list {
@@ -323,7 +325,7 @@ StScrollBar {
 .prompt-dialog {
   //this is the width of the entire modal popup
   width: 500px;
-  border: 3px solid transparentize($fg_color,0.8);
+  border: 3px solid $_bubble_border_color;
 }
 
   .prompt-dialog-main-layout {
@@ -537,6 +539,12 @@ StScrollBar {
     color: $fg_color;
   }
 
+  .input-source-switcher-symbol {
+     font-size: 34pt;
+     width: 96px;
+     height: 96px;
+  }
+  
 /* Workspace Switcher */
 .workspace-switcher-group { padding: 12px; }
 
@@ -570,7 +578,7 @@ StScrollBar {
 %osd-panel {
   color: $fg_color;
   background-color: transparentize($bg_color,0.2);
-  border: 1px solid transparentize($fg_color,0.8);
+  border: 1px solid $_bubble_border_color;
   border-radius: 12px;
   padding: 12px;
 }
@@ -703,7 +711,7 @@ StScrollBar {
     .calendar-vertical-separator {
       width: .3em;
       -stipple-width: 1px;
-      -stipple-color: transparentize($fg_color,0.8);
+      -stipple-color: $_bubble_border_color;
     }
     
     .calendar-month-label {
@@ -1230,7 +1238,7 @@ StScrollBar {
 %overview-panel {
   color: $fg_color;
   background-color: $bg_color;
-  border: 1px solid transparentize($fg_color,0.8);
+  border: 1px solid $_bubble_border_color;
 }
 
 %status_text {
@@ -1239,12 +1247,6 @@ StScrollBar {
   color: $fg_color;
 }
 
-/* LOGIN DIALOG */
-.login-dialog-banner-view {
-  padding-top: 24px;
-  max-width: 23em;
-}
-
 /* NOTIFICATIONS & MESSAGE TRAY */
 
 #message-tray {
@@ -1274,7 +1276,7 @@ StScrollBar {
     font-size: 11pt;
     width: 34em;
     border-radius: 6px 6px 0 0;
-    background-color: transparentize(darken($bg_color,8%),.05);
+    background-color: $_bubble_bg_color;
     border: 1px solid $borders_color;
     border-bottom-width: 0;
     //box-shadow: 0 1px 4px black;
@@ -1328,7 +1330,7 @@ StScrollBar {
   //Message tray popovers
   .summary-boxpointer {
     -arrow-border-radius: 15px;
-    -arrow-background-color: transparentize(darken($bg_color,8%),.05);
+    -arrow-background-color: $_bubble_bg_color;
     -arrow-base: 36px;
     -arrow-rise: 18px;
     color: $fg_color;
@@ -1489,7 +1491,7 @@ StScrollBar {
       -arrow-border-radius: 10px;
       -arrow-background-color: transparentize($osd_bg_color, 0.3);
       -arrow-border-width: 2px;
-      -arrow-border-color: transparentize($fg_color,0.8);
+      -arrow-border-color: $_bubble_border_color;
       -arrow-base: 20px;
       -arrow-rise: 10px;
       -boxpointer-gap: 5px;
@@ -1524,7 +1526,157 @@ StScrollBar {
   .candidate-page-button-next { border-radius: 0px 4px 4px 0px;  }
   .candidate-page-button-icon { icon-size: 1em; }
 
-//Mess that is Looking Glass
+/* Auth Dialogs & Screen Shield */
+
+.framed-user-icon { 
+  background-size: contain; 
+  border: 2px solid $borders_color;
+  border-radius: 3px;
+  &:hover {
+    border-color: lighten($borders_color,30%);
+  }
+}
+
+// LOGIN DIALOG
+
+.login-dialog-banner-view {
+  padding-top: 24px;
+  max-width: 23em;
+}
+
+.login-dialog {
+  //reset
+  border: none;
+  background-color: transparent;
+}
+
+  .login-dialog-banner {
+    color: darken($fg_color,10%);
+  }
+  
+  .login-dialog-button-box { spacing: 5px; }
+  
+  .login-dialog-user-selection-box { 
+    padding: 100px 0;
+    .login-dialog-not-listed-label { 
+      padding-left: 2px;
+      .login-dialog-not-listed-button:focus &,
+      .login-dialog-not-listed-button:hover & {
+        color: $fg_color; //FIXME
+      }
+    }
+  }
+  
+  .login-dialog-user-list-view { -st-vfade-offset: 1em; }
+  .login-dialog-user-list {
+    spacing: 12px;
+    padding: .2em;
+    width: 23em;
+    &:expanded .login-dialog-user-list-item:focus { background-color: $selected_bg_color; }
+    &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
+  }
+  .login-dialog-user-list-item {
+    border-radius: 5px;
+    padding: .2em;
+    color: darken($fg_color,30%);
+    &:ltr { padding-right: 1em; }
+    &:rtl { padding-left: 1em; }
+    &:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
+    .login-dialog-timed-login-indicator {
+      height: 2px;
+      //background-color: rgba(0,0,0,0.0);
+      background-color: transparent;
+    }
+    &:focus .login-dialog-timed-login-indicator { background-color: $bg_color; }
+  }
+  
+  .login-dialog-not-listed-label {
+    font-size: 90%;
+    font-weight: bold;
+    color: darken($fg_color,30%);
+    padding-top: 1em;
+  }
+
+//SCREEN SHIELD
+
+.screen-shield-arrows {
+    padding-bottom: 3em;
+}
+
+.screen-shield-arrows Gjs_Arrow {
+    color: white;
+    width: 80px;
+    height: 48px;
+    -arrow-thickness: 12px;
+    -arrow-shadow: 0 1px 1px rgba(0,0,0,0.4);
+}
+
+.screen-shield-contents-box { spacing: 48px; }
+
+.screen-shield-clock {
+  color: white;
+  text-shadow: 0px 1px 2px rgba(0,0,0,0.6);
+  font-weight: bold;
+  text-align: center;
+  padding-bottom: 1.5em;
+}
+
+.screen-shield-clock-time {
+  font-size: 72pt;
+  text-shadow: 0px 2px 2px rgba(0,0,0,0.4);
+}
+
+.screen-shield-clock-date { font-size: 28pt; }
+
+.screen-shield-notifications-container {
+  padding: 12px;
+  spacing: 24px;
+  width: 30em;
+  background-color: transparent;
+  max-height: 500px;
+  .summary-notification-stack-scrollview {
+    padding-top: 0;
+    padding-bottom: 0;
+  }  
+  .notification-button, .notification-icon-button { border: 1px solid transparentize($fg_color,0.5); }
+  .notification {
+    border: 1px solid blue;
+  }
+}
+
+.screen-shield-notification-box {
+  background-color: red;
+  color: blue;
+}
+
+.screen-shield-notification-source {
+  padding: 3px 6px;
+  spacing: 5px;
+}
+
+.screen-shield-notification-label {
+  font-weight: bold;
+  padding: 0px 0px 0px 12px;
+}
+
+.screen-shield-notification-count-text { padding: 0px 0px 0px 12px; }
+
+#panel.lock-screen {
+  background-color: transparentize($_bubble_bg_color, 0.5);
+}
+
+.screen-shield-background { //just the shadow, really
+  background: black;
+  box-shadow: 0px 2px 4px transparentize(black,0.6);
+}
+
+#lockDialogGroup {
+  background: #2e3436 url(noise-texture.png);
+  background-repeat: repeat;
+}
+
+
+// Looking Glass
 #LookingGlassDialog {
   background-color: rgba(0,0,0,0.80);
   spacing: 4px;
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index 22bb9c1..6191c10 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -17,325 +17,6 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/* Login Dialog */
 
-.framed-user-icon {
-    border: 2px solid #8b8b8b;
-    border-radius: 3px;
-    background-size: contain;
-}
-
-.framed-user-icon:hover {
-    border: 2px solid #bbbbbb;
-}
-
-.login-dialog-banner {
-    color: #666666;
-}
-
-.login-dialog {
-    /* Reset border and background */
-    border: none;
-    background-color: transparent;
-}
-
-.login-dialog-button-box {
-    spacing: 5px;
-}
-
-.login-dialog-user-list-view {
-    -st-vfade-offset: 1em;
-}
-
-.login-dialog-user-list {
-    spacing: 12px;
-    padding: .2em;
-    width: 23em;
-}
-
-.login-dialog-user-list-item {
-    border-radius: 5px;
-    padding: .2em;
-    color: #bfbfbf;
-    text-shadow: black 0px 2px 2px;
-}
-
-.login-dialog-user-list-item:ltr {
-    padding-right: 1em;
-}
-
-.login-dialog-user-list-item:rtl {
-    padding-left: 1em;
-}
-
-.login-dialog-user-list-item:hover {
-    background-color: rgba(255,255,255,0.1);
-}
-
-.login-dialog-user-list:expanded .login-dialog-user-list-item:focus {
-    background-color: rgba(255,255,255,0.33);
-}
-
-.login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
-    background-image: url("logged-in-indicator.svg");
-    background-size: contain;
-}
-
-.login-dialog-user-list-item .login-dialog-timed-login-indicator {
-    background-color: rgba(0,0,0,0.0);
-    height: 2px;
-}
-
-.login-dialog-user-list-item:focus .login-dialog-timed-login-indicator {
-    background-color: #8b8b8b;
-}
-
-.login-dialog-not-listed-label {
-    font-size: 10.5pt;
-    font-weight: bold;
-    color: #666666;
-    padding-top: 1em;
-}
-
-.login-dialog-user-selection-box {
-    padding: 100px 0;
-}
-
-.login-dialog-user-selection-box .login-dialog-not-listed-label {
-    padding-left: 2px;
-}
-
-.login-dialog-not-listed-button:focus .login-dialog-not-listed-label,
-.login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
-    color: #E8E8E8;
-}
-
-.login-dialog-username,
-.user-widget-label {
-    font-size: 16pt;
-    font-weight: bold;
-    text-align: left;
-    padding-left: 15px;
-    text-shadow: rgba(0, 0, 0, 0.5) 0px 2px 1px 0px;
-}
-
-.login-dialog-prompt-layout {
-    padding-top: 24px;
-    padding-bottom: 12px;
-    spacing: 8px;
-    width: 23em;
-}
-
-.login-dialog-prompt-label {
-    color: #eeeeee;
-    font-size: 14px;
-    padding-top: 11px;
-}
-
-.login-dialog-session-list-button StIcon {
-    icon-size: 1.25em;
-}
-
-.login-dialog-session-list-button {
-    color: #8b8b8b;
-}
-
-.login-dialog-session-list-button:hover,
-.login-dialog-session-list-button:focus,
-.login-dialog-session-list-button:active {
-    color: white;
-}
-
-.login-dialog-logo-bin {
-    padding: 24px 0px;
-}
-
-.login-dialog .modal-dialog-button-box {
-    spacing: 3px;
-}
-
-.login-dialog .modal-dialog-button {
-    border-radius: 5px;
-    padding: 3px 18px;
-}
-
-.login-dialog .modal-dialog-button:focus {
-    padding: 2px 17px;
-}
-
-.login-dialog .modal-dialog-button:default {
-    background-gradient-start: #6793c4;
-    background-gradient-end: #335d8f;
-    background-gradient-direction: vertical;
-    border-color: #16335d;
-}
-
-.login-dialog .modal-dialog-button:default:focus {
-    border: 2px solid #377fe7;
-}
-
-.login-dialog .modal-dialog-button:default:hover {
-    background-gradient-start: #74a0d0;
-    background-gradient-end: #436d9f;
-}
-
-.login-dialog .modal-dialog-button:default:active,
-.login-dialog .modal-dialog-button:default:pressed {
-    background-gradient-start: #436d9f;
-    background-gradient-end: #74a0d0;
-}
-
-.login-dialog .modal-dialog-button:default:insensitive {
-    border-color: #666666;
-    color: #9f9f9f;
-    background-gradient-direction: none;
-    background-color: rgba(102, 102, 102, 0.15);
-}
-
-.login-dialog-message {
-    padding-top: 4px;
-    padding-bottom: 16px;
-    min-height: 2em;
-}
-
-.login-dialog-message-warning {
-    color: orange;
-}
-
-.login-dialog-message-hint {
-    padding-top: 0px;
-    padding-bottom: 20px;
-}
-
-.user-widget-label {
-}
-
-.user-widget-label:ltr {
-    padding-left: 18px;
-}
-
-.user-widget-label:rtl {
-    padding-right: 18px;
-}
-
-/* Screen shield */
-
-#panel.lock-screen,
-#screenShieldNotifications {
-    background-color: rgba(0,0,0,0.3);
-}
-
-.screen-shield-background {
-    background: black;
-    box-shadow: 0px 4px 8px rgba(0,0,0,0.9);
-}
-
-#lockDialogGroup {
-    background: #2e3436 url(noise-texture.png);
-    background-repeat: repeat;
-}
-
-.screen-shield-arrows {
-    padding-bottom: 3em;
-}
-
-.screen-shield-arrows Gjs_Arrow {
-    color: white;
-    width: 80px;
-    height: 48px;
-    -arrow-thickness: 12px;
-    -arrow-shadow: 0 1px 1px rgba(0,0,0,0.4);
-}
-
-.screen-shield-contents-box {
-    spacing: 48px;
-}
-
-.screen-shield-clock {
-    color: white;
-    text-shadow: 0px 1px 2px rgba(0,0,0,0.6);
-    font-weight: bold;
-    text-align: center;
-    padding-bottom: 1.5em;
-}
-
-.screen-shield-clock-time {
-    font-size: 72pt;
-    text-shadow: 0px 2px 2px rgba(0,0,0,0.4);
-}
-
-.screen-shield-clock-date {
-    font-size: 28pt;
-}
-
-#screenShieldNotifications {
-    max-height: 500px;
-    padding: 12px;
-}
-
-.screen-shield-notifications-box {
-    spacing: 12px;
-    width: 30em;
-}
-
-.screen-shield-notification-source {
-    padding: 3px 6px;
-    spacing: 5px;
-}
-
-.screen-shield-notification-label {
-    font-weight: bold;
-    padding: 0px 0px 0px 12px;
-}
-
-.screen-shield-notification-count-text {
-    padding: 0px 0px 0px 12px;
-}
-
-/* Remove background from notifications, otherwise
-   opacity is doubled and they look darker
-*/
-.screen-shield-notifications-box .notification {
-    background-color: transparent;
-}
-
-/* Override padding on resident notifications, since
-   the notifications box has its own spacing
-*/
-.screen-shield-notifications-box .summary-notification-stack-scrollview {
-    padding-top: 0px;
-    padding-bottom: 0px;
-}
-
-#screenShieldNotifications .notification-button,
-#screenShieldNotifications .notification-icon-button {
-    border: 1px rgba(255,255,255,0.5);
-}
-
-#screenShieldNotifications StScrollBar StBin#trough {
-    background-color: rgba(0,0,0,0.2);
-}
-
-#screenShieldNotifications StScrollBar StButton#vhandle,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-    background-color: rgba(0,0,0,0.3);
-    border: none;
-}
-
-#screenShieldNotifications StScrollBar StButton#vhandle:hover,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-    background-color: rgba(0,0,0,0.6);
-}
-
-#screenShieldNotifications StScrollBar StButton#vhandle:active,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-    background-color: rgba(0,0,0,0.8);
-}
-
-.input-source-switcher-symbol {
-   font-size: 34pt;
-   width: 96px;
-   height: 96px;
-}
 
 
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 4152bf3..f0875c9 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -16,261 +16,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* Login Dialog */
-.framed-user-icon {
-  border: 2px solid #8b8b8b;
-  border-radius: 3px;
-  background-size: contain; }
-
-.framed-user-icon:hover {
-  border: 2px solid #bbbbbb; }
-
-.login-dialog-banner {
-  color: #666666; }
-
-.login-dialog {
-  /* Reset border and background */
-  border: none;
-  background-color: transparent; }
-
-.login-dialog-button-box {
-  spacing: 5px; }
-
-.login-dialog-user-list-view {
-  -st-vfade-offset: 1em; }
-
-.login-dialog-user-list {
-  spacing: 12px;
-  padding: .2em;
-  width: 23em; }
-
-.login-dialog-user-list-item {
-  border-radius: 5px;
-  padding: .2em;
-  color: #bfbfbf;
-  text-shadow: black 0px 2px 2px; }
-
-.login-dialog-user-list-item:ltr {
-  padding-right: 1em; }
-
-.login-dialog-user-list-item:rtl {
-  padding-left: 1em; }
-
-.login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.1); }
-
-.login-dialog-user-list:expanded .login-dialog-user-list-item:focus {
-  background-color: rgba(255, 255, 255, 0.33); }
-
-.login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
-  background-image: url("logged-in-indicator.svg");
-  background-size: contain; }
-
-.login-dialog-user-list-item .login-dialog-timed-login-indicator {
-  background-color: transparent;
-  height: 2px; }
-
-.login-dialog-user-list-item:focus .login-dialog-timed-login-indicator {
-  background-color: #8b8b8b; }
-
-.login-dialog-not-listed-label {
-  font-size: 10.5pt;
-  font-weight: bold;
-  color: #666666;
-  padding-top: 1em; }
-
-.login-dialog-user-selection-box {
-  padding: 100px 0; }
-
-.login-dialog-user-selection-box .login-dialog-not-listed-label {
-  padding-left: 2px; }
-
-.login-dialog-not-listed-button:focus .login-dialog-not-listed-label,
-.login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
-  color: #E8E8E8; }
-
-.login-dialog-username,
-.user-widget-label {
-  font-size: 16pt;
-  font-weight: bold;
-  text-align: left;
-  padding-left: 15px;
-  text-shadow: rgba(0, 0, 0, 0.5) 0px 2px 1px 0px; }
-
-.login-dialog-prompt-layout {
-  padding-top: 24px;
-  padding-bottom: 12px;
-  spacing: 8px;
-  width: 23em; }
-
-.login-dialog-prompt-label {
-  color: #eeeeee;
-  font-size: 14px;
-  padding-top: 11px; }
-
-.login-dialog-session-list-button StIcon {
-  icon-size: 1.25em; }
-
-.login-dialog-session-list-button {
-  color: #8b8b8b; }
-
-.login-dialog-session-list-button:hover,
-.login-dialog-session-list-button:focus,
-.login-dialog-session-list-button:active {
-  color: white; }
-
-.login-dialog-logo-bin {
-  padding: 24px 0px; }
-
-.login-dialog .modal-dialog-button-box {
-  spacing: 3px; }
-
-.login-dialog .modal-dialog-button {
-  border-radius: 5px;
-  padding: 3px 18px; }
-
-.login-dialog .modal-dialog-button:focus {
-  padding: 2px 17px; }
-
-.login-dialog .modal-dialog-button:default {
-  background-gradient-start: #6793c4;
-  background-gradient-end: #335d8f;
-  background-gradient-direction: vertical;
-  border-color: #16335d; }
-
-.login-dialog .modal-dialog-button:default:focus {
-  border: 2px solid #377fe7; }
-
-.login-dialog .modal-dialog-button:default:hover {
-  background-gradient-start: #74a0d0;
-  background-gradient-end: #436d9f; }
-
-.login-dialog .modal-dialog-button:default:active,
-.login-dialog .modal-dialog-button:default:pressed {
-  background-gradient-start: #436d9f;
-  background-gradient-end: #74a0d0; }
-
-.login-dialog .modal-dialog-button:default:insensitive {
-  border-color: #666666;
-  color: #9f9f9f;
-  background-gradient-direction: none;
-  background-color: rgba(102, 102, 102, 0.15); }
-
-.login-dialog-message {
-  padding-top: 4px;
-  padding-bottom: 16px;
-  min-height: 2em; }
-
-.login-dialog-message-warning {
-  color: orange; }
-
-.login-dialog-message-hint {
-  padding-top: 0px;
-  padding-bottom: 20px; }
-
-.user-widget-label:ltr {
-  padding-left: 18px; }
-
-.user-widget-label:rtl {
-  padding-right: 18px; }
-
-/* Screen shield */
-#panel.lock-screen,
-#screenShieldNotifications {
-  background-color: rgba(0, 0, 0, 0.3); }
-
-.screen-shield-background {
-  background: black;
-  box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.9); }
-
-#lockDialogGroup {
-  background: #2e3436 url(noise-texture.png);
-  background-repeat: repeat; }
-
-.screen-shield-arrows {
-  padding-bottom: 3em; }
-
-.screen-shield-arrows Gjs_Arrow {
-  color: white;
-  width: 80px;
-  height: 48px;
-  -arrow-thickness: 12px;
-  -arrow-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); }
-
-.screen-shield-contents-box {
-  spacing: 48px; }
-
-.screen-shield-clock {
-  color: white;
-  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
-  font-weight: bold;
-  text-align: center;
-  padding-bottom: 1.5em; }
-
-.screen-shield-clock-time {
-  font-size: 72pt;
-  text-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); }
-
-.screen-shield-clock-date {
-  font-size: 28pt; }
-
-#screenShieldNotifications {
-  max-height: 500px;
-  padding: 12px; }
-
-.screen-shield-notifications-box {
-  spacing: 12px;
-  width: 30em; }
-
-.screen-shield-notification-source {
-  padding: 3px 6px;
-  spacing: 5px; }
-
-.screen-shield-notification-label {
-  font-weight: bold;
-  padding: 0px 0px 0px 12px; }
-
-.screen-shield-notification-count-text {
-  padding: 0px 0px 0px 12px; }
-
-/* Remove background from notifications, otherwise
-   opacity is doubled and they look darker
-*/
-.screen-shield-notifications-box .notification {
-  background-color: transparent; }
-
-/* Override padding on resident notifications, since
-   the notifications box has its own spacing
-*/
-.screen-shield-notifications-box .summary-notification-stack-scrollview {
-  padding-top: 0px;
-  padding-bottom: 0px; }
-
-#screenShieldNotifications .notification-button,
-#screenShieldNotifications .notification-icon-button {
-  border: 1px rgba(255, 255, 255, 0.5); }
-
-#screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(0, 0, 0, 0.2); }
-
-#screenShieldNotifications StScrollBar StButton#vhandle,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-  background-color: rgba(0, 0, 0, 0.3);
-  border: none; }
-
-#screenShieldNotifications StScrollBar StButton#vhandle:hover,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-  background-color: rgba(0, 0, 0, 0.6); }
-
-#screenShieldNotifications StScrollBar StButton#vhandle:active,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-  background-color: rgba(0, 0, 0, 0.8); }
-
-.input-source-switcher-symbol {
-  font-size: 34pt;
-  width: 96px;
-  height: 96px; }
-
 /* This stylesheet is generated, DO NOT EDIT */
 /* Copyright 2009, Red Hat, Inc.
  *
@@ -757,6 +502,11 @@ StScrollBar {
 .switcher-arrow:highlighted {
   color: #fff; }
 
+.input-source-switcher-symbol {
+  font-size: 34pt;
+  width: 96px;
+  height: 96px; }
+
 /* Workspace Switcher */
 .workspace-switcher-group {
   padding: 12px; }
@@ -1368,11 +1118,6 @@ StScrollBar {
   font-weight: bold;
   color: #fff; }
 
-/* LOGIN DIALOG */
-.login-dialog-banner-view {
-  padding-top: 24px;
-  max-width: 23em; }
-
 /* NOTIFICATIONS & MESSAGE TRAY */
 #message-tray {
   background: black url("noise-texture.png");
@@ -1667,6 +1412,137 @@ StScrollBar {
 .candidate-page-button-icon {
   icon-size: 1em; }
 
+/* Auth Dialogs & Screen Shield */
+.framed-user-icon {
+  background-size: contain;
+  border: 2px solid black;
+  border-radius: 3px; }
+  .framed-user-icon:hover {
+    border-color: #4d4d4d; }
+
+.login-dialog-banner-view {
+  padding-top: 24px;
+  max-width: 23em; }
+
+.login-dialog {
+  border: none;
+  background-color: transparent; }
+
+.login-dialog-banner {
+  color: #e6e6e6; }
+
+.login-dialog-button-box {
+  spacing: 5px; }
+
+.login-dialog-user-selection-box {
+  padding: 100px 0; }
+  .login-dialog-user-selection-box .login-dialog-not-listed-label {
+    padding-left: 2px; }
+    .login-dialog-not-listed-button:focus .login-dialog-user-selection-box .login-dialog-not-listed-label, 
.login-dialog-not-listed-button:hover .login-dialog-user-selection-box .login-dialog-not-listed-label {
+      color: #fff; }
+
+.login-dialog-user-list-view {
+  -st-vfade-offset: 1em; }
+
+.login-dialog-user-list {
+  spacing: 12px;
+  padding: .2em;
+  width: 23em; }
+  .login-dialog-user-list:expanded .login-dialog-user-list-item:focus {
+    background-color: #215d9c; }
+  .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
+    border-right: 2px solid #215d9c; }
+
+.login-dialog-user-list-item {
+  border-radius: 5px;
+  padding: .2em;
+  color: #b3b3b3; }
+  .login-dialog-user-list-item:ltr {
+    padding-right: 1em; }
+  .login-dialog-user-list-item:rtl {
+    padding-left: 1em; }
+  .login-dialog-user-list-item:hover {
+    background-color: #215d9c;
+    color: #ffffff; }
+  .login-dialog-user-list-item .login-dialog-timed-login-indicator {
+    height: 2px;
+    background-color: transparent; }
+  .login-dialog-user-list-item:focus .login-dialog-timed-login-indicator {
+    background-color: #000; }
+
+.login-dialog-not-listed-label {
+  font-size: 90%;
+  font-weight: bold;
+  color: #b3b3b3;
+  padding-top: 1em; }
+
+.screen-shield-arrows {
+  padding-bottom: 3em; }
+
+.screen-shield-arrows Gjs_Arrow {
+  color: white;
+  width: 80px;
+  height: 48px;
+  -arrow-thickness: 12px;
+  -arrow-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); }
+
+.screen-shield-contents-box {
+  spacing: 48px; }
+
+.screen-shield-clock {
+  color: white;
+  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
+  font-weight: bold;
+  text-align: center;
+  padding-bottom: 1.5em; }
+
+.screen-shield-clock-time {
+  font-size: 72pt;
+  text-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); }
+
+.screen-shield-clock-date {
+  font-size: 28pt; }
+
+.screen-shield-notifications-container {
+  padding: 12px;
+  spacing: 24px;
+  width: 30em;
+  background-color: transparent;
+  max-height: 500px; }
+  .screen-shield-notifications-container .summary-notification-stack-scrollview {
+    padding-top: 0;
+    padding-bottom: 0; }
+  .screen-shield-notifications-container .notification-button, .screen-shield-notifications-container 
.notification-icon-button {
+    border: 1px solid rgba(255, 255, 255, 0.5); }
+  .screen-shield-notifications-container .notification {
+    border: 1px solid blue; }
+
+.screen-shield-notification-box {
+  background-color: red;
+  color: blue; }
+
+.screen-shield-notification-source {
+  padding: 3px 6px;
+  spacing: 5px; }
+
+.screen-shield-notification-label {
+  font-weight: bold;
+  padding: 0px 0px 0px 12px; }
+
+.screen-shield-notification-count-text {
+  padding: 0px 0px 0px 12px; }
+
+#panel.lock-screen {
+  background-color: rgba(0, 0, 0, 0.45); }
+
+.screen-shield-background {
+  background: black;
+  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4); }
+
+#lockDialogGroup {
+  background: #2e3436 url(noise-texture.png);
+  background-repeat: repeat; }
+
 #LookingGlassDialog {
   background-color: rgba(0, 0, 0, 0.8);
   spacing: 4px;
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index aa76810..5f6eb16 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -16,261 +16,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* Login Dialog */
-.framed-user-icon {
-  border: 2px solid #8b8b8b;
-  border-radius: 3px;
-  background-size: contain; }
-
-.framed-user-icon:hover {
-  border: 2px solid #bbbbbb; }
-
-.login-dialog-banner {
-  color: #666666; }
-
-.login-dialog {
-  /* Reset border and background */
-  border: none;
-  background-color: transparent; }
-
-.login-dialog-button-box {
-  spacing: 5px; }
-
-.login-dialog-user-list-view {
-  -st-vfade-offset: 1em; }
-
-.login-dialog-user-list {
-  spacing: 12px;
-  padding: .2em;
-  width: 23em; }
-
-.login-dialog-user-list-item {
-  border-radius: 5px;
-  padding: .2em;
-  color: #bfbfbf;
-  text-shadow: black 0px 2px 2px; }
-
-.login-dialog-user-list-item:ltr {
-  padding-right: 1em; }
-
-.login-dialog-user-list-item:rtl {
-  padding-left: 1em; }
-
-.login-dialog-user-list-item:hover {
-  background-color: rgba(255, 255, 255, 0.1); }
-
-.login-dialog-user-list:expanded .login-dialog-user-list-item:focus {
-  background-color: rgba(255, 255, 255, 0.33); }
-
-.login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
-  background-image: url("logged-in-indicator.svg");
-  background-size: contain; }
-
-.login-dialog-user-list-item .login-dialog-timed-login-indicator {
-  background-color: transparent;
-  height: 2px; }
-
-.login-dialog-user-list-item:focus .login-dialog-timed-login-indicator {
-  background-color: #8b8b8b; }
-
-.login-dialog-not-listed-label {
-  font-size: 10.5pt;
-  font-weight: bold;
-  color: #666666;
-  padding-top: 1em; }
-
-.login-dialog-user-selection-box {
-  padding: 100px 0; }
-
-.login-dialog-user-selection-box .login-dialog-not-listed-label {
-  padding-left: 2px; }
-
-.login-dialog-not-listed-button:focus .login-dialog-not-listed-label,
-.login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
-  color: #E8E8E8; }
-
-.login-dialog-username,
-.user-widget-label {
-  font-size: 16pt;
-  font-weight: bold;
-  text-align: left;
-  padding-left: 15px;
-  text-shadow: rgba(0, 0, 0, 0.5) 0px 2px 1px 0px; }
-
-.login-dialog-prompt-layout {
-  padding-top: 24px;
-  padding-bottom: 12px;
-  spacing: 8px;
-  width: 23em; }
-
-.login-dialog-prompt-label {
-  color: #eeeeee;
-  font-size: 14px;
-  padding-top: 11px; }
-
-.login-dialog-session-list-button StIcon {
-  icon-size: 1.25em; }
-
-.login-dialog-session-list-button {
-  color: #8b8b8b; }
-
-.login-dialog-session-list-button:hover,
-.login-dialog-session-list-button:focus,
-.login-dialog-session-list-button:active {
-  color: white; }
-
-.login-dialog-logo-bin {
-  padding: 24px 0px; }
-
-.login-dialog .modal-dialog-button-box {
-  spacing: 3px; }
-
-.login-dialog .modal-dialog-button {
-  border-radius: 5px;
-  padding: 3px 18px; }
-
-.login-dialog .modal-dialog-button:focus {
-  padding: 2px 17px; }
-
-.login-dialog .modal-dialog-button:default {
-  background-gradient-start: #6793c4;
-  background-gradient-end: #335d8f;
-  background-gradient-direction: vertical;
-  border-color: #16335d; }
-
-.login-dialog .modal-dialog-button:default:focus {
-  border: 2px solid #377fe7; }
-
-.login-dialog .modal-dialog-button:default:hover {
-  background-gradient-start: #74a0d0;
-  background-gradient-end: #436d9f; }
-
-.login-dialog .modal-dialog-button:default:active,
-.login-dialog .modal-dialog-button:default:pressed {
-  background-gradient-start: #436d9f;
-  background-gradient-end: #74a0d0; }
-
-.login-dialog .modal-dialog-button:default:insensitive {
-  border-color: #666666;
-  color: #9f9f9f;
-  background-gradient-direction: none;
-  background-color: rgba(102, 102, 102, 0.15); }
-
-.login-dialog-message {
-  padding-top: 4px;
-  padding-bottom: 16px;
-  min-height: 2em; }
-
-.login-dialog-message-warning {
-  color: orange; }
-
-.login-dialog-message-hint {
-  padding-top: 0px;
-  padding-bottom: 20px; }
-
-.user-widget-label:ltr {
-  padding-left: 18px; }
-
-.user-widget-label:rtl {
-  padding-right: 18px; }
-
-/* Screen shield */
-#panel.lock-screen,
-#screenShieldNotifications {
-  background-color: rgba(0, 0, 0, 0.3); }
-
-.screen-shield-background {
-  background: black;
-  box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.9); }
-
-#lockDialogGroup {
-  background: #2e3436 url(noise-texture.png);
-  background-repeat: repeat; }
-
-.screen-shield-arrows {
-  padding-bottom: 3em; }
-
-.screen-shield-arrows Gjs_Arrow {
-  color: white;
-  width: 80px;
-  height: 48px;
-  -arrow-thickness: 12px;
-  -arrow-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); }
-
-.screen-shield-contents-box {
-  spacing: 48px; }
-
-.screen-shield-clock {
-  color: white;
-  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
-  font-weight: bold;
-  text-align: center;
-  padding-bottom: 1.5em; }
-
-.screen-shield-clock-time {
-  font-size: 72pt;
-  text-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); }
-
-.screen-shield-clock-date {
-  font-size: 28pt; }
-
-#screenShieldNotifications {
-  max-height: 500px;
-  padding: 12px; }
-
-.screen-shield-notifications-box {
-  spacing: 12px;
-  width: 30em; }
-
-.screen-shield-notification-source {
-  padding: 3px 6px;
-  spacing: 5px; }
-
-.screen-shield-notification-label {
-  font-weight: bold;
-  padding: 0px 0px 0px 12px; }
-
-.screen-shield-notification-count-text {
-  padding: 0px 0px 0px 12px; }
-
-/* Remove background from notifications, otherwise
-   opacity is doubled and they look darker
-*/
-.screen-shield-notifications-box .notification {
-  background-color: transparent; }
-
-/* Override padding on resident notifications, since
-   the notifications box has its own spacing
-*/
-.screen-shield-notifications-box .summary-notification-stack-scrollview {
-  padding-top: 0px;
-  padding-bottom: 0px; }
-
-#screenShieldNotifications .notification-button,
-#screenShieldNotifications .notification-icon-button {
-  border: 1px rgba(255, 255, 255, 0.5); }
-
-#screenShieldNotifications StScrollBar StBin#trough {
-  background-color: rgba(0, 0, 0, 0.2); }
-
-#screenShieldNotifications StScrollBar StButton#vhandle,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-  background-color: rgba(0, 0, 0, 0.3);
-  border: none; }
-
-#screenShieldNotifications StScrollBar StButton#vhandle:hover,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-  background-color: rgba(0, 0, 0, 0.6); }
-
-#screenShieldNotifications StScrollBar StButton#vhandle:active,
-#screenShieldNotifications StScrollBar StButton#hhandle {
-  background-color: rgba(0, 0, 0, 0.8); }
-
-.input-source-switcher-symbol {
-  font-size: 34pt;
-  width: 96px;
-  height: 96px; }
-
 /* This stylesheet is generated, DO NOT EDIT */
 /* Copyright 2009, Red Hat, Inc.
  *
@@ -757,6 +502,11 @@ StScrollBar {
 .switcher-arrow:highlighted {
   color: #eeeeec; }
 
+.input-source-switcher-symbol {
+  font-size: 34pt;
+  width: 96px;
+  height: 96px; }
+
 /* Workspace Switcher */
 .workspace-switcher-group {
   padding: 12px; }
@@ -1368,11 +1118,6 @@ StScrollBar {
   font-weight: bold;
   color: #eeeeec; }
 
-/* LOGIN DIALOG */
-.login-dialog-banner-view {
-  padding-top: 24px;
-  max-width: 23em; }
-
 /* NOTIFICATIONS & MESSAGE TRAY */
 #message-tray {
   background: #212424 url("noise-texture.png");
@@ -1667,6 +1412,137 @@ StScrollBar {
 .candidate-page-button-icon {
   icon-size: 1em; }
 
+/* Auth Dialogs & Screen Shield */
+.framed-user-icon {
+  background-size: contain;
+  border: 2px solid #1c1f1f;
+  border-radius: 3px; }
+  .framed-user-icon:hover {
+    border-color: #656f6f; }
+
+.login-dialog-banner-view {
+  padding-top: 24px;
+  max-width: 23em; }
+
+.login-dialog {
+  border: none;
+  background-color: transparent; }
+
+.login-dialog-banner {
+  color: #d6d6d1; }
+
+.login-dialog-button-box {
+  spacing: 5px; }
+
+.login-dialog-user-selection-box {
+  padding: 100px 0; }
+  .login-dialog-user-selection-box .login-dialog-not-listed-label {
+    padding-left: 2px; }
+    .login-dialog-not-listed-button:focus .login-dialog-user-selection-box .login-dialog-not-listed-label, 
.login-dialog-not-listed-button:hover .login-dialog-user-selection-box .login-dialog-not-listed-label {
+      color: #eeeeec; }
+
+.login-dialog-user-list-view {
+  -st-vfade-offset: 1em; }
+
+.login-dialog-user-list {
+  spacing: 12px;
+  padding: .2em;
+  width: 23em; }
+  .login-dialog-user-list:expanded .login-dialog-user-list-item:focus {
+    background-color: #215d9c; }
+  .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
+    border-right: 2px solid #215d9c; }
+
+.login-dialog-user-list-item {
+  border-radius: 5px;
+  padding: .2em;
+  color: #a6a69b; }
+  .login-dialog-user-list-item:ltr {
+    padding-right: 1em; }
+  .login-dialog-user-list-item:rtl {
+    padding-left: 1em; }
+  .login-dialog-user-list-item:hover {
+    background-color: #215d9c;
+    color: #ffffff; }
+  .login-dialog-user-list-item .login-dialog-timed-login-indicator {
+    height: 2px;
+    background-color: transparent; }
+  .login-dialog-user-list-item:focus .login-dialog-timed-login-indicator {
+    background-color: #393f3f; }
+
+.login-dialog-not-listed-label {
+  font-size: 90%;
+  font-weight: bold;
+  color: #a6a69b;
+  padding-top: 1em; }
+
+.screen-shield-arrows {
+  padding-bottom: 3em; }
+
+.screen-shield-arrows Gjs_Arrow {
+  color: white;
+  width: 80px;
+  height: 48px;
+  -arrow-thickness: 12px;
+  -arrow-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); }
+
+.screen-shield-contents-box {
+  spacing: 48px; }
+
+.screen-shield-clock {
+  color: white;
+  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
+  font-weight: bold;
+  text-align: center;
+  padding-bottom: 1.5em; }
+
+.screen-shield-clock-time {
+  font-size: 72pt;
+  text-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); }
+
+.screen-shield-clock-date {
+  font-size: 28pt; }
+
+.screen-shield-notifications-container {
+  padding: 12px;
+  spacing: 24px;
+  width: 30em;
+  background-color: transparent;
+  max-height: 500px; }
+  .screen-shield-notifications-container .summary-notification-stack-scrollview {
+    padding-top: 0;
+    padding-bottom: 0; }
+  .screen-shield-notifications-container .notification-button, .screen-shield-notifications-container 
.notification-icon-button {
+    border: 1px solid rgba(238, 238, 236, 0.5); }
+  .screen-shield-notifications-container .notification {
+    border: 1px solid blue; }
+
+.screen-shield-notification-box {
+  background-color: red;
+  color: blue; }
+
+.screen-shield-notification-source {
+  padding: 3px 6px;
+  spacing: 5px; }
+
+.screen-shield-notification-label {
+  font-weight: bold;
+  padding: 0px 0px 0px 12px; }
+
+.screen-shield-notification-count-text {
+  padding: 0px 0px 0px 12px; }
+
+#panel.lock-screen {
+  background-color: rgba(38, 42, 42, 0.45); }
+
+.screen-shield-background {
+  background: black;
+  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4); }
+
+#lockDialogGroup {
+  background: #2e3436 url(noise-texture.png);
+  background-repeat: repeat; }
+
 #LookingGlassDialog {
   background-color: rgba(0, 0, 0, 0.8);
   spacing: 4px;
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index f2551f6..9fc5343 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -101,7 +101,7 @@ const NotificationsBox = new Lang.Class({
     _init: function() {
         this.actor = new St.BoxLayout({ vertical: true,
                                         name: 'screenShieldNotifications',
-                                        style_class: 'screen-shield-notifications-box' });
+                                        style_class: 'screen-shield-notifications-container' });
 
         this._musicBin = new St.Bin({ style_class: 'screen-shield-notifications-box',
                                       visible: false });