From a7f525cb882a1f194b6762f5f55e00b9c5da5b21 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Tue, 5 May 2015 21:53:00 -0700
Subject: [PATCH] GUAC-587: Add login-ui class to all CSS rules within the
 login module.

---
 .../main/webapp/app/login/styles/dialog.css    | 18 +++++++++---------
 .../src/main/webapp/app/login/styles/input.css |  4 ++--
 .../src/main/webapp/app/login/styles/login.css | 14 +++++++-------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/guacamole/src/main/webapp/app/login/styles/dialog.css b/guacamole/src/main/webapp/app/login/styles/dialog.css
index 102d654f0..c2d3a9709 100644
--- a/guacamole/src/main/webapp/app/login/styles/dialog.css
+++ b/guacamole/src/main/webapp/app/login/styles/dialog.css
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-.error .login-dialog {
+.login-ui.error .login-dialog {
     animation-name: shake-head;
     animation-duration: 0.25s;
     animation-timing-function: linear;
@@ -29,14 +29,14 @@
     -webkit-animation-timing-function: linear;
 }
 
-div.login-dialog-middle {
+.login-ui div.login-dialog-middle {
     width: 100%;
     display: table-cell;
     vertical-align: middle;
     text-align: center;
 }
 
-div.login-dialog {
+.login-ui div.login-dialog {
 
     animation: fadein 0.125s linear;
     -moz-animation: fadein 0.125s linear;
@@ -53,27 +53,27 @@ div.login-dialog {
     display: inline-block;
 }
 
-div.login-dialog h1 {
+.login-ui .login-dialog h1 {
     margin-top: 0;
     margin-bottom: 0em;
     text-align: center;
 }
 
-div.login-dialog .buttons {
+.login-ui .login-dialog .buttons {
     text-align: right;
     margin: 0;
     margin-top: 1em;
 }
 
-div.login-dialog .login-fields {
+.login-ui .login-dialog .login-fields {
     vertical-align: middle;
 }
 
-div.login-dialog th {
+.login-ui .login-dialog th {
     text-shadow: 1px 1px white;
 }
 
-.login-dialog .version {
+.login-ui .login-dialog .version {
     font-size: 1.25em;
     font-weight: bold;
     padding: 0.5em 0;
@@ -81,7 +81,7 @@ div.login-dialog th {
     text-align: center;
 }
 
-.login-dialog .logo {
+.login-ui .login-dialog .logo {
     display: block;
     max-width: 3em;
     margin: 0.5em auto;
diff --git a/guacamole/src/main/webapp/app/login/styles/input.css b/guacamole/src/main/webapp/app/login/styles/input.css
index ca640b169..bda0f71ad 100644
--- a/guacamole/src/main/webapp/app/login/styles/input.css
+++ b/guacamole/src/main/webapp/app/login/styles/input.css
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-.login-fields input {
+.login-ui .login-dialog .login-fields input {
     display: block;
     border: 1px solid rgba(0, 0, 0, 0.25);
     -moz-border-radius: 0.2em;
@@ -35,7 +35,7 @@
     max-width: none;
 }
 
-input[type="submit"].login {
+.login-ui .login-dialog .login-fields input[type="submit"] {
     width: 100%;
     margin: 0;
 }
\ No newline at end of file
diff --git a/guacamole/src/main/webapp/app/login/styles/login.css b/guacamole/src/main/webapp/app/login/styles/login.css
index 8f5a6d895..2b2393ff2 100644
--- a/guacamole/src/main/webapp/app/login/styles/login.css
+++ b/guacamole/src/main/webapp/app/login/styles/login.css
@@ -31,11 +31,11 @@ div.login-ui {
     z-index: 20;
 }
 
-p.login-error {
+.login-ui p.login-error {
     display: none;
 }
 
-.error p.login-error {
+.login-ui.error p.login-error {
     display: block;
 
     position: fixed;
@@ -55,16 +55,16 @@ p.login-error {
     color: #964040;
 }
 
-.login-fields .form-field .password-field .toggle-password {
+.login-ui .login-fields .form-field .password-field .toggle-password {
     display: none;
 }
 
-.login-fields .labeled-field {
+.login-ui .login-fields .labeled-field {
     display: block;
     position: relative;
 }
 
-.login-fields .labeled-field .field-header {
+.login-ui .login-fields .labeled-field .field-header {
 
   display: block;
   position: absolute;
@@ -79,10 +79,10 @@ p.login-error {
 
 }
 
-.login-fields .labeled-field.empty input {
+.login-ui .login-fields .labeled-field.empty input {
     background: transparent;
 }
 
-.login-fields .labeled-field input:focus {
+.login-ui .login-fields .labeled-field input:focus {
     background: white;
 }