Commit 0c7f8b52 authored by Dries's avatar Dries

- 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
......@@ -7,19 +7,18 @@
/**
* Password strength indicator.
*/
input.password-field {
margin-left: 10px;
margin-right: 0;
.password-strength {
float: left;
}
input.password-confirm {
margin-left: 10px;
margin-right: 0;
.password-strength-text {
float: left;
}
.password-strength-title {
float: right;
div.password-confirm {
float: left;
}
.confirm-parent,
.password-parent {
float: right;
clear: right;
}
/* Generated by user.module but used by profile.module: */
......
......@@ -57,8 +57,10 @@ input.password-field {
margin-bottom: 0.4em;
}
div.password-confirm {
display: inline;
padding-left: 1em;
float: right; /* LTR */
margin-top: 1.5em;
visibility: hidden;
width: 17em;
}
div.form-item div.password-suggestions {
padding: 0.2em 0.5em;
......@@ -69,19 +71,11 @@ div.form-item div.password-suggestions {
div.password-suggestions ul {
margin-bottom: 0;
}
.confirm-parent,
.password-parent {
clear: left; /* LTR */
margin: 0;
width: 34.3em;
}
/**
* Password confirmation checker.
*/
.confirm-parent {
margin: 0;
}
div.password-confirm {
visibility: hidden;
width: 36.3em;
}
/* Generated by user.module but used by profile.module: */
......
......@@ -16,7 +16,7 @@ Drupal.behaviors.password = {
innerWrapper.addClass('password-parent');
// 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 confirmResult = $('div.password-confirm', outerWrapper);
var confirmChild = $('span', confirmResult);
......
......@@ -1066,25 +1066,26 @@ div.messages {
/* -------------- Password Meter ------------- */
.confirm-parent,
.password-parent {
width: 34em;
}
.password-parent,
div.form-item div.password-suggestions {
position: relative;
width: auto;
}
#password-strength {
float: none;
left: 16em;
position: absolute;
width: 11.5em;
}
#password-strength-text,
.password-strength-text,
.password-strength-title,
div.password-confirm {
font-size: 0.82em;
}
#password-strength-text {
.password-strength-text {
margin-top: 0.2em;
}
div.password-confirm {
margin-top: 2.2em;
width: 20.73em;
}
/* ---------------- Buttons ---------------- */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment