This repository was archived by the owner on Mar 4, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 59
Forms refactor #485
Merged
Merged
Forms refactor #485
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
9fc6e80
Refactor Switch component, moved inputs into _inputs
8736549
Merge branch 'dev' of github.com:appirio-tech/topcoder-app into forms…
fc79a38
password tips styled, settings pages styled
6a135b0
Merge branch 'dev' of github.com:appirio-tech/topcoder-app into forms…
fa36a99
Merge branch 'dev' of https://github.com/appirio-tech/topcoder-app in…
24144b0
code organized
21cf847
Field refactor,
d3e3c67
Merge branch 'dev' of https://github.com/appirio-tech/topcoder-app in…
bb5dabf
BIG CLEANUP:
2d86cef
Merge branch 'dev' of github.com:appirio-tech/topcoder-app into forms…
65735ef
small fix // typography
ff92986
Merge branch 'dev' of https://github.com/appirio-tech/topcoder-app in…
dbe9c9e
pull request fixes
38586f6
settings sizes fixed;
94a2311
Merge branch 'dev' of https://github.com/appirio-tech/topcoder-app in…
852f642
button sizes fixed; headings
8c9b15a
show password label tacky fixes
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
.account-info-container | ||
.settings-section.credentials | ||
.section-info | ||
h2 credentials | ||
h2 Credentials | ||
.description Used to log in to your account and cannot be edited. Please contact [email protected] if you need to make changes. | ||
|
||
.section-fields | ||
|
@@ -31,6 +31,7 @@ | |
placeholder="Pick a new password" | ||
) | ||
.tips.password-tips(ng-show="vm.passwordFocus") | ||
.arrow | ||
h3 Password Tips: | ||
|
||
p Your password must have: | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,8 +21,8 @@ | |
span(ng-show="!vm.userData.photoURL || !vm.userData.photoURL.length") Add Image | ||
input(type='file', name='image', on-file-change='on-file-change', id="change-image-input", style="display: none;") | ||
|
||
.file-delete(ng-show="vm.userData.photoURL && vm.userData.photoURL.length") | ||
button.tc-btn.tc-btn-secondary.tc-btn-s(ng-click="vm.deleteImage()", type="button") Delete | ||
.file-delete | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why was this removed? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. +1, this should only be there when there is a profile image present |
||
button.tc-btn.tc-btn-ghost.tc-btn-warning.tc-btn-s(ng-click="vm.deleteImage()", type="button") Delete | ||
|
||
.country | ||
.form-label country to represent | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,15 +5,17 @@ | |
.register-container, | ||
.reset-password-container, | ||
.registered-successfully-container { | ||
position: relative; | ||
width: 560px; | ||
margin: 60px auto 0; | ||
display: flex; | ||
flex-direction: column; | ||
text-align: center; | ||
justify-content: flex-start; | ||
@include source-sans-regular; | ||
background-color: white; | ||
@include font-with-weight('Merriweather Sans'); | ||
background-color: $white; | ||
border-radius: 3px; | ||
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2); | ||
|
||
header { | ||
height: 70px; | ||
|
@@ -50,41 +52,67 @@ | |
h1 { | ||
margin-top: 39px; | ||
margin-bottom: 40px; | ||
@include ui-h1; | ||
color: #3D3D3D; | ||
@media (max-width: 767px) { | ||
margin: 30px auto; | ||
} | ||
color: $gray-darkest; | ||
line-height: 30px; | ||
font-size: 20px; | ||
@include sofia-pro-light; | ||
@include font-with-weight('Sofia Pro', 300); | ||
width: 380px; | ||
align-self: center; | ||
text-transform: uppercase; | ||
} | ||
|
||
input:not([type="checkbox"]), button { | ||
display: block; | ||
margin-bottom: 10px; | ||
// registration sizes, remove | ||
input[name="firstname"], input[name="lastname"] { | ||
width: 185px; | ||
padding-right: 45px; | ||
} | ||
|
||
input[name="username"], input[name="email"] { | ||
padding-right: 85px; | ||
} | ||
|
||
input[type="text"], | ||
toggle-password { | ||
width: 380px; | ||
} | ||
|
||
input:not([type="checkbox"]) { | ||
height: 40px; | ||
width: 300px; | ||
padding: 0; | ||
padding-left: 15px; | ||
border: 0; | ||
@include source-sans-regular; | ||
font-size: 16px; | ||
color: #231F20; | ||
box-shadow: none; | ||
outline: none; | ||
} | ||
|
||
.tips { | ||
left: 380px; | ||
toggle-password { | ||
input#current-password-input { | ||
width: 300px; | ||
height: 20px; | ||
border: none; | ||
outline: none; | ||
box-shadow: none; | ||
} | ||
} | ||
|
||
.tips, | ||
.email-tips, | ||
.password-tips { | ||
@media screen and (min-width: 915px) { | ||
left: 395px; | ||
} | ||
} | ||
|
||
.email-tips { | ||
left: 380px; | ||
// Autocomplete | ||
.angucomplete-dropdown { | ||
width: 100%; | ||
color: $gray-darkest; | ||
text-align: left; | ||
box-shadow: 0px 1px 3px 1px rgba(0, 0, 0, 0.4); | ||
} | ||
.angucomplete-selected-row { | ||
background-color: $primary-lighter; | ||
color: $gray-darkest; | ||
} | ||
// Autocomplete end | ||
|
||
button { | ||
// width: 180px; | ||
|
@@ -100,56 +128,10 @@ | |
width: 380px; | ||
} | ||
|
||
input[type="text"], | ||
input[type="password"], | ||
input[type="email"], | ||
input.email, | ||
toggle-password, | ||
toggle-password-with-tips { | ||
height: 38px; | ||
background: $white; | ||
border: 1px solid #B7B7B7; | ||
box-shadow: inset 0px 0px 2px 0px rgba(183,183,183,0.30); | ||
border-radius: 2px; | ||
cursor: auto; | ||
color: #3d3d3d; | ||
font-family: "Merriweather Sans"; | ||
font-size: 15px; | ||
|
||
&:hover { | ||
border: 1px solid #A3A3AE; | ||
box-shadow: inset 0px 0px 2px 0px #B7B7B7; | ||
} | ||
|
||
&:focus, | ||
&.focus { | ||
border: 1px solid #0096FF; | ||
outline: none; | ||
box-shadow: inset 0px 0px 2px 1px rgba(133,203,255,0.60); | ||
} | ||
|
||
transition: .15s all; | ||
} | ||
|
||
input:not([type="checkbox"]) { | ||
box-shadow: none; | ||
} | ||
|
||
toggle-password { | ||
input#current-password-input { | ||
width: 300px; | ||
height: 20px; | ||
border: none; | ||
outline: none; | ||
box-shadow: none; | ||
} | ||
} | ||
|
||
toggle-password-with-tips { | ||
input#password-input { | ||
border: none; | ||
outline: none; | ||
box-shadow: none; | ||
} | ||
} | ||
|
||
|
@@ -176,7 +158,7 @@ | |
color: #A3A3AE; | ||
font-size: 10px; | ||
line-height: 13px; | ||
@include sofia-pro-medium; | ||
@include font-with-weight('Sofia Pro', 500);; | ||
text-transform: uppercase; | ||
margin-top: 10px; | ||
cursor: pointer; | ||
|
@@ -199,7 +181,7 @@ | |
color: #A3A3AE; | ||
font-size: 13px; | ||
line-height: 22px; | ||
@include sofia-pro-regular; | ||
@include font-with-weight; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this seems way more ambiguous to me but i guess it's fine for now |
||
text-transform: uppercase; | ||
} | ||
|
||
|
@@ -217,7 +199,7 @@ | |
color: #A3A3AE; | ||
font-size: 10px; | ||
line-height: 13px; | ||
@include sofia-pro-medium; | ||
@include font-with-weight('Sofia Pro', 500); | ||
text-transform: uppercase; | ||
cursor: pointer; | ||
margin-top: 10px; | ||
|
@@ -276,9 +258,9 @@ | |
flex-flow: row wrap; | ||
margin-top: 30px; | ||
justify-content: center; | ||
font-size: 12px; | ||
text-transform: uppercase; | ||
font-size: 12px; | ||
font-size: $label-small; | ||
@include font-with-weight('Sofia Pro', 500); | ||
|
||
a { | ||
display: inline; | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if you dont need this plz delete this row