diff --git a/jslib b/jslib index be080f4f..b48c4847 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit be080f4f17b782fdb22c77560bd235e81346fb21 +Subproject commit b48c48470801eb88aaec2c2cd84baeb6f1876923 diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html index cb0adc8c..e8e82ec7 100644 --- a/src/app/accounts/register.component.html +++ b/src/app/accounts/register.component.html @@ -11,7 +11,13 @@
- + diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts index 942caa1f..19fa0c19 100644 --- a/src/app/accounts/register.component.ts +++ b/src/app/accounts/register.component.ts @@ -23,21 +23,4 @@ export class RegisterComponent extends BaseRegisterComponent { super(authService, router, i18nService, cryptoService, apiService, stateService, platformUtilsService, passwordGenerationService); } - - get masterPasswordScoreWidth() { - return this.masterPasswordScore == null ? 0 : (this.masterPasswordScore + 1) * 20; - } - - get masterPasswordScoreColor() { - switch (this.masterPasswordScore) { - case 4: - return 'success'; - case 3: - return 'primary'; - case 2: - return 'warning'; - default: - return 'danger'; - } - } } diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index b09790f3..cb95e5c6 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -1129,6 +1129,18 @@ "whoOwnsThisItem": { "message": "Who owns this item?" }, + "strong": { + "message": "Strong", + "description": "ex. A strong password. Scale: Weak -> Good -> Strong" + }, + "good": { + "message": "Good", + "description": "ex. A good password. Scale: Weak -> Good -> Strong" + }, + "weak": { + "message": "Weak", + "description": "ex. A weak password. Scale: Weak -> Good -> Strong" + }, "weakMasterPassword": { "message": "Weak Master Password" }, diff --git a/src/scss/box.scss b/src/scss/box.scss index 7c6fa6e7..4bb04539 100644 --- a/src/scss/box.scss +++ b/src/scss/box.scss @@ -96,6 +96,10 @@ @include themify($themes) { color: themed('mutedColor'); } + + .sub-label { + margin-left: 10px; + } } .text, .detail { diff --git a/src/scss/misc.scss b/src/scss/misc.scss index db0d30cd..1a0a45b4 100644 --- a/src/scss/misc.scss +++ b/src/scss/misc.scss @@ -46,6 +46,12 @@ small { } } +.text-danger { + @include themify($themes) { + color: themed('dangerColor') !important; + } +} + .text-muted { @include themify($themes) { color: themed('mutedColor') !important;