keycloak-uncached

Design adjustments

10/29/2013 3:43:54 PM

Details

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
index 4ae72a7..d62d21d 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
@@ -1,7 +1,7 @@
 <div class="header rcue">
     <div class="navbar utility">
         <div class="navbar-inner clearfix container">
-            <h1><a href="#"><strong>Keycloak</strong> Central Login</a></h1>
+            <h1><a href="#/realms/{{realm.id}}"><strong>Keycloak</strong> Central Login</a></h1>
             <ul class="nav pull-right" data-ng-hide="auth.loggedIn">
                 <li><a href="/auth-server/rest/saas/login">Login</a></li>
                 <li><a href="/auth-server/rest/saas/registrations">Register</a></li>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html
index b87cf6d..53b405e 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html
@@ -49,7 +49,7 @@
                             </div>
                         </div>
                         <div class="form-group input-select">
-                            <label for="accessCodeLifespanUserAction">Access code user action lifespan</label>
+                            <label for="accessCodeLifespanUserAction" class="two-lines">Access code user action lifespan</label>
                             <div class="input-group">
                                 <input type="text" data-ng-model="realm.accessCodeLifespanUserAction" id="accessCodeLifespanUserAction" name="accessCodeLifespanUserAction" class="tiny">
                                 <div class="select-rcue">
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
index 3dc6177..791dbe0 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
@@ -65,36 +65,6 @@ body {
   min-height: 42px;
   max-width: 1170px;
 }
-.header.rcue .navbar.primary .select-rcue {
-  font-size: 0.76923076923077em;
-  margin-left: 1em;
-  margin-top: 0.7em;
-  display: inline-block;
-  vertical-align: middle;
-  background-color: #555a5e;
-  background-image: none;
-  background-image: url(img/sprite-arrow-down.png);
-  background-repeat: no-repeat;
-  background-position: right -26px;
-  border: 1px solid #676c6e;
-  border-radius: 2px;
-  padding-left: 0;
-}
-.header.rcue .navbar.primary .select-rcue:hover {
-  border-color: #7e8385;
-}
-.header.rcue .navbar.primary .select-rcue select {
-  color: #fff;
-}
-.header.rcue .navbar.primary .select-rcue select:-moz-focusring {
-  color: transparent;
-  text-shadow: 0 0 0 #fff;
-}
-.header.rcue .navbar.primary .select-rcue select option {
-  background-color: #fff;
-  color: #333;
-  padding: 0.36363636363636em 0.90909090909091em;
-}
 .header.rcue .navbar.primary .nav > li {
   /*
             .dropdown { 
@@ -215,7 +185,6 @@ body {
 .header.rcue .navbar.primary .nav > li .select-rcue select option {
   background-color: #fff;
   color: #333;
-  padding: 0.36363636363636em 0.90909090909091em;
 }
 .header.rcue .navbar.primary .nav > li a#refresh {
   border: none;
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
index 928a3f3..c26b72b 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
@@ -88,41 +88,6 @@ body {
             min-height: 42px;
             max-width: 1170px;
         }
-
-        .select-rcue {
-            font-size: 0.76923076923077em;
-            margin-left: 1em;
-            margin-top: 0.7em;
-            display: inline-block;
-            vertical-align: middle;
-            background-color: #555a5e;
-            background-image: none;
-            background-image: url(img/sprite-arrow-down.png);
-            background-repeat: no-repeat;
-            background-position: right -26px;
-            border: 1px solid #676c6e;
-            border-radius: 2px;
-            padding-left: 0;
-            
-            &:hover {
-                border-color: #7e8385;
-            }
-            
-            select {
-                color: #fff;
-                
-                &:-moz-focusring {
-                    color: transparent;
-                    text-shadow: 0 0 0 #fff;
-                }
-                
-                option {
-                    background-color: #fff;
-                    color: #333;
-                    padding: 0.36363636363636em 0.90909090909091em;
-                }
-            }
-        }
         
         .nav > li {
         
@@ -165,7 +130,6 @@ body {
                     option {
                         background-color: #fff;
                         color: #333;
-                        padding: 0.36363636363636em 0.90909090909091em;
                     }
                 }
             }
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
index 89e22f6..6587d91 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
@@ -18,6 +18,8 @@ textarea {
   padding: 0 0.545454545454545em;
   min-width: 18.1818181818182em;
   height: 2.36363636363636em;
+  /* 26px */
+
   border: 1px #b6b6b6 solid;
   border-radius: 2px;
   box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.1);
@@ -550,7 +552,7 @@ input[type="email"].tiny {
 }
 .select-rcue,
 .select2-container .select2-choice {
-  height: 26px;
+  height: 2.6em;
   border: 1px #b6b6b6 solid;
   border-radius: 2px;
   box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.1);
@@ -593,7 +595,7 @@ input[type="email"].tiny {
 }
 .select-rcue option {
   line-height: 2em;
-  padding-left: 0.90909090909091em;
+  padding: 0.363636em 0.909091em;
 }
 .select-rcue option:hover {
   background-color: #d5ecf9;
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
index 15bed0f..a29e5f3 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
@@ -24,7 +24,7 @@ textarea {
     font-size: 1.1em;
     padding: 0 0.545454545454545em;
     min-width: 18.1818181818182em;
-    height: 2.36363636363636em;
+    height: 2.36363636363636em; /* 26px */
     border: 1px #b6b6b6 solid;
     border-radius: 2px;
     box-shadow: inset 0px 2px 2px rgba(0,0,0,0.1);
@@ -656,7 +656,7 @@ input[type="email"] {
 
 .select-rcue,
 .select2-container .select2-choice {
-    height: 26px;
+    height: 2.6em;
     border: 1px #b6b6b6 solid;
     border-radius: 2px;
     box-shadow: inset 0px 2px 2px rgba(0,0,0,0.1);
@@ -707,7 +707,7 @@ input[type="email"] {
     
     option {
         line-height: 2em;
-        padding-left: 0.90909090909091em;
+        padding: 0.363636em 0.909091em;
         
         &:hover {
             background-color: #d5ecf9;