From 0d510d72c19e77ca3d3de8b05cab6405476efad1 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 16 Aug 2014 00:27:38 +0100
Subject: [PATCH] Issue #2321167 by emma.maria, tompagabor | LewisNyman: Move
password indicator colours into CSS.
---
core/modules/user/css/user.module.css | 13 ++++++++++++-
core/modules/user/user.js | 15 ++++++++-------
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/core/modules/user/css/user.module.css b/core/modules/user/css/user.module.css
index 4b20a6dd48ac..fe611e74286c 100644
--- a/core/modules/user/css/user.module.css
+++ b/core/modules/user/css/user.module.css
@@ -64,4 +64,15 @@ div.password-suggestions ul {
[dir="rtl"] .password-parent {
clear: right;
}
-
+.password-strength__indicator.is-weak {
+ background-color: #e62600;
+}
+.password-strength__indicator.is-fair {
+ background-color: #e09600;
+}
+.password-strength__indicator.is-good {
+ background-color: #0074bd;
+}
+.password-strength__indicator.is-strong {
+ background-color: #77b259;
+}
diff --git a/core/modules/user/user.js b/core/modules/user/user.js
index 3b456d782a31..17250b0b5210 100644
--- a/core/modules/user/user.js
+++ b/core/modules/user/user.js
@@ -58,7 +58,8 @@
// Adjust the length of the strength indicator.
innerWrapper.find('.password-strength__indicator')
.css('width', result.strength + '%')
- .css('background-color', result.indicatorColor);
+ .removeClass('is-weak is-fair is-good is-strong')
+ .addClass(result.indicatorClass);
// Update the strength indication text.
innerWrapper.find('.password-strength__text').html(result.indicatorText);
@@ -87,7 +88,7 @@
* Returns the estimated strength and the relevant output message.
*/
Drupal.evaluatePasswordStrength = function (password, translate) {
- var indicatorText, indicatorColor, weaknesses = 0, strength = 100, msg = [];
+ var indicatorText, indicatorClass, weaknesses = 0, strength = 100, msg = [];
var hasLowercase = /[a-z]+/.test(password);
var hasUppercase = /[A-Z]+/.test(password);
@@ -152,24 +153,24 @@
// Based on the strength, work out what text should be shown by the password strength meter.
if (strength < 60) {
indicatorText = translate.weak;
- indicatorColor = '#e62600';
+ indicatorClass = 'is-weak';
}
else if (strength < 70) {
indicatorText = translate.fair;
- indicatorColor = '#e09600';
+ indicatorClass = 'is-fair';
}
else if (strength < 80) {
indicatorText = translate.good;
- indicatorColor = '#0074bd';
+ indicatorClass = 'is-good';
}
else if (strength <= 100) {
indicatorText = translate.strong;
- indicatorColor = '#77b259';
+ indicatorClass = 'is-strong';
}
// Assemble the final message.
msg = translate.hasWeaknesses + '<ul><li>' + msg.join('</li><li>') + '</li></ul>';
- return { strength: strength, message: msg, indicatorText: indicatorText, indicatorColor: indicatorColor };
+ return { strength: strength, message: msg, indicatorText: indicatorText, indicatorClass: indicatorClass };
};
--
GitLab