keycloak-aplcache

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 17ebb97..56322d3 100755
--- a/forms/common-themes/src/main/resources/META-INF/keycloak-themes.json
+++ b/forms/common-themes/src/main/resources/META-INF/keycloak-themes.json
@@ -5,9 +5,5 @@
     }, {
         "name" : "keycloak",
         "types": [ "admin", "account", "login", "common", "email", "welcome" ]
-    },
-        {
-        "name" : "patternfly",
-        "types": [ "account"]
     }]
 }
\ No newline at end of file

diff --git a/forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css b/forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css
index 40f7689..a18d0f2 100644
--- a/forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css
+++ b/forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css
@@ -1,56 +1,274 @@
-.navbar-pf {
-    background-image: url('../img/header-bkgrnd.png');
-    border-top: 3px solid rgba(255, 255, 255, 0.15);
+html {
+    height: 100%;
 }
 
-.navbar-pf .navbar-primary {
-    font-size: 13px;
-    background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, .4) 100%);
-    background-image: linear-gradient(to bottom, rgba(0, 0, 0, .1) 0%, rgba(0, 0, 0, .4) 100%);
+body {
+    background-color: #F9F9F9;
+    margin: 0;
+    padding: 0;
+    height: 100%;
 }
 
-.navbar-pf .navbar-header {
-    border-bottom: 1px solid rgba(255, 255, 255, .15);
+header .navbar {
+    margin-bottom: 0;
+    min-height: inherit;
 }
 
-.navbar-pf .navbar-primary li.dropdown.context > a,
-.navbar-pf .navbar-primary li.dropdown.context > a:hover,
-.navbar-pf .navbar-primary li.dropdown.context.open > a,
-.navbar-pf .navbar-primary > .active > a,
-.navbar-pf .navbar-primary > .active > a:hover {
-    background-color: rgba(0, 0, 0, 0.1);
-    border-bottom-color: rgba(0, 0, 0, 0.3);
-    border-right: rgba(0, 0, 0, 0.3);
-    border-top-color: rgba(0, 0, 0, 0.1);
-    font-weight: 600;
-    background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);
-    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);
-    background-repeat: repeat-x;
+.header .container {
+    position: relative;
 }
 
