Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit e39da2e

Browse files
committed
Merge pull request #555 from appirio-tech/SUP-2343-PasswordTipSpacing
Sup 2343 password tip spacing
2 parents 3d64cef + 44f0826 commit e39da2e

File tree

8 files changed

+739
-355
lines changed

8 files changed

+739
-355
lines changed

.csscomb.json

Lines changed: 419 additions & 0 deletions
Large diffs are not rendered by default.

app/account/reset-password/reset-password.jade

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
header
44
a.logo-link(href="/")
55
img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
6+
67
.arrow
8+
79
h1(class="header") PASSWORD RESET
810

911
form.reset-form(name='vm.generateTokenForm', role="form", ng-submit="vm.generateTokenForm.$valid && vm.sendLink()", novalidate)
10-
1112
p.email-label Please enter your email address, and we'll send you a link to reset your password
1213

1314
.validation-bar(ng-class="{ 'error-bar': (vm.generateTokenForm.email.$dirty && vm.generateTokenForm.email.$invalid), 'success-bar': (vm.generateTokenForm.email.$valid) }")
@@ -16,16 +17,20 @@
1617

1718
.tips.email-tips(ng-show="vm.emailTips")
1819
.arrow
20+
1921
h3 Email Tips:
2022

2123
p Enter your email address and we'll get back to you with a reset link
2224

2325
.form-errors
2426
p.form-error(ng-show="vm.generateTokenForm.email.$dirty && vm.generateTokenForm.email.$invalid") Please enter a valid email address.
27+
2528
p.form-error(ng-show="vm.alreadySent") You already requested a reset link recently. Please check your inbox or spam folder. If you have any trouble, please contact
2629
a(href="mailto:[email protected]?Subject=Unable%20to%20reset%20my%20password" target="_top") [email protected]
30+
2731
p.form-error(ng-show="vm.emailNotFound") We couldn't find a member with that email address. Please check that you entered it correctly. If you continue to have trouble, please contact
2832
a(href="mailto:[email protected]?Subject=Unable%20to%20reset%20my%20password" target="_top") [email protected]
33+
2934
p.form-error(ng-show="vm.unkownError") We were unable to send you a reset link because of a temporary problem. Please try again. If you continue to have trouble, please contact
3035
a(href="mailto:[email protected]?Subject=Unable%20to%20reset%20my%20password" target="_top") [email protected]
3136

@@ -34,29 +39,39 @@
3439
a.link(ui-sref="login") Back to Login
3540

3641
.reset-password-container(ng-show="vm.resetTokenSent")
42+
header
43+
a.logo-link(href="/")
44+
img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
45+
46+
.arrow
47+
3748
h1(class="header") Back on Track!
38-
p We have sent you an email with a link to reset your password.
49+
50+
p(class="m-b-lg") We have sent you an email with a link to reset your password.
51+
3952
a.link(ui-sref="login") Back to Login
4053

4154
.reset-password-container(ng-show="vm.token")
4255
header
4356
img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
57+
4458
.arrow
59+
4560
h1(class="header") CREATE NEW PASSWORD
4661

4762
form.reset-form(name='vm.resetPasswordForm', role="form", ng-submit="vm.resetPasswordForm.$valid && vm.resetPassword()", novalidate)
48-
4963
.validation-bar(ng-class="{ 'success-bar': (vm.resetPasswordForm.password.$valid) }")
5064
toggle-password-with-tips
5165

5266
.tips.password-tips(ng-show="vm.passwordFocus")
5367
.arrow
68+
5469
h3 Password Tips:
55-
70+
5671
p(ng-class="{ 'has-length-between-range': (vm.resetPasswordForm.password.$dirty && !vm.resetPasswordForm.password.$error.minlength && !vm.resetPasswordForm.password.$error.maxlength && !vm.resetPasswordForm.password.$error.required) }") Must be between 8 and 64 characters
57-
72+
5873
p(ng-class="{ 'has-letter': (vm.resetPasswordForm.password.$dirty && !vm.resetPasswordForm.password.$error.hasLetter) }") At least one letter
59-
74+
6075
p(ng-class="{ 'has-symbol-or-number': (vm.resetPasswordForm.password.$dirty && !vm.resetPasswordForm.password.$error.hasSymbolOrNumber) }") At least one number or symbol
6176

6277
.form-errors

0 commit comments

Comments
 (0)