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

Commit 4be4681

Browse files
nlitwinnlitwin
committed
Merge pull request #358 from appirio-tech/feature/tc-ui-kit-integration
Feature/tc ui kit integration
2 parents 2248a98 + 9b6b258 commit 4be4681

File tree

71 files changed

+461
-750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+461
-750
lines changed

‎app/account/login/login.jade

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
p.problem-signin
2222
a.forgot-password(ui-sref="resetPassword") Forgot your password?
2323

24-
button(type="submit", ng-disabled="vm.loginForm.$invalid", ng-class="{'enabled-button': vm.loginForm.$valid}") Log In
24+
button.tc-btn.tc-btn-l(type="submit", ng-disabled="vm.loginForm.$invalid") Log In
2525

2626
section.social
2727
p ------------ Or Log in With ------------
@@ -41,7 +41,7 @@
4141
p Twitter
4242

4343
.join-topcoder
44-
span Not a member yet?
45-
p.redirect
46-
a(ui-sref="register(vm.$stateParams)") Join now
44+
span Not a member yet?
45+
46+
a.tc-btn.tc-btn-ghost-secondary.tc-btn-s(ui-sref="register(vm.$stateParams)") Join now
4747

‎app/account/register/register.jade

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
section.terms
9797
p By clicking "Join," you agree to Topcoder's #[a(href="http://www.topcoder.com/community/how-it-works/terms/", target="_blank") Terms of Service] and #[a(href="http://www.topcoder.com/community/how-it-works/privacy-policy/", target="_blank") Privacy Policy]
9898

