Merge pull request #1211 from stianst/master

Updated example themes

examples/themes/src/main/resources/theme/logo-example/account/resources/css/account.css

@@ -1,8 +0,0 @@
-.navbar-title {
-    background-image: url('../img/red-hat-logo.png');
-    height: 65px;
-    background-repeat: no-repeat;
-    width: 203px;
-    margin: 3px 10px 5px;
-    text-indent: -99999px;
-}

examples/themes/src/main/resources/theme/logo-example/account/resources/css/logo.css

@@ -0,0 +1,5 @@
+.navbar-title {
+    background: url('../img/red-hat-logo.png') no-repeat;
+    height: 45px;
+    width: 150px;
+}

examples/themes/src/main/resources/theme/logo-example/account/theme.properties

@@ -1,4 +1,4 @@
 parent=keycloak
 import=common/keycloak
 
-styles= ../patternfly/lib/patternfly/css/patternfly.css ../patternfly/css/account.css ../keycloak/css/account.css css/account.css
+styles=lib/patternfly/css/patternfly.css css/account.css css/logo.css

examples/themes/src/main/resources/theme/logo-example/admin/resources/css/logo.css

@@ -0,0 +1,7 @@
+
+.navbar-pf .navbar-brand {
+    background: url('../img/red-hat-logo.png') no-repeat 0px 0px;
+    display: block;
+    height: 25px;
+    width: 200px;
+}

examples/themes/src/main/resources/theme/logo-example/admin/resources/css/overrides.css

@@ -1,8 +0,0 @@
-.navbar-title {
-    background-image: url('../img/red-hat-logo.png');
-    height: 65px;
-    background-repeat: no-repeat;
-    width: 203px;
-    margin: 3px 10px 5px;
-    text-indent: -99999px;
-}

examples/themes/src/main/resources/theme/logo-example/admin/theme.properties

@@ -1,2 +1,3 @@
 parent=keycloak
 import=common/keycloak
+styles=css/styles.css lib/patternfly/css/patternfly.css lib/select2-3.4.1/select2.css css/styles.css css/logo.css

examples/themes/src/main/resources/theme/logo-example/login/resources/css/login.css

@@ -1,9 +0,0 @@
-#kc-logo-wrapper {
-    background-image: url("../img/red-hat-logo.png");
-    background-repeat: no-repeat;
-    background-position: top right;
-
-    height: 65px;
-
-    margin: 100px;
-}

examples/themes/src/main/resources/theme/logo-example/login/resources/css/logo.css

@@ -0,0 +1,4 @@
+#kc-logo-wrapper {
+    background: url("../img/red-hat-logo.png") no-repeat top right;
+    height: 45px;
+}

examples/themes/src/main/resources/theme/logo-example/login/theme.properties

@@ -1,4 +1,4 @@
 parent=keycloak
 import=common/keycloak
 
-styles= ../patternfly/lib/patternfly/css/patternfly.css ../patternfly/css/login.css ../patternfly/lib/zocial/zocial.css ../keycloak/css/login.css css/login.css
+styles=lib/patternfly/css/patternfly.css lib/zocial/zocial.css css/login.css css/logo.css

forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html

@@ -5,9 +5,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
     </button>
-    <a class="navbar-brand" href="#/">
+    <a class="navbar-brand" href="#/"></a>
-        <img data-ng-src="{{resourceUrl + '/img/brand.svg'}}" alt="Keycloak" />
-    </a>
 </div>
 <div class="collapse navbar-collapse navbar-collapse-1">
     <ul class="nav navbar-nav navbar-utility">

forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css

@@ -3,7 +3,10 @@ html,body {
 }
 
 .navbar-pf .navbar-brand {
-    padding: 5px 0 0px;
+    background: url('../img/brand.svg') no-repeat 0px 5px;
+    display: block;
+    height: 25px;
+    width: 200px;
 }
 
 form {

testsuite/integration/src/test/resources/META-INF/keycloak-server.json

@@ -48,7 +48,8 @@
         "cacheThemes": "${keycloak.theme.cacheThemes:true}",
         "folder": {
             "dir": "${keycloak.theme.dir}"
-        }
+        } ,
+        "welcomeTheme": "logo-example"
     },
 
     "login": {