Skip to content
Snippets Groups Projects
Commit 0c7f8b52 authored by Dries Buytaert's avatar Dries Buytaert
Browse files

- Patch #876282 by tim.plunkett, amateescu: small layout glitch on 'Password...

- Patch #876282 by tim.plunkett, amateescu: small layout glitch on 'Password match' line during installation.
parent bfd805e1
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
...@@ -7,19 +7,18 @@ ...@@ -7,19 +7,18 @@
/** /**
* Password strength indicator. * Password strength indicator.
*/ */
input.password-field { .password-strength {
margin-left: 10px; float: left;
margin-right: 0;
} }
input.password-confirm { .password-strength-text {
margin-left: 10px; float: left;
margin-right: 0;
} }
.password-strength-title { div.password-confirm {
float: right; float: left;
} }
.confirm-parent,
.password-parent { .password-parent {
float: right; clear: right;
} }
/* Generated by user.module but used by profile.module: */ /* Generated by user.module but used by profile.module: */
......
...@@ -57,8 +57,10 @@ input.password-field { ...@@ -57,8 +57,10 @@ input.password-field {
margin-bottom: 0.4em; margin-bottom: 0.4em;
} }
div.password-confirm { div.password-confirm {
display: inline; float: right; /* LTR */
padding-left: 1em; margin-top: 1.5em;
visibility: hidden;
width: 17em;
} }
div.form-item div.password-suggestions { div.form-item div.password-suggestions {
padding: 0.2em 0.5em; padding: 0.2em 0.5em;
...@@ -69,19 +71,11 @@ div.form-item div.password-suggestions { ...@@ -69,19 +71,11 @@ div.form-item div.password-suggestions {
div.password-suggestions ul { div.password-suggestions ul {
margin-bottom: 0; margin-bottom: 0;
} }
.confirm-parent,
.password-parent { .password-parent {
clear: left; /* LTR */
margin: 0; margin: 0;
width: 34.3em; width: 36.3em;
}
/**
* Password confirmation checker.
*/
.confirm-parent {
margin: 0;
}
div.password-confirm {
visibility: hidden;
} }
/* Generated by user.module but used by profile.module: */ /* Generated by user.module but used by profile.module: */
......
...@@ -16,7 +16,7 @@ Drupal.behaviors.password = { ...@@ -16,7 +16,7 @@ Drupal.behaviors.password = {
innerWrapper.addClass('password-parent'); innerWrapper.addClass('password-parent');
// Add the password confirmation layer. // Add the password confirmation layer.
$('input.password-confirm', outerWrapper).after('<div class="password-confirm">' + translate['confirmTitle'] + ' <span></span></div>').parent().addClass('confirm-parent'); $('input.password-confirm', outerWrapper).parent().prepend('<div class="password-confirm">' + translate['confirmTitle'] + ' <span></span></div>').addClass('confirm-parent');
var confirmInput = $('input.password-confirm', outerWrapper); var confirmInput = $('input.password-confirm', outerWrapper);
var confirmResult = $('div.password-confirm', outerWrapper); var confirmResult = $('div.password-confirm', outerWrapper);
var confirmChild = $('span', confirmResult); var confirmChild = $('span', confirmResult);
......
...@@ -1066,25 +1066,26 @@ div.messages { ...@@ -1066,25 +1066,26 @@ div.messages {
/* -------------- Password Meter ------------- */ /* -------------- Password Meter ------------- */
.confirm-parent,
.password-parent {
width: 34em;
}
.password-parent, .password-parent,
div.form-item div.password-suggestions { div.form-item div.password-suggestions {
position: relative; position: relative;
width: auto;
} }
#password-strength { .password-strength-text,
float: none;
left: 16em;
position: absolute;
width: 11.5em;
}
#password-strength-text,
.password-strength-title, .password-strength-title,
div.password-confirm { div.password-confirm {
font-size: 0.82em; font-size: 0.82em;
} }
#password-strength-text { .password-strength-text {
margin-top: 0.2em; margin-top: 0.2em;
} }
div.password-confirm {
margin-top: 2.2em;
width: 20.73em;
}
/* ---------------- Buttons ---------------- */ /* ---------------- Buttons ---------------- */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment