keycloak-aplcache

KEYCLOAK-360 fixed account template menu

3/11/2014 1:40:54 PM

Viliam Rockai

Commit: 0dbd441

Tree: cf64b10

Parents: d1b1a98

Changes

forms/common-themes/src/main/resources/theme/account/base/template.ftl 32(+15 -17)

forms/common-themes/src/main/resources/theme/account/patternfly/resources/css/account.css 26(+23 -3)

forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/logo.png 0(+0 -0)

Details

forms/common-themes/src/main/resources/theme/account/base/template.ftl 32(+15 -17)

diff --git a/forms/common-themes/src/main/resources/theme/account/base/template.ftl b/forms/common-themes/src/main/resources/theme/account/base/template.ftl
index e749c0f..376a421 100644
--- a/forms/common-themes/src/main/resources/theme/account/base/template.ftl
+++ b/forms/common-themes/src/main/resources/theme/account/base/template.ftl
@@ -19,23 +19,21 @@
 <body class="admin-console user ${bodyClass}">
 
     <header class="navbar navbar-default navbar-pf navbar-main header">
-        <div>
-            <nav class="navbar" role="navigation">
-            		<div class="container">
-                		<div class="navbar-header">
-		                    <div class="navbar-title">
-		                    </div>
-	                  </div>  
-
-		                <div class="navbar-collapse">
-		                    <ul class="nav navbar-nav navbar-utility">
-		                        <#if referrer?has_content && referrer.baseUrl?has_content><li><a href="${referrer.baseUrl}">Back to ${referrer.name}</a></li></#if>
-		                        <li><a href="${url.logoutUrl}">Sign Out</a></li>
-		                    </ul>
-		                </div>
-		            </div>
-            </nav>
-        </div>
+        <nav class="navbar" role="navigation">
+            <div class="navbar-header">
+                <div class="container">
+                    <h1 class="navbar-title">Keycloak</h1>
+                </div>
+            </div>
+            <div class="navbar-collapse navbar-collapse-1">
+                <div class="container">
+                    <ul class="nav navbar-nav navbar-utility">
+                        <#if referrer?has_content && referrer.baseUrl?has_content><li><a href="${referrer.baseUrl}">Back to ${referrer.name}</a></li></#if>
+                        <li><a href="${url.logoutUrl}">Sign Out</a></li>
+                    </ul>
+                </div>
+            </div>
+        </nav>
     </header>
 
     <div class="container">

forms/common-themes/src/main/resources/theme/account/patternfly/resources/css/account.css 26(+23 -3)

diff --git a/forms/common-themes/src/main/resources/theme/account/patternfly/resources/css/account.css b/forms/common-themes/src/main/resources/theme/account/patternfly/resources/css/account.css
index 88f312e..6352287 100644
--- a/forms/common-themes/src/main/resources/theme/account/patternfly/resources/css/account.css
+++ b/forms/common-themes/src/main/resources/theme/account/patternfly/resources/css/account.css
@@ -11,13 +11,33 @@ body {
 
 header .navbar {
     margin-bottom: 0;
+    min-height: inherit;
+}
+
+.header .container {
+    position: relative;
 }
 
 .navbar-title {
-    background-image: url('../img/keycloak-logo.png');
-    height: 40px;
+    background-image: url('../img/logo.png');
+    height: 25px;
     background-repeat: no-repeat;
-    margin: 18px 0;
+    width: 103px;
+    margin: 3px 10px 5px;
+    text-indent: -99999px;
+}
+
+.navbar-pf .navbar-utility {
+    top: auto;
+    bottom: 0;
+    right: 15px;
+}
+
+.navbar-pf .navbar-utility > li > a {
+    color: #fff !important;
+    padding-bottom: 12px;
+    padding-top: 11px;
+    border-left: medium none;
 }
 
 .container {

forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/logo.png 0(+0 -0)

diff --git a/forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/logo.png b/forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/logo.png
new file mode 100644
index 0000000..9cbaf03
Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/account/patternfly/resources/img/logo.png differ