diff --git a/forms/common-themes/src/main/resources/META-INF/keycloak-themes.json b/forms/common-themes/src/main/resources/META-INF/keycloak-themes.json
index 1c462e3906..56322d3176 100644
--- a/forms/common-themes/src/main/resources/META-INF/keycloak-themes.json
+++ b/forms/common-themes/src/main/resources/META-INF/keycloak-themes.json
@@ -2,11 +2,8 @@
"themes": [{
"name" : "base",
"types": [ "admin", "account", "login" ]
- }, {
- "name" : "patternfly",
- "types": [ "admin", "account", "login" ]
}, {
"name" : "keycloak",
- "types": [ "account", "login", "common", "email", "welcome" ]
+ "types": [ "admin", "account", "login", "common", "email", "welcome" ]
}]
}
\ No newline at end of file
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/admin/resources/css/styles.css b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/admin/resources/css/styles.css
rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/admin/resources/img/brand.svg b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/brand.svg
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/admin/resources/img/brand.svg
rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/brand.svg
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/admin/resources/img/favicon.ico b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/favicon.ico
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/admin/resources/img/favicon.ico
rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/favicon.ico
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/admin/resources/img/select-arrow.png b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/select-arrow.png
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/admin/resources/img/select-arrow.png
rename to forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/select-arrow.png
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/admin/theme.properties b/forms/common-themes/src/main/resources/theme/keycloak/admin/theme.properties
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/admin/theme.properties
rename to forms/common-themes/src/main/resources/theme/keycloak/admin/theme.properties
diff --git a/forms/common-themes/src/main/resources/theme/keycloak/login/resources/css/login.css b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/css/login.css
index 72eb883a4d..16068257fe 100644
--- a/forms/common-themes/src/main/resources/theme/keycloak/login/resources/css/login.css
+++ b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/css/login.css
@@ -1,16 +1,327 @@
.login-pf body {
- background: #034672 url("../img/login-bg.png") top left no-repeat;
+ background: #0f0f0f url("../img/keycloak-bg.png") top left no-repeat;
background-size: 100% auto;
}
-.login-pf .container {
- background-color: rgba(0, 0, 0, 0.2);
+.kc-dropdown{
+ position: relative;
}
-
-.login-pf .container .details {
- border-left: 1px solid rgba(255, 255, 255, 0.1);
-}
-
-.login-pf .form-control {
+.kc-dropdown > a{
+ position: absolute;
+ right: 0px;
+ display:block;
+ padding: 11px 10px 12px;
+ line-height: 12px;
font-size: 12px;
-}
\ No newline at end of file
+ color: #fff !important;
+ text-decoration: none;
+}
+.kc-dropdown > a::after{
+ content: "\2c5";
+ margin-left: 4px;
+}
+.kc-dropdown:hover > a{
+ background-color: rgba(0,0,0,0.2);
+}
+.kc-dropdown ul li a{
+ padding: 1px 11px;
+ font-size: 12px;
+ color: #000 !important;
+ border: 1px solid #fff;
+ text-decoration: none;
+ display:block;
+ line-height: 20px;
+}
+.kc-dropdown ul li a:hover{
+ color: #4d5258;
+ background-color: #d4edfa;
+ border-color: #b3d3e7;
+}
+.kc-dropdown ul{
+ position: absolute;
+ right: 0px;
+ top: 35px;
+ z-index: 2000;
+ list-style:none;
+ display:none;
+ padding: 5px 0px;
+ margin: 0px;
+ background-color: #fff !important;
+ border: 1px solid #b6b6b6;
+ border-radius: 1px;
+ -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+ box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+ background-clip: padding-box;
+ min-width: 100px;
+}
+.kc-dropdown:hover ul{
+ display:block;
+}
+
+.login-pf .container {
+ padding-top: 40px;
+}
+
+.login-pf a:hover {
+ color: #0099d3;
+}
+
+#kc-logo {
+ width: 100%;
+}
+
+#kc-logo-wrapper {
+ background-image: url("../img/keycloak-logo.png");
+ background-repeat: no-repeat;
+ background-position: top right;
+
+ height: 37px;
+
+ margin: 50px;
+}
+
+#kc-header {
+ overflow: visible;
+ padding-left: 80px;
+ white-space: nowrap;
+}
+
+#kc-header-wrapper {
+ font-size: 26px;
+ text-transform: uppercase;
+ line-height: 1.2em;
+ margin-bottom: 15px;
+}
+
+#kc-container-wrapper {
+ bottom: 13%;
+ position: absolute;
+ width: 100%;
+}
+
+#kc-content {
+ position: relative;
+}
+
+#kc-content-wrapper {
+ overflow-y: hidden;
+}
+
+#kc-info {
+ padding-bottom: 200px;
+ margin-bottom: -200px;
+}
+
+#kc-info-wrapper {
+ font-size: 13px;
+}
+
+#kc-form-options span {
+ display: block;
+}
+
+#kc-login {
+ float: right;
+ margin-left: 10px;
+}
+
+#kc-feedback-wrapper {
+ display: inline-block;
+ width: auto;
+ background-position: left bottom;
+ background-repeat: no-repeat;
+ padding-bottom: 10px;
+}
+
+#kc-feedback span {
+ display: block;
+ padding: 0.90909090909091em 3.63636363636364em;
+ border-style: solid;
+ border-width: 1px 1px 0px 1px;
+ background-repeat: no-repeat;
+ background-position: 1.27272727272727em center;
+ font-weight: normal;
+ line-height: 1.4em;
+ border-radius: 2px;
+ color: #4d5258;
+ margin-bottom: 0;
+}
+
+.feedback-error #kc-feedback-wrapper {
+ background-image: url(../img/feedback-error-arrow-down.png);
+}
+.feedback-error span {
+ border-color: #b91415;
+ background-image: url(../img/feedback-error-sign.png);
+ background-color: #f8e7e7;
+}
+
+.feedback-success #kc-feedback-wrapper {
+ background-image: url(../img/feedback-success-arrow-down.png);
+}
+.feedback-success span {
+ border-color: #4b9e39;
+ background-image: url(../img/feedback-success-sign.png);
+ background-color: #e4f1e1;
+}
+
+.feedback-warning #kc-feedback-wrapper {
+ background-image: url(../img/feedback-warning-arrow-down.png);
+}
+.feedback-warning span {
+ border-color: #f17528;
+ background-image: url(../img/feedback-warning-sign.png);
+ background-color: #fef1e9;
+}
+
+#kc-registration {
+ margin-bottom: 15px;
+}
+
+/* TOTP */
+
+ol#kc-totp-settings {
+ margin: 0;
+ padding: 0;
+}
+
+ol#kc-totp-settings li {
+ margin-top: 1em;
+}
+
+ol#kc-totp-settings li:first-of-type {
+ margin-top: 0;
+}
+
+/* OAuth */
+
+#kc-oauth h3 {
+ margin-top: 0;
+}
+
+#kc-oauth ul {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
+
+#kc-oauth ul li {
+ border-top: 1px solid rgba(255, 255, 255, 0.1);
+ font-size: 12px;
+ padding: 10px 30px;
+}
+
+#kc-oauth ul li:first-of-type {
+ border-top: 0;
+}
+
+#kc-oauth .kc-role {
+ display: inline-block;
+ width: 50%;
+}
+
+/* Code */
+#kc-code textarea {
+ width: 100%;
+ height: 8em;
+}
+
+/* Social */
+
+#kc-social-providers ul {
+ padding: 0;
+ margin: 0;
+}
+
+#kc-social-providers li {
+ display: block;
+ margin-top: 5px;
+}
+
+#kc-social-providers li:first-of-type {
+ margin-top: 0;
+}
+
+.zocial {
+ width: 150px;
+}
+
+.zocial:hover {
+ color: #fff !important;
+}
+
+.zocial.facebook,
+.zocial.github,
+.zocial.google,
+.zocial.twitter {
+ background-image: none;
+ border-radius: 2px;
+
+ font-family: "Open Sans", sans-serif;
+ font-weight: normal;
+
+ box-shadow: none;
+ text-shadow: none;
+}
+
+.zocial.google {
+ background-color: #dd4b39 !important;
+}
+.zocial.google .text:after {
+ content: "+";
+}
+
+.zocial.facebook:hover,
+.zocial.github:hover,
+.zocial.google:hover,
+.zocial.twitter:hover {
+ background-image: linear-gradient(rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 100%) !important;
+}
+
+@media (max-width: 767px) {
+ #kc-logo-wrapper {
+ margin-top: 30px;
+ margin-right: 15px;
+ }
+
+ #kc-header {
+ padding-left: 15px;
+ padding-right: 15px;
+ float: none;
+ }
+
+ #kc-feedback {
+ padding-left: 15px;
+ padding-right: 15px;
+ float: none;
+ }
+
+ #kc-form {
+ float: none;
+ }
+
+ #kc-info-wrapper {
+ border-top: 1px solid rgba(255, 255, 255, 0.1);
+ margin-top: 15px;
+ padding-top: 15px;
+ padding-left: 0px;
+ padding-right: 15px;
+ }
+
+ #kc-social-providers li {
+ display: inline-block;
+ margin-right: 5px;
+ }
+
+ .login-pf .container {
+ padding-top: 15px;
+ padding-bottom: 15px;
+ }
+}
+
+@media (max-height: 500px) {
+ #kc-container-wrapper {
+ position: inherit;
+ float: none;
+ }
+}
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/favicon.ico b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/favicon.ico
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/favicon.ico
rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/favicon.ico
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-error-arrow-down.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-error-arrow-down.png
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-error-arrow-down.png
rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-error-arrow-down.png
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-error-sign.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-error-sign.png
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-error-sign.png
rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-error-sign.png
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-success-arrow-down.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-success-arrow-down.png
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-success-arrow-down.png
rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-success-arrow-down.png
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-success-sign.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-success-sign.png
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-success-sign.png
rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-success-sign.png
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-warning-arrow-down.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-warning-arrow-down.png
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-warning-arrow-down.png
rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-warning-arrow-down.png
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-warning-sign.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-warning-sign.png
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/feedback-warning-sign.png
rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/feedback-warning-sign.png
diff --git a/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-bg.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-bg.png
new file mode 100644
index 0000000000..3e579b7f4b
Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-bg.png differ
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/keycloak-logo.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo.png
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/keycloak-logo.png
rename to forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo.png
diff --git a/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/login-bg.png b/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/login-bg.png
deleted file mode 100644
index 46498e7438..0000000000
Binary files a/forms/common-themes/src/main/resources/theme/keycloak/login/resources/img/login-bg.png and /dev/null differ
diff --git a/forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties b/forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties
index 599759a160..7c83966cd7 100644
--- a/forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties
+++ b/forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties
@@ -1,4 +1,30 @@
-parent=patternfly
+parent=base
import=common/keycloak
-styles= ../patternfly/lib/patternfly/css/patternfly.css ../patternfly/css/login.css ../patternfly/lib/zocial/zocial.css css/login.css
\ No newline at end of file
+styles=lib/patternfly/css/patternfly.css lib/zocial/zocial.css css/login.css
+meta=viewport==width=device-width,initial-scale=1
+
+kcHtmlClass=login-pf
+
+kcContentClass=col-sm-12 col-md-12 col-lg-12 container
+kcContentWrapperClass=row
+
+kcHeaderClass=col-xs-12 col-sm-7 col-md-6 col-lg-5
+kcFeedBackClass=col-xs-12 col-sm-4 col-md-5 col-lg-6
+kcFeedBackPlaceholderClass=col-xs-12 col-sm-4 col-md-5 col-lg-6
+kcLocaleClass=col-xs-12 col-sm-1
+
+kcFormAreaClass=col-xs-12 col-sm-8 col-md-8 col-lg-6 login
+
+kcFormClass=form-horizontal
+kcFormGroupClass=form-group
+kcFormGroupErrorClass=has-error
+kcLabelClass=control-label
+kcLabelWrapperClass=col-xs-12 col-sm-12 col-md-4 col-lg-3
+kcInputClass=form-control
+kcInputWrapperClass=col-xs-12 col-sm-12 col-md-8 col-lg-9
+kcFormOptionsClass=col-xs-4 col-sm-5 col-md-offset-4 col-md-4 col-lg-offset-3 col-lg-5
+kcFormButtonsClass=col-xs-8 col-sm-7 col-md-4 col-lg-4 submit
+kcTextareaClass=form-control
+
+kcInfoAreaClass=col-xs-12 col-sm-4 col-md-4 col-lg-6 details
\ No newline at end of file
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/css/login.css b/forms/common-themes/src/main/resources/theme/patternfly/login/resources/css/login.css
deleted file mode 100644
index 2bc07bb274..0000000000
--- a/forms/common-themes/src/main/resources/theme/patternfly/login/resources/css/login.css
+++ /dev/null
@@ -1,322 +0,0 @@
-.kc-dropdown{
- position: relative;
-}
-.kc-dropdown > a{
- position: absolute;
- right: 0px;
- display:block;
- padding: 11px 10px 12px;
- line-height: 12px;
- font-size: 12px;
- color: #fff !important;
- text-decoration: none;
-}
-.kc-dropdown > a::after{
- content: "\2c5";
- margin-left: 4px;
-}
-.kc-dropdown:hover > a{
- background-color: rgba(0,0,0,0.2);
-}
-.kc-dropdown ul li a{
- padding: 1px 11px;
- font-size: 12px;
- color: #000 !important;
- border: 1px solid #fff;
- text-decoration: none;
- display:block;
- line-height: 20px;
-}
-.kc-dropdown ul li a:hover{
- color: #4d5258;
- background-color: #d4edfa;
- border-color: #b3d3e7;
-}
-.kc-dropdown ul{
- position: absolute;
- right: 0px;
- top: 35px;
- z-index: 2000;
- list-style:none;
- display:none;
- padding: 5px 0px;
- margin: 0px;
- background-color: #fff !important;
- border: 1px solid #b6b6b6;
- border-radius: 1px;
- -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
- box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
- background-clip: padding-box;
- min-width: 100px;
-}
-.kc-dropdown:hover ul{
- display:block;
-}
-
-.login-pf .container {
- padding-top: 40px;
-}
-
-.login-pf a:hover {
- color: #0099d3;
-}
-
-#kc-logo {
- width: 100%;
-}
-
-#kc-logo-wrapper {
- background-image: url("../img/keycloak-logo.png");
- background-repeat: no-repeat;
- background-position: top right;
-
- height: 37px;
-
- margin: 50px;
-}
-
-#kc-header {
- overflow: visible;
- padding-left: 80px;
- white-space: nowrap;
-}
-
-#kc-header-wrapper {
- font-size: 26px;
- text-transform: uppercase;
- line-height: 1.2em;
- margin-bottom: 15px;
-}
-
-#kc-container-wrapper {
- bottom: 13%;
- position: absolute;
- width: 100%;
-}
-
-#kc-content {
- position: relative;
-}
-
-#kc-content-wrapper {
- overflow-y: hidden;
-}
-
-#kc-info {
- padding-bottom: 200px;
- margin-bottom: -200px;
-}
-
-#kc-info-wrapper {
- font-size: 13px;
-}
-
-#kc-form-options span {
- display: block;
-}
-
-#kc-login {
- float: right;
- margin-left: 10px;
-}
-
-#kc-feedback-wrapper {
- display: inline-block;
- width: auto;
- background-position: left bottom;
- background-repeat: no-repeat;
- padding-bottom: 10px;
-}
-
-#kc-feedback span {
- display: block;
- padding: 0.90909090909091em 3.63636363636364em;
- border-style: solid;
- border-width: 1px 1px 0px 1px;
- background-repeat: no-repeat;
- background-position: 1.27272727272727em center;
- font-weight: normal;
- line-height: 1.4em;
- border-radius: 2px;
- color: #4d5258;
- margin-bottom: 0;
-}
-
-.feedback-error #kc-feedback-wrapper {
- background-image: url(../img/feedback-error-arrow-down.png);
-}
-.feedback-error span {
- border-color: #b91415;
- background-image: url(../img/feedback-error-sign.png);
- background-color: #f8e7e7;
-}
-
-.feedback-success #kc-feedback-wrapper {
- background-image: url(../img/feedback-success-arrow-down.png);
-}
-.feedback-success span {
- border-color: #4b9e39;
- background-image: url(../img/feedback-success-sign.png);
- background-color: #e4f1e1;
-}
-
-.feedback-warning #kc-feedback-wrapper {
- background-image: url(../img/feedback-warning-arrow-down.png);
-}
-.feedback-warning span {
- border-color: #f17528;
- background-image: url(../img/feedback-warning-sign.png);
- background-color: #fef1e9;
-}
-
-#kc-registration {
- margin-bottom: 15px;
-}
-
-/* TOTP */
-
-ol#kc-totp-settings {
- margin: 0;
- padding: 0;
-}
-
-ol#kc-totp-settings li {
- margin-top: 1em;
-}
-
-ol#kc-totp-settings li:first-of-type {
- margin-top: 0;
-}
-
-/* OAuth */
-
-#kc-oauth h3 {
- margin-top: 0;
-}
-
-#kc-oauth ul {
- list-style: none;
- padding: 0;
- margin: 0;
-}
-
-#kc-oauth ul li {
- border-top: 1px solid rgba(255, 255, 255, 0.1);
- font-size: 12px;
- padding: 10px 30px;
-}
-
-#kc-oauth ul li:first-of-type {
- border-top: 0;
-}
-
-#kc-oauth .kc-role {
- display: inline-block;
- width: 50%;
-}
-
-/* Code */
-#kc-code textarea {
- width: 100%;
- height: 8em;
-}
-
-/* Social */
-
-#kc-social-providers ul {
- padding: 0;
- margin: 0;
-}
-
-#kc-social-providers li {
- display: block;
- margin-top: 5px;
-}
-
-#kc-social-providers li:first-of-type {
- margin-top: 0;
-}
-
-.zocial {
- width: 150px;
-}
-
-.zocial:hover {
- color: #fff !important;
-}
-
-.zocial.facebook,
-.zocial.github,
-.zocial.google,
-.zocial.twitter {
- background-image: none;
- border-radius: 2px;
-
- font-family: "Open Sans", sans-serif;
- font-weight: normal;
-
- box-shadow: none;
- text-shadow: none;
-}
-
-.zocial.google {
- background-color: #dd4b39 !important;
-}
-.zocial.google .text:after {
- content: "+";
-}
-
-.zocial.facebook:hover,
-.zocial.github:hover,
-.zocial.google:hover,
-.zocial.twitter:hover {
- background-image: linear-gradient(rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 100%) !important;
-}
-
-@media (max-width: 767px) {
- #kc-logo-wrapper {
- margin-top: 30px;
- margin-right: 15px;
- }
-
- #kc-header {
- padding-left: 15px;
- padding-right: 15px;
- float: none;
- }
-
- #kc-feedback {
- padding-left: 15px;
- padding-right: 15px;
- float: none;
- }
-
- #kc-form {
- float: none;
- }
-
- #kc-info-wrapper {
- border-top: 1px solid rgba(255, 255, 255, 0.1);
- margin-top: 15px;
- padding-top: 15px;
- padding-left: 0px;
- padding-right: 15px;
- }
-
- #kc-social-providers li {
- display: inline-block;
- margin-right: 5px;
- }
-
- .login-pf .container {
- padding-top: 15px;
- padding-bottom: 15px;
- }
-}
-
-@media (max-height: 500px) {
- #kc-container-wrapper {
- position: inherit;
- float: none;
- }
-}
diff --git a/forms/common-themes/src/main/resources/theme/patternfly/login/theme.properties b/forms/common-themes/src/main/resources/theme/patternfly/login/theme.properties
deleted file mode 100644
index 7c83966cd7..0000000000
--- a/forms/common-themes/src/main/resources/theme/patternfly/login/theme.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-parent=base
-import=common/keycloak
-
-styles=lib/patternfly/css/patternfly.css lib/zocial/zocial.css css/login.css
-meta=viewport==width=device-width,initial-scale=1
-
-kcHtmlClass=login-pf
-
-kcContentClass=col-sm-12 col-md-12 col-lg-12 container
-kcContentWrapperClass=row
-
-kcHeaderClass=col-xs-12 col-sm-7 col-md-6 col-lg-5
-kcFeedBackClass=col-xs-12 col-sm-4 col-md-5 col-lg-6
-kcFeedBackPlaceholderClass=col-xs-12 col-sm-4 col-md-5 col-lg-6
-kcLocaleClass=col-xs-12 col-sm-1
-
-kcFormAreaClass=col-xs-12 col-sm-8 col-md-8 col-lg-6 login
-
-kcFormClass=form-horizontal
-kcFormGroupClass=form-group
-kcFormGroupErrorClass=has-error
-kcLabelClass=control-label
-kcLabelWrapperClass=col-xs-12 col-sm-12 col-md-4 col-lg-3
-kcInputClass=form-control
-kcInputWrapperClass=col-xs-12 col-sm-12 col-md-8 col-lg-9
-kcFormOptionsClass=col-xs-4 col-sm-5 col-md-offset-4 col-md-4 col-lg-offset-3 col-lg-5
-kcFormButtonsClass=col-xs-8 col-sm-7 col-md-4 col-lg-4 submit
-kcTextareaClass=form-control
-
-kcInfoAreaClass=col-xs-12 col-sm-4 col-md-4 col-lg-6 details
\ No newline at end of file
diff --git a/misc/logo/login-bg.svg b/misc/logo/login-bg.svg
index f710b1b8c7..ad5d206330 100644
--- a/misc/logo/login-bg.svg
+++ b/misc/logo/login-bg.svg
@@ -1,318 +1,771 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/misc/logo/login-bkgrnd.svg b/misc/logo/login-bkgrnd.svg
index 2d8216c21a..6a2db8b3d1 100644
--- a/misc/logo/login-bkgrnd.svg
+++ b/misc/logo/login-bkgrnd.svg
@@ -7,29 +7,205 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1440"
height="1200"
id="svg3601"
version="1.1"
- inkscape:version="0.48.4 r9939"
- inkscape:export-filename="/home/st/dev/keycloak/forms/common-themes/src/main/resources/theme/login/keycloak/resources/img/login-bg.png"
+ inkscape:version="0.48.5 r10040"
+ inkscape:export-filename="/home/st/dev/keycloak/forms/common-themes/src/main/resources/theme/patternfly/login/resources/img/keycloak-bg.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
sodipodi:docname="login-bkgrnd.svg">
+ id="defs3603">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
index d1a85b567e..6b2db7b04e 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
@@ -269,7 +269,7 @@ public class AdminConsole {
} else {
String adminTheme = realm.getAdminTheme();
if (adminTheme == null) {
- adminTheme = "patternfly";
+ adminTheme = "keycloak";
}
Map map = new HashMap<>();