Details
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 8d89464..87592b6 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
@@ -184,17 +184,18 @@ body {
}
.header.rcue .navbar.primary .nav > li .select-rcue select option {
background-color: #fff;
- color: black;
- padding: 4px 10px;
+ color: #333;
+ padding: 0.36363636363636em 0.90909090909091em;
}
.header.rcue .navbar.primary .nav > li a#refresh {
border: none;
margin: 0;
padding: 0;
- float: right;
+ display: inline-block;
+ vertical-align: middle;
font-size: 0.76923076923077em;
margin-left: 1em;
- margin-top: 1.4em;
+ margin-top: 0.7em;
}
.header.rcue .navbar.primary .nav > li a#refresh:hover {
background: none;
@@ -606,7 +607,7 @@ table.list tbody tr.expanded .form-actions {
border-right: none;
}
.container {
- min-width: 56 em;
+ min-width: 56em;
}
#content-area {
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 90b8599..546bf87 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
@@ -129,8 +129,8 @@ body {
option {
background-color: #fff;
- color: black;
- padding: 4px 10px;
+ color: #333;
+ padding: 0.36363636363636em 0.90909090909091em;
}
}
}
@@ -139,10 +139,11 @@ body {
border: none;
margin: 0;
padding: 0;
- float: right;
+ display: inline-block;
+ vertical-align: middle;
font-size: 0.76923076923077em;
margin-left: 1em;
- margin-top: 1.4em;
+ margin-top: 0.7em;
&:hover {
background: none;
@@ -766,7 +767,7 @@ table.list {
}
.container {
- min-width: 56 em;
+ min-width: 56em;
}
#content-area {
@@ -777,10 +778,4 @@ table.list {
border: none;
width: 100%;
}
-}
-
-
-
-
-
-
+}
\ No newline at end of file
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.css
index 081ccd8..edb5894 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.css
@@ -10,6 +10,14 @@ body {
background-size: auto;
background-repeat: no-repeat;
color: #fff;
+ /*
+ .form-area {
+ background-image: url(img/login-register-separator.svg);
+ background-repeat: no-repeat;
+ background-position: 40.2em center;
+ }
+ */
+
/* Login area */
/* Social login area */
@@ -60,11 +68,6 @@ body {
.rcue-login-register .background-area section:first-child {
padding-right: 4.5em;
}
-.rcue-login-register .form-area {
- background-image: url(img/login-register-separator.svg);
- background-repeat: no-repeat;
- background-position: 40.2em center;
-}
.rcue-login-register .form-area.social {
background-image: url(img/login-register-social-separators.svg);
background-position: 39.6em center;
@@ -138,6 +141,9 @@ body {
top: -9.2em;
min-width: 35em;
}
+.rcue-login-register.reset .feedback {
+ left: 35.7em;
+}
.rcue-login-register section.social-login > span {
display: none;
}
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.less
index 8c33302..33c5e76 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.less
@@ -65,11 +65,13 @@ body {
}
+ /*
.form-area {
background-image: url(img/login-register-separator.svg);
background-repeat: no-repeat;
background-position: 40.2em center;
}
+ */
.form-area.social {
background-image: url(img/login-register-social-separators.svg);
@@ -147,6 +149,10 @@ body {
min-width: 35em;
}
+ &.reset .feedback {
+ left: 35.7em;
+ }
+
/* Social login area */
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
index 488259d..7dcab3d 100644
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
@@ -61,11 +61,18 @@ body {
.rcue-login-register .background-area .section:first-child {
padding-right: 4.5em;
}
+/*
.rcue-login-register .form-area {
background-image: url(img/login-register-separator.png);
background-repeat: no-repeat;
background-position: 40.2em center;
}
+*/
+.rcue-login-register.reset .form-area {
+ background-image: url(img/login-register-separator.png);
+ background-repeat: no-repeat;
+ background-position: 43.2em center;
+}
.rcue-login-register .form-area.social {
background-image: url(img/login-register-social-separators.png);
background-position: 39.6em center;
@@ -143,6 +150,9 @@ body {
top: -9.2em;
min-width: 35em;
}
+.rcue-login-register.reset .feedback.bottom-left {
+ left: 35.7em;
+}
.rcue-login-register input.error[type="text"],
.rcue-login-register input.error[type="password"],
.rcue-login-register input.error[type="email"] {
@@ -342,7 +352,7 @@ a.zocial:before {
font-size: 1.3em;
}
-.rcue-login-register.reset .form-area, .rcue-login-register.totp .form-area {
+.rcue-login-register.totp .form-area {
background-image: none;
}
.rcue-login-register.reset .form-area p.instruction {
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
index 7e63046..2b24b4c 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
@@ -13,13 +13,12 @@
<div id="form">
<form action="${url.loginAction}" method="post">
<div>
- <label for="username">${rb.getString('username')}</label>
- <input id="username" name="username" value="${login.username!''}" type="text" />
+ <label for="username">${rb.getString('username')}</label><input id="username" name="username" value="${login.username!''}" type="text" />
</div>
<#list login.requiredCredentials as c>
<div>
- <label for="${c.name}">${rb.getString(c.label)}</label> <input id="${c.name}" name="${c.name}" type="${c.inputType}" />
+ <label for="${c.name}">${rb.getString(c.label)}</label><input id="${c.name}" name="${c.name}" type="${c.inputType}" />
</div>
</#list>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl
index af308ac..ec8a719 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-reset-password.ftl
@@ -23,9 +23,6 @@
</form>
</div>
<#elseif section = "info" >
-
- <div id="info">
- </div>
-
+ <p><a href="saas-login.html">« Back to the Login</a></p>
</#if>
</@layout.registrationLayout>
\ No newline at end of file
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-totp.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-totp.ftl
index 253ab75..0d884f6 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-totp.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-totp.ftl
@@ -16,8 +16,7 @@
<input id="password" name="password" value="${login.password!''}" type="hidden" />
<div>
- <label for="totp">${rb.getString('authenticatorCode')}</label>
- <input id="totp" name="totp" type="text" />
+ <label for="totp">${rb.getString('authenticatorCode')}</label><input id="totp" name="totp" type="text" />
</div>
<div class="aside-btn">
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl
index 4db1911..74142e0 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl
@@ -16,7 +16,7 @@
<label for="password-new">${rb.getString('passwordNew')}</label><input type="password" id="password-new" name="password-new" />
</div>
<div>
- <label for="password-confirm">${rb.getString('passwordConfirm')}</label><input type="password" id="password-confirm" name="password-confirm" />
+ <label for="password-confirm" class="two-lines">${rb.getString('passwordConfirm')}</label><input type="password" id="password-confirm" name="password-confirm" />
</div>
<input class="btn-primary" type="submit" value="Submit" />
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl
index 2683d2f..32bdd23 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl
@@ -21,16 +21,13 @@
</div>
<p class="subtitle">All fields required</p>
<div>
- <label for="email">${rb.getString('email')}</label>
- <input type="text" id="email" name="email" value="${user.email!''}" />
+ <label for="email">${rb.getString('email')}</label><input type="text" id="email" name="email" value="${user.email!''}" />
</div>
<div>
- <label for="firstName">${rb.getString('firstName')}</label>
- <input type="text" id="firstName" name="firstName" value="${user.firstName!''}" />
+ <label for="firstName">${rb.getString('firstName')}</label><input type="text" id="firstName" name="firstName" value="${user.firstName!''}" />
</div>
<div>
- <label for="lastName">${rb.getString('lastName')}</label>
- <input type="text" id="lastName" name="lastName" value="${user.lastName!''}" />
+ <label for="lastName">${rb.getString('lastName')}</label><input type="text" id="lastName" name="lastName" value="${user.lastName!''}" />
</div>
<div class="aside-btn">
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/register.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/register.ftl
index c9b5997..8cf59a4 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/register.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/register.ftl
@@ -14,28 +14,22 @@
<form action="${url.registrationAction}" method="post">
<p class="subtitle">${rb.getString('allRequired')}</p>
<div>
- <label for="firstName">${rb.getString('firstName')}</label>
- <input type="text" id="firstName" name="firstName" value="${register.formData.firstName!''}" />
+ <label for="firstName">${rb.getString('firstName')}</label><input type="text" id="firstName" name="firstName" value="${register.formData.firstName!''}" />
</div>
<div>
- <label for="lastName">${rb.getString('lastName')}</label>
- <input type="text" id="lastName" name="lastName" value="${register.formData.lastName!''}" />
+ <label for="lastName">${rb.getString('lastName')}</label><input type="text" id="lastName" name="lastName" value="${register.formData.lastName!''}" />
</div>
<div>
- <label for="email">${rb.getString('email')}</label>
- <input type="text" id="email" name="email" value="${register.formData.email!''}" />
+ <label for="email">${rb.getString('email')}</label><input type="text" id="email" name="email" value="${register.formData.email!''}" />
</div>
<div>
- <label for="username">${rb.getString('username')}</label>
- <input type="text" id="username" name="username" value="${register.formData.username!''}" />
+ <label for="username">${rb.getString('username')}</label><input type="text" id="username" name="username" value="${register.formData.username!''}" />
</div>
<div>
- <label for="password">${rb.getString('password')}</label>
- <input type="password" id="password" name="password" />
+ <label for="password">${rb.getString('password')}</label><input type="password" id="password" name="password" />
</div>
<div>
- <label for="password-confirm">${rb.getString('passwordConfirm')}</label>
- <input type="password" id="password-confirm" name="password-confirm" />
+ <label for="password-confirm">${rb.getString('passwordConfirm')}</label><input type="password" id="password-confirm" name="password-confirm" />
</div>
<div class="aside-btn">
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl
index d64a3c6..acbb082 100644
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl
@@ -18,7 +18,7 @@
<body class="rcue-login-register ${bodyClass}">
<#if (template.themeConfig.logo)?has_content>
<h1>
- <a href="#" title="Go to the home page"><img src="${template.themeConfig.logo}" alt="Logo" /></a>
+ <a href="#" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Red Hat Logo" /></a>
</h1>
</#if>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl
index 303aeeb..982b31f 100644
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl
@@ -25,7 +25,7 @@
</div>
<#if (template.themeConfig.logo)?has_content>
<h1>
- <a href="#" title="Go to the home page"><img src="${template.themeConfig.logo}" alt="Logo" /></a>
+ <a href="#" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Red Hat Logo" /></a>
</h1>
</#if>
diff --git a/forms/src/main/resources/org/keycloak/forms/messages.properties b/forms/src/main/resources/org/keycloak/forms/messages.properties
index 7c8b05f..be120c2 100644
--- a/forms/src/main/resources/org/keycloak/forms/messages.properties
+++ b/forms/src/main/resources/org/keycloak/forms/messages.properties
@@ -15,7 +15,7 @@ firstName=First name
lastName=Last name
email=Email
password=Password
-passwordConfirm=Confirm Password
+passwordConfirm=Password confirmation
passwordNew=New Password
passwordNewConfirm=New Password confirmation
