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

Commit 0d8de4a

Browse files
nlitwinnlitwin
committed
Merge pull request #200 from appirio-tech/dashboard-links
Add links under dashboard modules and refactor primary text color to …
2 parents 765e008 + f68a022 commit 0d8de4a

File tree

20 files changed

+136
-109
lines changed

20 files changed

+136
-109
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading")
3131
.challenges
3232
challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="'tile'", ng-class="'tile-view'")
3333

34-
.section-links(ng-if="vm.userHasChallenges && !vm.loading")
35-
.link
34+
.my-challenges-links(ng-if="vm.userHasChallenges && !vm.loading")
3635
a(ui-sref="my-challenges") View All
3736

38-
.link
3937
a(ui-sref="my-challenges") Past Challenges

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ section.ios(ng-hide="vm.loading")
3131
a(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'")
34+
35+
.ios-links(ng-hide="vm.loading")
36+
p Want to get better at Swift? Learn about the FREE Topcoder #[a(ng-href="https://swift.{{DOMAIN}}/") Swift Course 101]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ section(ng-hide="vm.loading")
1717

1818
a(href="https://community.{{DOMAIN}}/wiki/display/tc/Algorithm+Problem+Set+Analysis") Match Editorials
1919

20-
//- .link
21-
//- a(href="https://arena.{{DOMAIN}}/") Launch Topcoder Arena
20+
.srms-links(ng-hide="vm.loading")
21+
p Want to compete right now? Try your skills in the #[a(ng-href="https://arena.{{DOMAIN}}/") Topcoder ARENA]!

‎assets/css/directives/challenge-tile.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
@include sofia-pro-medium;
3131
font-size: 14px;
3232
line-height: 18px;
33-
color: #3D3D3D;
33+
color: $primary-text;
3434
text-decoration: none;
3535
@include ellipsis;
3636
}
@@ -81,7 +81,7 @@
8181
.time-remaining {
8282
margin-top: 5px;
8383
font-size: 24px;
84-
color: #3D3D3D;
84+
color: $primary-text;
8585
}
8686

8787
.unit-of-time {
@@ -100,7 +100,7 @@
100100
.roles {
101101
min-height: 36px;
102102
margin-bottom: 25px;
103-
color: #3D3D3D;
103+
color: $primary-text;
104104
@include source-sans-regular;
105105
font-size: 13px;
106106
line-height: 18px;
@@ -139,7 +139,7 @@
139139
p {
140140
@include sofia-pro-bold;
141141
font-size: 11px;
142-
color: #3D3D3D;
142+
color: $primary-text;
143143
}
144144

145145
.forum p {

‎assets/css/directives/ios-card.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
@include sofia-pro-medium;
3131
font-size: 14px;
3232
line-height: 18px;
33-
color: #3D3D3D;
33+
color: $primary-text;
3434
text-decoration: none;
3535
@include ellipsis;
3636
}
@@ -92,7 +92,7 @@
9292
.time-remaining {
9393
margin-top: 5px;
9494
font-size: 24px;
95-
color: #3D3D3D;
95+
color: $primary-text;
9696
}
9797

9898
.unit-of-time {
@@ -111,7 +111,7 @@
111111
.roles {
112112
min-height: 36px;
113113
margin-bottom: 25px;
114-
color: #3D3D3D;
114+
color: $primary-text;
115115
@include source-sans-regular;
116116
font-size: 13px;
117117
line-height: 18px;
@@ -150,7 +150,7 @@
150150
p {
151151
@include sofia-pro-bold;
152152
font-size: 11px;
153-
color: #3D3D3D;
153+
color: $primary-text;
154154
}
155155

156156
.forum p {

‎assets/css/directives/srm-tile.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@include sofia-pro-medium;
2929
font-size: 14px;
3030
line-height: 49px;
31-
color: #3D3D3D;
31+
color: $primary-text;
3232
text-decoration: none;
3333
@include ellipsis;
3434
}
@@ -69,7 +69,7 @@
6969
&.day {
7070
margin-top: 2px;
7171
font-size: 24px;
72-
color: #3D3D3D;
72+
color: $primary-text;
7373
}
7474
&.month, &.time-zone {
7575
letter-spacing: 1.6px;
@@ -88,7 +88,7 @@
8888
margin-left: 3px;
8989
@include sofia-pro-regular;
9090
font-size: 12px;
91-
color: #3D3D3D;
91+
color: $primary-text;
9292
}
9393
}
9494
}

‎assets/css/layout/footer.scss

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import '../partials/combined';
22

3-
.bottom-footer {
4-
background-color: #3D3D3D;
3+
.bottom-footer {
4+
background-color: $primary-text;
55
padding: 1px 20px 30px 20px;
66
}
77

@@ -10,15 +10,15 @@
1010
line-height: 1.2em;
1111
text-align: center;
1212
font-weight: normal;
13-
margin: 35px 0;
14-
color: #fff;
15-
13+
margin: 35px 0;
14+
color: #fff;
15+
1616
a {
1717
display: inline-block;
1818
background-size: contain;
1919
background-repeat: no-repeat;
2020
margin: 23px 0;
21-
21+
2222
+ a {
2323
margin-left: 30px;
2424
}
@@ -38,32 +38,32 @@
3838
display: none;
3939
margin-top: 30px;
4040
}
41-
41+
4242
.menu-visible .bottom-footer .menu-item {
4343
display: block;
4444
}
45-
45+
4646
.social-links {
4747
.fb-link {
48-
background-image: url('../images/ico-facebook.svg');
48+
background-image: url('/images/ico-facebook.svg');
4949
width: 27px;
5050
height: 27px;
5151
}
52-
52+
5353
.twitter-link {
54-
background-image: url('../images/ico-twitter.svg');
54+
background-image: url('/images/ico-twitter.svg');
5555
width: 28px;
5656
height: 24px;
5757
}
58-
58+
5959
.linkedin-link {
60-
background-image: url('../images/ico-linkedin.svg');
60+
background-image: url('/images/ico-linkedin.svg');
6161
width: 27px;
6262
height: 27px;
6363
}
64-
64+
6565
.google-link {
66-
background-image: url('../images/ico-google.svg');
66+
background-image: url('/images/ico-google.svg');
6767
width: 27px;
6868
height: 27px;
6969
}
@@ -73,51 +73,51 @@
7373
@media only screen and (min-width : 992px) {
7474
.bottom-footer {
7575
padding-top: 40px;
76-
76+
7777
.submenu-item + .submenu-item {
7878
margin-left: 50px;
7979
}
80-
80+
8181
.menu-item {
8282
text-align: center;
8383
font-weight: normal;
84-
84+
8585
.menu-link {
8686
color: #fff;
8787
font-size: 16px;
8888
line-height: 21px;
8989
}
9090
}
9191
}
92-
92+
9393
.copyright-notice {
9494
font-size: 15px;
9595
color: #fff;
9696
}
97-
97+
9898
.social-links {
9999
margin-bottom: 3px;
100-
100+
101101
a {
102102
width: 20px;
103103
height: 20px;
104104
margin-top: 13px;
105105
}
106-
106+
107107
.fb-link {
108108
background-image: url('/images/ico-facebook_desktop.svg');
109109
}
110-
110+
111111
.twitter-link {
112112
background-image: url('/images/ico-twitter_desktop.svg');
113113
}
114-
114+
115115
.linkedin-link {
116116
background-image: url('/images/ico-linkedin_desktop.svg');
117117
}
118-
118+
119119
.google-link {
120120
background-image: url('/images/ico-google_desktop.svg');
121121
}
122122
}
123-
}
123+
}

‎assets/css/layout/header.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
}
109109

110110
.btn-open-menu {
111-
color: #3d3d3d;
111+
color: $primary-text;
112112
font-size: 15px;
113113
line-height: 55px;
114114
font-family: inherit;
@@ -246,7 +246,7 @@
246246
}
247247

248248
.top-header {
249-
background-color: #3D3D3D;
249+
background-color: $primary-text;
250250
}
251251
}
252252

‎assets/css/my-challenges/my-challenges.scss

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,6 @@
2424
text-align: center;
2525
}
2626