-.navbar-pf .navbar-primary li.dropdown.context > a:hover,
-.navbar-pf .navbar-primary li.dropdown.context.open > a,
-.navbar-pf .navbar-primary > .active > a:hover {
-    background-color: rgba(0, 0, 0, 0.3);
+.navbar-title {
+    background-image: url('../img/logo.png');
+    height: 25px;
+    background-repeat: no-repeat;
+    width: 103px;
+    margin: 3px 10px 5px;
+    text-indent: -99999px;
 }
 
-.navbar-pf .navbar-primary > .active > a {
-    background-color: rgba(0, 0, 0, 0.1);
-    border-bottom-color: rgba(0, 0, 0, 0.3);
-    border-right: rgba(0, 0, 0, 0.3);
-    border-top-color: rgba(0, 0, 0, 0.1);
-    font-weight: 600;
-    background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);
-    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);
-    background-repeat: repeat-x;
+.navbar-pf .navbar-utility {
+	right: 20px;
+    top: -34px;
+    font-size: 12px;
 }
 
 .navbar-pf .navbar-utility > li > a {
-    border-left: none;
+    color: #fff !important;
+    padding-bottom: 12px;
+    padding-top: 11px;
+    border-left: medium none;
+}
+
+.container {
+    height: 100%;
+}
+
+.content-area {
+    background-color: #fff;
+    border-color: #CECECE;
+    border-style: solid;
+    border-width: 0 1px;
+    height: 100%;
+    padding: 0 30px;
+}
+
+/* Sidebar */
+
+.bs-sidebar {
+    background-color: #f9f9f9;
+    padding-top: 44px;
+    padding-right: 0;
+    padding-left: 0;
+    z-index: 20;
+}
+.bs-sidebar ul {
+    list-style: none;
+    padding-left: 12px;
+}
+
+.bs-sidebar ul li {
+    margin-bottom: 0.5em;
+    margin-left: -1em;
+}
+.bs-sidebar ul li a {
+    font-size: 14px;
+    padding-left: 25px;
+    color: #4d5258;
+    line-height: 28px;
+    display: block;
+    border-width: 1px 0 1px 1px;
+    border-style: solid;
+    border-color: #f9f9f9;
+}
+.bs-sidebar ul li a:hover,
+.bs-sidebar ul li a:focus {
+    text-decoration: none;
+    color: #777777;
+    border-right: 2px solid #aaa;
+}
+.bs-sidebar ul li.active a {
+    background-color: #c7e5f0;
+    border-color: #56bae0;
+    font-weight: bold;
+    background-image: url(../img/icon-sidebar-active.png);
+    background-repeat: no-repeat;
+    background-position: right center;
+}
+
+.bs-sidebar ul li.active a:hover {
+	border-right: none;
+}
+
+
+.content-area h2 {
+    font-family: "Open Sans", sans-serif;
+    font-weight: 100;
+    font-size: 24px;
+    margin-bottom: 25px;
+    margin-top: 25px;
+}
+
+.subtitle {
+    text-align: right;
+    margin-top: 30px;
+    color: #909090;
+}
+
+.required {
+    color: #CB2915;
+}
+
+
+.alert {
+    margin-top: 30px;
+    margin-bottom: 0;
+}
+
+.feedback-aligner .alert {
+    background-position: 1.27273em center;
+    background-repeat: no-repeat;
+    border-radius: 2px;
+    border-width: 1px;
+    color: #4D5258;
+    display: inline-block;
+    font-size: 1.1em;
+    line-height: 1.4em;
+    margin: 0;
+    padding: 0.909091em 3.63636em;
+    position: relative;
+    text-align: left;
+}
+.alert.alert-success {
+    background-color: #E4F1E1;
+    border-color: #4B9E39;
+}
+.alert.alert-error {
+    background-color: #F8E7E7;
+    border-color: #B91415;
+}
+.alert.alert-warning {
+    background-color: #FEF1E9;
+    border-color: #F17528;
+}
+.alert.alert-info {
+    background-color: #E4F3FA;
+    border-color: #5994B2;
 }
 
-.navbar-pf .navbar-utility > li > a:hover,
-.navbar-pf .navbar-utility > .open > a,
-.navbar-pf .navbar-utility > .open > a:hover {
-    background-color: rgba(0, 0, 0, 0.2);
+.form-horizontal {
+    border-top: 1px solid #E9E8E8;
+    padding-top: 23px;
+}
+
+.form-horizontal .control-label {
+    color: #909090;
+    line-height: 1.4em;
+    padding-top: 5px;
+    position: relative;
+    text-align: right;
+    width: 100%;
+}
+
+.form-group {
+    position: relative;
+}
+
+.control-label + .required {
+    position: absolute;
+    right: -2px;
+    top: 0;
+}
+
+#kc-form-buttons {
+    text-align: right;
+    margin-top: 10px;
+}
+
+#kc-form-buttons .btn-primary {
+    float: right;
+    margin-left: 8px;
+}
+
+/* Authenticator page */
+
+ol {
+    padding-left: 40px;
+}
+
+ol li {
+    font-size: 13px;
+    margin-bottom: 10px;
+    position: relative;
+}
+
+ol li img {
+    margin-top: 15px;
+    width: 180px;
+    margin-bottom: 5px;
+    border: 1px solid #eee;
+}
+
+ol li span {
+    bottom: 80px;
+    left: 200px;
+    position: absolute;
+    font-family: courier, ​monospace;
+    font-size: 13px;
+}
+
+hr + .form-horizontal {
+    border: none;
+    padding-top: 0;
+}
+
+.kc-dropdown{
+    position: relative;
+}
+.kc-dropdown > a{
+    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;
+    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;
 }
\ No newline at end of file

diff --git a/forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties b/forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties
old mode 100755
new mode 100644
index 81310f2..971b6c0
--- a/forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties
+++ b/forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties
@@ -1,4 +1,4 @@
-parent=patternfly
-import=common/keycloak
-
-styles= ../patternfly/lib/patternfly/css/patternfly.css ../patternfly/css/account.css css/account.css
\ No newline at end of file
+parent=base
+import=common/keycloak
+
+styles=lib/patternfly/css/patternfly.css css/account.css
\ No newline at end of file