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

Sup 2343 password tip spacing #555

Merged
merged 7 commits into from
Nov 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
419 changes: 419 additions & 0 deletions .csscomb.json

Large diffs are not rendered by default.

27 changes: 21 additions & 6 deletions app/account/reset-password/reset-password.jade
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
header
a.logo-link(href="/")
img(src="/images/logo_mobile.svg", alt="Topcoder Logo")

.arrow

h1(class="header") PASSWORD RESET

form.reset-form(name='vm.generateTokenForm', role="form", ng-submit="vm.generateTokenForm.$valid && vm.sendLink()", novalidate)

p.email-label Please enter your email address, and we'll send you a link to reset your password

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

.tips.email-tips(ng-show="vm.emailTips")
.arrow

h3 Email Tips:

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

.form-errors
p.form-error(ng-show="vm.generateTokenForm.email.$dirty && vm.generateTokenForm.email.$invalid") Please enter a valid email address.

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
a(href="mailto:[email protected]?Subject=Unable%20to%20reset%20my%20password" target="_top") [email protected]

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
a(href="mailto:[email protected]?Subject=Unable%20to%20reset%20my%20password" target="_top") [email protected]

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
a(href="mailto:[email protected]?Subject=Unable%20to%20reset%20my%20password" target="_top") [email protected]

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

.reset-password-container(ng-show="vm.resetTokenSent")
header
a.logo-link(href="/")
img(src="/images/logo_mobile.svg", alt="Topcoder Logo")

.arrow
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not to be nitpicky, but any sibling tags should have an empty line in between, and any time you go back on indentation there should be an empty line in between. (See Adding New Content - Jade Files in the readme)


h1(class="header") Back on Track!
p We have sent you an email with a link to reset your password.

p(class="m-b-lg") We have sent you an email with a link to reset your password.

a.link(ui-sref="login") Back to Login

.reset-password-container(ng-show="vm.token")
header
img(src="/images/logo_mobile.svg", alt="Topcoder Logo")

.arrow

h1(class="header") CREATE NEW PASSWORD

form.reset-form(name='vm.resetPasswordForm', role="form", ng-submit="vm.resetPasswordForm.$valid && vm.resetPassword()", novalidate)

.validation-bar(ng-class="{ 'success-bar': (vm.resetPasswordForm.password.$valid) }")
toggle-password-with-tips

.tips.password-tips(ng-show="vm.passwordFocus")
.arrow

h3 Password Tips:

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

p(ng-class="{ 'has-letter': (vm.resetPasswordForm.password.$dirty && !vm.resetPasswordForm.password.$error.hasLetter) }") At least one letter

p(ng-class="{ 'has-symbol-or-number': (vm.resetPasswordForm.password.$dirty && !vm.resetPasswordForm.password.$error.hasSymbolOrNumber) }") At least one number or symbol

.form-errors
Expand Down
Loading