99-
button(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid", ng-class="{'enabled-button': vm.registerForm.$valid}") Join
99+
button.tc-btn.tc-btn-l(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid") Join
100100

101101
section.social
102102
p ------------ Or Register With ------------
@@ -114,5 +114,5 @@
114114

115115
.join-topcoder
116116
span Already a member?
117-
p.redirect
118-
a(ui-sref="login(vm.$stateParams)") Log in
117+
118+
a.tc-btn.tc-btn-ghost-secondary.tc-btn-s(ui-sref="login(vm.$stateParams)") Log in

‎app/directives/challenge-tile/challenge-tile.directive.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
.stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
2121

2222
.phase-action(ng-switch="challenge.userAction")
23-
.submit(ng-switch-when="Submit") Submit
23+
a.tc-btn.tc-btn-s.tc-btn-wide.submit(ng-switch-when="Submit") Submit
2424

2525
.submitted(ng-switch-when="Submitted") Submitted
2626

@@ -115,7 +115,7 @@
115115
p.ends-in(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
116116

117117
.phase-action(ng-switch="challenge.userAction")
118-
.submit(ng-switch-when="Submit") Submit
118+
a.tc-btn.tc-btn-s.tc-btn-wide.submit(ng-switch-when="Submit") Submit
119119

120120
.submitted(ng-switch-when="Submitted") Submitted
121121

‎app/directives/distribution-graph/distribution-graph.directive.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
.coders(ng-if="!displayCoders", style="background: {{rating | ratingColor}}")
1111
.num {{rating}}
1212
.label RATING
13-
button.compare(ng-click="graphState.show = 'history'")
13+
button.tc-btn.tc-btn-s.compare(ng-click="graphState.show = 'history'")
1414
| BACK TO YOUR RATING
1515

‎app/directives/history-graph/history-graph.directive.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
.history-info
1313
.challenge(ng-if="historyRating") {{historyChallenge}}
1414
.date(ng-if="historyRating") {{historyDate | date}}
15-
button.compare(ng-click="graphState.show = 'distribution'") COMMUNITY RATINGS
15+
button.tc-btn.tc-btn-s.compare(ng-click="graphState.show = 'distribution'") COMMUNITY RATINGS

‎app/directives/ios-card/ios-card.directive.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
p.ends-in Ends In
1515
p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
1616
p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
17-
17+
1818
.stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
19-
19+
2020
p.prize-money(ng-show="challenge.reviewType === 'PEER'") Peer Review Challenge
2121

2222
p.prize-money(ng-hide="challenge.reviewType === 'PEER'") {{challenge.totalCheckpointPrize || 0 | currency:undefined:0}}

‎app/directives/profile-widget/profile-widget.jade

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
p.description {{profile.description}}
1717

18-
button.edit(ng-show="editProfileLink", ui-sref="settings.profile") Edit Profile
18+
a.tc-btn.tc-btn-s.edit(ng-show="editProfileLink", ui-sref="settings.profile") Edit Profile
1919

2020
.tracks-links
2121
.tracks
@@ -27,7 +27,7 @@
2727
hr
2828

2929
.links
30-
a.forums.link(ng-href="http://forums.{{DOMAIN}}/?module=History&userID={{profileVm.profile.userId}}")
30+
a.tc-btn.tc-btn-secondary.tc-btn-s.forums.link(ng-href="http://forums.{{DOMAIN}}/?module=History&userID={{profileVm.profile.userId}}")
3131
| Forum Posts
32-
button.badges.link(ng-click="profileVm.showBadges()")
32+
button.tc-btn.tc-btn-secondary.tc-btn-s.badges.link(ng-click="profileVm.showBadges()")
3333
| Badges

‎app/directives/srm-tile/srm-tile.directive.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
i.fa.fa-check-circle-o
2020
p You are registered!
2121
.unregistered(ng-hide="vm.registered")
22-
button.srm-action Register
22+
button.tc-btn.tc-btn-s.tc-btn-wide.srm-action Register
2323

2424
.past-srm(ng-show="srm.status === 'PAST'")
2525
.challenge-track
@@ -54,7 +54,7 @@
5454
i.fa.fa-check-circle-o
5555
p You are registered!
5656
.unregistered(ng-hide="vm.registered")
57-
button.srm-action Register
57+
button.tc-btn.tc-btn-s.tc-btn-wide.srm-action Register
5858

5959
.past-srm(ng-show="srm.status === 'PAST'")
6060
.challenge-track

‎app/my-dashboard/community-updates/community-updates.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ header
1111
.description(ng-bind-html="blog.description")
1212

1313
.blog-links(ng-hide="vm.loading")
14-
a(ng-href="https://www.{{DOMAIN}}/blog/") View More
14+
a.tc-btn.tc-btn-s.tc-btn-secondary(ng-href="https://www.{{DOMAIN}}/blog/") View More

‎app/my-dashboard/my-challenges/my-challenges.jade

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ section.noChallenges(ng-if="!vm.userHasChallenges && !vm.loading")
3131
p.info Compete in challenges to win money, test yourself against the world's best, and learn new skills
3232

3333
.info-links
34-
a(ng-href="https://www.{{DOMAIN}}/challenges/?pageIndex=1") Find Challenges
34+
a.tc-btn.tc-btn-l(ng-href="https://www.{{DOMAIN}}/challenges/?pageIndex=1") Find Challenges
3535

36-
a(href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
36+
a.tc-btn.tc-btn-ghost.tc-btn-l(href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
3737

3838
section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading", ng-class="{ 'list-view-active': vm.challengeView === 'list' }")
3939
.section-titles(ng-show="vm.challengeView === 'list'")
@@ -46,6 +46,6 @@ section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading", ng-class="{ '
4646
challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="vm.challengeView", ng-class="vm.challengeView + '-view'")
4747

4848
.my-challenges-links(id="viewAllChallenges", ng-if="vm.userHasChallenges && !vm.loading")
49-
a(ui-sref="my-challenges({status: 'active'})") View All Active Challenges
49+
a.tc-btn.tc-btn-s.tc-btn-secondary(ui-sref="my-challenges({status: 'active'})") View All Active Challenges
5050

51-
a(ui-sref="my-challenges({status: 'completed'})") View All Past Challenges
51+
a.tc-btn.tc-btn-s.tc-btn-secondary(ui-sref="my-challenges({status: 'completed'})") View All Past Challenges

‎app/my-dashboard/programs/programs.jade

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ section.ios(ng-hide="vm.loading")
1515
p Experienced and proven iOS developers are in high-demand. Prove your skills by earning these iOS topcoder badges and gain exclusive access to iOS challenges and prize accelerators, special previews into content and releases, and special community-related events and info.
1616

1717
.info-links
18-
a(ng-click="vm.registerUser()") Participate
18+
a.tc-btn(ng-click="vm.registerUser()") Participate
1919

20-
a(ng-href="https://ios.{{DOMAIN}}", target="_blank") Learn More
20+
a.tc-btn.tc-btn-ghost(ng-href="https://ios.{{DOMAIN}}", target="_blank") Learn More
2121

2222
.registered(ng-show="vm.registered")
2323
.badge-and-challenges
@@ -28,6 +28,6 @@ section.ios(ng-hide="vm.loading")
2828
.badge-timeline
2929
img(src="/images/member-program/svg/Member-06.svg", alt="Development Challenge Icon")
3030

31-
a(href="http://ios.{{vm.domain}}", title="topcoder iOS Member Program") View Challenges
31+
a.tc-btn.tc-btn-s.tc-btn-ghost.tc-btn-wide(href="http://ios.{{vm.domain}}", title="topcoder iOS Member Program") View Challenges
3232

3333
ios-card(ng-repeat="challenge in vm.challenges | orderBy:reviewType:true| orderBy:registrationEndDate:true", challenge="challenge", view="'tile'")

‎app/my-dashboard/srms/srms.jade

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ section(ng-hide="vm.loading")
1212
.flex-wrapper
1313
h2 Practice on past problems
1414

15-
a(ng-href="https://community.{{DOMAIN}}/tc?module=ProblemArchive") Problem Archives
15+
a.tc-btn.tc-btn-s.tc-btn-wide(ng-href="https://community.{{DOMAIN}}/tc?module=ProblemArchive") Problem Archives
1616

17-
a(ng-href="https://community.{{DOMAIN}}/wiki/display/tc/Algorithm+Problem+Set+Analysis") Match Editorials
17+
a.tc-btn.tc-btn-s.tc-btn-wide(ng-href="https://community.{{DOMAIN}}/wiki/display/tc/Algorithm+Problem+Set+Analysis") Match Editorials
1818

19-
a(ng-href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
19+
a.tc-btn.tc-btn-s.tc-btn-wide(ng-href="https://www.{{DOMAIN}}/community/getting-started/") Learn More
2020

2121
.srms-links(ng-hide="vm.loading")
22-
a(ui-sref="my-srms") View Past SRMs
22+
a.tc-btn.tc-btn-s.tc-btn-secondary(ui-sref="my-srms") View Past SRMs
2323

24-
a(ng-href="https://arena.{{DOMAIN}}") Launch Arena
24+
a.tc-btn.tc-btn-s.tc-btn-secondary(ng-href="https://arena.{{DOMAIN}}") Launch Arena

‎app/profile/about/about.jade

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
.skill(ng-repeat="skill in vm.skills")
1313
skill-tile(skill="skill")
1414

15-
button.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW ALL
16-
button.more(ng-if="vm.skills.length > 6", ng-click="vm.skills = vm.someSkills") VIEW LESS
15+
button.tc-btn.tc-btn-secondary.tc-btn-l.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW ALL
16+
button.tc-btn.tc-btn-secondary.tc-btn-l.more(ng-if="vm.skills.length > 6", ng-click="vm.skills = vm.someSkills") VIEW LESS
1717

1818
.empty-state(ng-show="!profileVm.skills || (profileVm.skills && profileVm.skills.length == 0)")
1919
.action-text Tell everyone what you know
@@ -24,7 +24,7 @@
2424

2525
.description You can add languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.
2626

27-
button.link-button(ui-sref="settings.profile") ADD SKILLS
27+
button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") ADD SKILLS
2828

2929
tc-section(ng-show="vm.displaySection.stats", state="profileVm.status.stats")
3030

@@ -40,7 +40,7 @@
4040
div
4141
.text {{track | track}}
4242
.description Compete in challenges to win money, test yourself against the world's best, and learn new skills. Your performance rating will show up here.
43-
a.link-button(href="/challenges") FIND CHALLENGES
43+
a.tc-btn.tc-btn-l.link-button(href="/challenges") FIND CHALLENGES
4444

4545
.track(
4646
ng-repeat="track in profileVm.profile.tracks",
@@ -96,4 +96,4 @@
9696

9797
.description Show off your work and experience outside of Topcoder. Connect accounts from popular services and networks or add a link to any site.
9898

99-
button.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS
99+
button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS

‎app/settings/account-info/account-info.jade

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
p(ng-class="{ 'has-symbol-or-number': (vm.newPasswordForm.password.$dirty && !vm.newPasswordForm.password.$error.hasSymbolOrNumber) }") At least one number or symbol
3939

4040
.button-container
41-
button.button-l.save(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.newPasswordForm", ng-disabled="vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine", ng-class="{'disabled': vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine}") Change Password
41+
button.tc-btn.tc-btn-secondary.tc-btn-l.save(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.newPasswordForm", ng-disabled="vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine", ng-class="{'disabled': vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine}") Change Password
4242

4343

4444
div(ng-show="vm.isSocialRegistration")
@@ -82,13 +82,13 @@
8282
.form-input-error(ng-show="vm.accountInfoForm.lastname.$invalid")
8383
p(ng-show="vm.accountInfoForm.lastname.$error.required") This is a required field.
8484

85-
85+
8686
.settings-section.address
8787
.section-info
8888
h2 address
8989
.description Required for payments and in case we need to mail you something. Will be kept private and not shared with anyone.
9090

91-
.section-fields
91+
.section-fields
9292
.form-label.address Address
9393
input.form-field(
9494
name="address", type="text",
@@ -98,7 +98,7 @@
9898
ng-class="{'form-field-focused': hasFocus==true}"
9999
)
100100

101-
.form-label Address 2
101+
.form-label Address 2
102102
span(style="text-transform: none;") &nbsp;(opt., suite, etc.)
103103
input.form-field(
104104
name="address2",
@@ -155,4 +155,4 @@
155155

156156

157157
.button-container
158-
button.button-l(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.accountInfoForm", ng-disabled="vm.accountInfoForm.$invalid", ng-class="{'enabled-button': vm.accountInfoForm.$valid}") Save
158+
button.tc-btn.tc-btn-secondary.tc-btn-l(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.accountInfoForm", ng-disabled="vm.accountInfoForm.$invalid", ng-class="{'enabled-button': vm.accountInfoForm.$valid}") Save

‎app/settings/edit-profile/edit-profile.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
.section-fields
5050
track-toggle(tracks="vm.tracks")
5151

52-
button(type="submit", tc-busy-button, tc-busy-when="vm.profileFormProcessing" ng-disabled="vm.editProfile.$invalid || vm.editProfile.$pristine", ng-class="{' ': vm.editProfile.$valid, 'disabled': vm.editProfile.$pristine || vm.editProfile.$invalid}") Save
52+
button.tc-btn.tc-btn-secondary.tc-btn-l(type="submit", tc-busy-button, tc-busy-when="vm.profileFormProcessing" ng-disabled="vm.editProfile.$invalid || vm.editProfile.$pristine", ng-class="{' ': vm.editProfile.$valid, 'disabled': vm.editProfile.$pristine || vm.editProfile.$invalid}") Save
5353

5454
.settings-section.skills
5555
.section-info

‎app/skill-picker/skill-picker.jade

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
.icon
2424
img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="/images/skills/id-design.svg")
2525
.name {{tag.name}}
26-
2726

2827
.skills-section(ng-show="vm.tracks.DEVELOP")
2928
.track-title select development skills
@@ -48,8 +47,8 @@
4847
.name {{tag.name}}
4948

5049

51-
button.button-l(
52-
type="button",
50+
button.tc-btn.tc-btn-l.done-button(
51+
type="button",
5352
tc-busy-button, tc-busy-when="vm.saving",
5453
ng-click="vm.submitSkills()",
5554
ng-class="{'enabled-button': vm.tracks.design || vm.tracks.develop || vm.tracks.data_science}") Done

‎assets/css/account/account.scss

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import 'topcoder-includes';
12
@import '../partials/combined';
23

34
.login-container, .register-container, .reset-password-container, .registered-successfully-container {
@@ -63,26 +64,17 @@
6364
}
6465

6566
.tips {
66-
left: 380px;
67+
left: 380px;
6768
}
6869

6970
.email-tips {
70-
left: 380px;
71+
left: 380px;
7172
}
7273

7374
button {
74-
@include ui-submit-button;
7575
width: 180px;
76-
border-radius: 4px;
7776
align-self: center;
78-
79-
&.enabled-button {
80-
@include ui-enabled-button;
81-
}
82-
83-
&[disabled] {
84-
@include ui-disabled-button;
85-
}
77+
text-transform: uppercase;
8678
}
8779

8880
// Form stylings

‎assets/css/account/login.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import 'topcoder-includes';
12
@import '../partials/combined';
23

34
.login-container {

‎assets/css/account/register.scss

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import 'topcoder-includes';
12
@import '../partials/combined';
23

34
.register-container {
@@ -114,35 +115,18 @@
114115
align-items: center;
115116
}
116117

117-
.redirect {
118-
border: 1px solid #D1D3D4;
119-
background-color: white;
120-
border-radius : 4px;
121-
width: 66px;/* TODO as per design it should be 63px*/
122-
height: 30px;
118+
a {
123119
margin-left: 10px;
124-
display: flex;
125-
align-items: center;
126-
justify-content: center;
127120
@include sofia-pro-light;
128-
text-transform: uppercase;
129121
font-size: 12px;
130-
line-height: 14px;
122+
text-transform: uppercase;
131123
padding: 8px 12px;
132-
133-
a {
134-
text-decoration: none;
135-
@include sofia-pro-light;
136-
}
137124
}
138125
}
139126

140127
@media (max-width: 767px) {
141-
142128
.register-container {
143-
144129
form {
145-
146130
.first-last-names {
147131
display: flex;
148132
flex-direction: column;

‎assets/css/account/registered-successfully.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
@import 'topcoder-includes';
12
@import '../partials/combined';
23

34
.registered-successfully-container {
4-
p.message {
5+
p.message {
56
font-size: 20px;
67
line-height: 30px;
78
@include source-sans-light;
89
color: #3D3D3D;
910
padding: 62px 90px 154px 90px;
1011
}
11-
}
12+
}

‎assets/css/account/reset-password.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
@import 'topcoder-includes';
12
@import '../partials/combined';
23

34
.reset-password-container {
4-
5+
56
form {
67
display: flex;
78
flex-flow: column wrap;

0 commit comments

Comments
 (0)