27-
.section-links {
28-
display: flex;
29-
flex-direction: row;
30-
justify-content: center;
31-
32-
.link {
33-
border-radius: 5px;
34-
padding: 10px;
35-
background-color: $dark-gray;
36-
margin: 10px;
37-
38-
a {
39-
color: $white;
40-
text-decoration: none;
41-
}
42-
}
43-
}
44-
4527
.my-challenges {
4628
min-height: 50px;
4729
display: flex;

‎assets/css/my-dashboard/community-updates.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.community-updates {
44
display: flex;
55
flex-direction: column;
6-
color: #3D3D3D;
6+
color: $primary-text;
77

88
header {
99
margin-top: 6px;

‎assets/css/my-dashboard/header-dashboard.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@include sofia-pro-bold;
2727
font-size: 22px;
2828
line-height: 26px;
29-
color: #3D3D3D;
29+
color: $primary-text;
3030
text-transform: uppercase;
3131
@media only screen and (min-width: 600px) {
3232
margin-bottom: 0;
@@ -65,7 +65,7 @@
6565
@include sofia-pro-bold;
6666
font-size: 18px;
6767
line-height: 23px;
68-
color: #3D3D3D;
68+
color: $primary-text;
6969
text-align: right;
7070
@media only screen and (min-width: 600px) {
7171
text-align: center;

‎assets/css/my-dashboard/my-challenges.scss

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
display: flex;
1818
flex-direction: column;
1919
align-items: center;
20-
color: #3D3D3D;
20+
color: $primary-text;
2121
padding-left: 20px;
2222
padding-right: 20px;
2323

@@ -44,7 +44,7 @@
4444
.track {
4545
div:first-child {
4646
margin: 0 auto 10px;
47-
@include background-image-size(44px, 43px);
47+
@include background-image-size(44px, 44px);
4848
}
4949

5050
&:last-child {
@@ -147,4 +147,17 @@
147147
}
148148
}
149149
}
150+
151+
.my-challenges-links {
152+
@include module-links;
153+
154+
a {
155+
@include button-m;
156+
@include button-secondary;
157+
158+
&:not(:first-child) {
159+
margin-left: 10px;
160+
}
161+
}
162+
}
150163
}

‎assets/css/my-dashboard/my-dashboard.scss

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,11 @@
3030
.section-title {
3131
@include sofia-pro-bold;
3232
font-size: 22px;
33-
color: #3D3D3D;
33+
color: $primary-text;
3434
text-align: center;
3535
text-transform: uppercase;
3636
@media only screen and (min-width: 450) {
3737
font-size: 28px;
3838
}
3939
}
40-
41-
.section-links {
42-
display: flex;
43-
flex-direction: row;
44-
justify-content: center;
45-
46-
.link {
47-
border-radius: 5px;
48-
padding: 10px;
49-
background-color: $dark-gray;
50-
margin: 10px;
51-
52-
a {
53-
color: $white;
54-
text-decoration: none;
55-
}
56-
}
57-
}
5840
}

0 commit comments

Comments
 (0)