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

Commit 21cf847

Browse files
author
Victor George
committed
Field refactor,
Merge branch 'dev' of https://github.com/appirio-tech/topcoder-app into forms-refactor # By Tom Ladendorf # Via Tom Ladendorf (1) and Victor George (1) * 'dev' of https://github.com/appirio-tech/topcoder-app: disabled button change
2 parents 24144b0 + 0a50835 commit 21cf847

13 files changed

+356
-521
lines changed

app/account/register/register.jade

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
p.form-error(ng-show="vm.errMsg") {{vm.errMsg}}
1515

1616
.first-last-names
17-
input-sticky-placeholder(sticky-placeholder="First", ng-model="vm.firstname")
17+
input-sticky-placeholder.tc-input(sticky-placeholder="First", ng-model="vm.firstname")
1818
input(ng-model="vm.firstname", maxlength="64", name="firstname", placeholder="First Name", type="text", required)
1919

20-
input-sticky-placeholder(sticky-placeholder="Last", ng-model="vm.lastname")
20+
input-sticky-placeholder.tc-input(sticky-placeholder="Last", ng-model="vm.lastname")
2121
input(ng-model="vm.lastname", maxlength="64", name="lastname", placeholder="Last Name", type="text", required)
2222

23-
.country-dropdown
23+
.country-dropdown.tc-input
2424
angucomplete-alt(
2525
input-name="country",
2626
placeholder="Country",
@@ -46,6 +46,7 @@
4646
input(ng-model="vm.username", ng-model-options="{ debounce: {'default': 500} }", ng-focus="vm.usernameTips = true", ng-blur="vm.usernameTips = false", ng-minlength="2", ng-maxlength="15", name="username", placeholder="Username", type="text", username-is-free, required)
4747

4848
.tips.username-tips(ng-show="vm.usernameTips")
49+
.arrow
4950
h3 Username Tips:
5051

5152
p Your username will be public
@@ -67,6 +68,7 @@
6768
input(ng-model="vm.email", ng-model-options="{ debounce: {'default': 500} }", ng-focus="vm.emailTips = true", ng-blur="vm.emailTips = false", name="email", placeholder="Enter Your Email", type="email", valid-email, email-is-available, required)
6869

6970
.tips.email-tips(ng-show="vm.emailTips")
71+
.arrow
7072
h3 Email Tips:
7173

7274
p Your email address will be private and not shared with anyone.
@@ -84,9 +86,10 @@
8486
toggle-password-with-tips(ng-if="!vm.isSocialRegistration")
8587

8688
.tips.password-tips(ng-show="vm.passwordFocus")
87-
h3 Password Tips:
89+
.arrow
90+
//- h3 Password Tips:
8891
89-
p Your password must have:
92+
H3 Your password must have:
9093

9194
p(ng-class="{ 'has-length-between-range': (vm.registerForm.password.$dirty && !vm.registerForm.password.$error.minlength && !vm.registerForm.password.$error.maxlength && !vm.registerForm.password.$error.required) }") At least 8 characters
9295

@@ -97,7 +100,7 @@
97100
section.terms
98101
p By clicking "Join" you agree to Topcoder's #[a(href="http://www.topcoder.com/community/how-it-works/terms/", target="_blank") Terms] and #[a(href="http://www.topcoder.com/community/how-it-works/privacy-policy/", target="_blank") Privacy Policy]
99102

100-
button.tc-btn.tc-btn-large(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid") Join
103+
button.tc-btn.tc-btn-large.tc-btn-wide(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid") Join
101104

102105
section.login-options
103106
p.tc-separator
@@ -116,5 +119,4 @@
116119

117120
.join-topcoder
118121
span Have an account?  
119-
120122
a(ui-sref="login(vm.$stateParams)") Log in

assets/css/account/account.scss

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
text-align: center;
1313
justify-content: flex-start;
1414
@include source-sans-regular;
15-
background-color: white;
15+
background-color: $white;
1616
border-radius: 3px;
17+
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
1718

1819
header {
1920
height: 70px;
@@ -50,8 +51,11 @@
5051
h1 {
5152
margin-top: 39px;
5253
margin-bottom: 40px;
54+
@media (max-width: 767px) {
55+
margin: 30px auto;
56+
}
5357
@include ui-h1;
54-
color: #3D3D3D;
58+
color: $gray-darkest;
5559
line-height: 30px;
5660
font-size: 20px;
5761
@include sofia-pro-light;
@@ -60,16 +64,41 @@
6064
text-transform: uppercase;
6165
}
6266

67+
// registration sizes, remove
68+
input[name="firstname"], input[name="lastname"] {
69+
width: 185px;
70+
padding-right: 45px;
71+
}
72+
73+
input[name="username"], input[name="email"] {
74+
padding-right: 85px;
75+
}
76+
77+
input[type="text"],
78+
toggle-password {
79+
width: 380px;
80+
}
81+
6382
input:not([type="checkbox"]) {
6483
width: 300px;
6584
}
6685

67-
.tips {
68-
left: 380px;
86+
toggle-password {
87+
input#current-password-input {
88+
width: 300px;
89+
height: 20px;
90+
border: none;
91+
outline: none;
92+
box-shadow: none;
93+
}
6994
}
7095

71-
.email-tips {
72-
left: 380px;
96+
.tips,
97+
.email-tips,
98+
.password-tips {
99+
@media screen and (min-width: 915px) {
100+
left: 395px;
101+
}
73102
}
74103

75104
button {
@@ -216,9 +245,9 @@
216245
flex-flow: row wrap;
217246
margin-top: 30px;
218247
justify-content: center;
219-
font-size: 12px;
220248
text-transform: uppercase;
221-
font-size: 12px;
249+
font-size: $label-small;
250+
@include sofia-pro-medium;
222251

223252
a {
224253
display: inline;

assets/css/account/login.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
@import '../partials/combined';
33

44
.login-container {
5-
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
6-
7-
h1 {
8-
@media (max-width: 767px) {
9-
margin: 30px auto;
10-
}
11-
}
125

136
form {
147
display: flex;
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
@import 'topcoder-includes';
22
@import '../partials/combined';
33

4-
.input-sticky-placeholder-container {
5-
position: relative;
4+
// .input-sticky-placeholder-container {
5+
// position: relative;
66

7-
span.placeholder-text {
8-
position: absolute;
9-
top: 3px;
10-
right: 10px;
11-
@include sofia-pro-regular;
12-
font-size: 10px;
13-
line-height: 40px;
14-
text-transform: uppercase;
15-
color: $accent-gray;
16-
}
17-
}
7+
// span.placeholder-text {
8+
// position: absolute;
9+
// top: 3px;
10+
// right: 10px;
11+
// @include sofia-pro-regular;
12+
// font-size: 10px;
13+
// line-height: 40px;
14+
// text-transform: uppercase;
15+
// color: $accent-gray;
16+
// }
17+
// }

assets/css/directives/toggle-password-with-tips.scss

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,11 @@ toggle-password-with-tips {
88
align-items: center;
99
justify-content: space-between;
1010

11-
height: 40px;
12-
width: 300px;
13-
margin-bottom: 10px;
14-
padding-left: 15px;
15-
padding-right: 10px;
16-
border: 0;
17-
18-
@include source-sans-regular;
19-
font-size: 16px;
20-
background-color: $white;
21-
color: #231F20;
2211

2312
input#password-input {
2413
width: 155px;
2514
margin-bottom: 0;
2615
padding-left: 0;
2716
outline: 0;
2817
}
29-
30-
label {
31-
text-transform: uppercase;
32-
font-size: 9.8px;
33-
color: #808285;
34-
35-
input[type="checkbox"] {
36-
width: 15px;
37-
margin: 0;
38-
}
39-
}
4018
}

assets/css/directives/toggle-password.scss

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,11 @@ toggle-password {
88
align-items: center;
99
justify-content: space-between;
1010

11-
height: 40px;
12-
width: 300px;
13-
margin-bottom: 10px;
14-
padding-left: 15px;
15-
padding-right: 10px;
16-
border: 0;
17-
18-
@include source-sans-regular;
19-
font-size: 16px;
20-
background-color: $white;
21-
color: #231F20;
2211

2312
input#current-password-input {
2413
width: 155px;
2514
margin-bottom: 0;
2615
padding-left: 0;
2716
outline: 0;
2817
}
29-
30-
label {
31-
text-transform: uppercase;
32-
font-size: 9.8px;
33-
color: #808285;
34-
35-
input[type="checkbox"] {
36-
width: 15px;
37-
margin: 0;
38-
}
39-
}
4018
}

assets/css/partials/_tc-buttons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ button {
99
transition: .15s all;
1010
cursor: pointer;
1111

12-
&:disabled {
12+
&:disabled, &.disabled {
1313
background-color: $gray !important;
1414
border-color: $gray-dark !important;
1515
opacity: 1;

0 commit comments

Comments
 (0)