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

Commit 2f2cc4d

Browse files
nlitwinnlitwin
committed
Merge pull request #238 from appirio-tech/new-track-colors
Add new colors
2 parents 4438c09 + 42911de commit 2f2cc4d

File tree

16 files changed

+91
-79
lines changed

16 files changed

+91
-79
lines changed

‎app/filters/rating-color.filter.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@
1414
var colors = [
1515
// grey
1616
{
17-
'color': '#7f7f7f',
17+
'color': '#9D9FA0',
1818
'darkerColor': '#656565',
1919
'start': 0,
2020
'end': 899
2121
},
2222
// green
2323
{
24-
'color': '#99cc09',
24+
'color': '#69C329',
2525
'darkerColor': '#7aa307',
2626
'start': 900,
2727
'end': 1199
2828
},
2929
// blue
3030
{
31-
'color': '#09affe',
31+
'color': '#616BD5',
3232
'darkerColor': '#078ccb',
3333
'start': 1200,
3434
'end': 1499
3535
},
3636
// yellow
3737
{
38-
'color': '#f39426',
38+
'color': '#FCB816',
3939
'darkerColor': '#c2761e',
4040
'start': 1500,
4141
'end': 2199
4242
},
4343
// red
4444
{
45-
'color': '#fe0866',
45+
'color': '#EF3A3A',
4646
'darkerColor': '#cb0651',
4747
'start': 2200,
4848
'end': Infinity

‎app/my-dashboard/subtrack-stats/subtrack-stats.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
.flex-wrapper
88
p.subtrack {{subtrack.subTrack | underscoreStrip}}
99

10-
p.rating {{subtrack.stat | number}}
10+
p.rating(style="color: {{subtrack.stat | ratingColor}}") {{subtrack.stat | number}}
1111
span(style="background-color: {{subtrack.stat | ratingColor}}", ng-if="subtrack.track === 'DEVELOP' || subtrack.track === 'DATA_SCIENCE'")
1212

1313
p {{subtrack.statType}}

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ challenge-tile .challenge.tile-view {
3636
@include sofia-pro-medium;
3737
font-size: 14px;
3838
line-height: 18px;
39-
color: $primary-text;
39+
color: $gray-darkest;
4040
text-decoration: none;
4141
@include ellipsis;
4242

@@ -91,7 +91,7 @@ challenge-tile .challenge.tile-view {
9191
.time-remaining {
9292
margin-top: 5px;
9393
font-size: 24px;
94-
color: $primary-text;
94+
color: $gray-darkest;
9595
}
9696

9797
.unit-of-time {
@@ -128,7 +128,7 @@ challenge-tile .challenge.tile-view {
128128
@include sofia-pro-regular;
129129
font-size: 12px;
130130
text-transform: uppercase;
131-
color: $primary-text;
131+
color: $gray-darkest;
132132

133133
&:before {
134134
content: '';
@@ -146,7 +146,7 @@ challenge-tile .challenge.tile-view {
146146
.roles {
147147
min-height: 36px;
148148
margin-bottom: 25px;
149-
color: $primary-text;
149+
color: $gray-darkest;
150150
@include source-sans-regular;
151151
font-size: 13px;
152152
line-height: 18px;
@@ -185,7 +185,7 @@ challenge-tile .challenge.tile-view {
185185
p {
186186
@include sofia-pro-medium;
187187
font-size: 12px;
188-
color: $primary-text;
188+
color: $gray-darkest;
189189
}
190190

191191
.forum p {
@@ -243,7 +243,7 @@ challenge-tile .challenge.tile-view {
243243
@include sofia-pro-medium;
244244
font-size: 14px;
245245
line-height: 18px;
246-
color: $primary-text;
246+
color: $gray-darkest;
247247
text-decoration: none;
248248

249249
&:hover {
@@ -277,7 +277,7 @@ challenge-tile .challenge.tile-view {
277277
margin-bottom: 30px;
278278
@include sofia-pro-regular;
279279
font-size: 20px;
280-
color: $primary-text;
280+
color: $gray-darkest;
281281

282282
&.first-place {
283283
font-weight: bold;
@@ -303,7 +303,7 @@ challenge-tile .challenge.tile-view {
303303
margin-bottom: 5px;
304304
@include sofia-pro-bold;
305305
font-size: 18px;
306-
color: $primary-text;
306+
color: $gray-darkest;
307307
}
308308

309309
p:last-child {
@@ -360,7 +360,7 @@ challenge-tile .challenge.list-view {
360360
display: block;
361361
@include sofia-pro-medium;
362362
font-size: 18px;
363-
color: $primary-text;
363+
color: $gray-darkest;
364364
text-decoration: none;
365365
@include ellipsis;
366366

@@ -381,7 +381,7 @@ challenge-tile .challenge.list-view {
381381
max-width: 362px;
382382
@include source-sans-regular;
383383
font-size: 13px;
384-
color: $primary-text;
384+
color: $gray-darkest;
385385
@include ellipsis;
386386

387387
.role {
@@ -407,7 +407,7 @@ challenge-tile .challenge.list-view {
407407
margin-bottom: 10px;
408408
@include sofia-pro-light;
409409
font-size: 18px;
410-
color: $primary-text;
410+
color: $gray-darkest;
411411
text-transform: uppercase;
412412
}
413413

@@ -436,7 +436,7 @@ challenge-tile .challenge.list-view {
436436
@include sofia-pro-regular;
437437
font-size: 12px;
438438
text-transform: uppercase;
439-
color: $primary-text;
439+
color: $gray-darkest;
440440

441441
&:before {
442442
content: '';
@@ -478,7 +478,7 @@ challenge-tile .challenge.list-view {
478478
p {
479479
@include sofia-pro-light;
480480
font-size: 24px;
481-
color: $primary-text;
481+
color: $gray-darkest;
482482
}
483483

484484
.forum p {
@@ -512,30 +512,30 @@ challenge-tile .challenge.list-view {
512512

513513
// Dynamic colors based on track
514514
.DESIGN {
515-
.challenge-track { background-color: $accent-color; }
515+
.challenge-track { background-color: $design; }
516516

517517
&.tile-view {
518-
header .subtrack-color { color: $accent-color; }
518+
header .subtrack-color { color: $design; }
519519
}
520520
}
521521
.DEVELOP {
522-
.challenge-track { background-color: $success-color; }
522+
.challenge-track { background-color: $develop; }
523523

524524
&.tile-view {
525-
header .subtrack-color { color: $success-color; }
525+
header .subtrack-color { color: $develop; }
526526
}
527527
}
528528
.DATA_SCIENCE {
529-
.challenge-track { background-color: #F39426; }
529+
.challenge-track { background-color: $data_science; }
530530

531531
&.tile-view {
532-
header .subtrack-color { color: #F39426; }
532+
header .subtrack-color { color: $data_science; }
533533
}
534534
}
535535
.COPILOT {
536-
.challenge-track { background-color: #7F7F7F; }
536+
.challenge-track { background-color: $copilot; }
537537

538538
&.tile-view {
539-
header .subtrack-color { color: #7F7F7F; }
539+
header .subtrack-color { color: $copilot; }
540540
}
541541
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ios-card .challenge.tile-view {
3030
@include sofia-pro-medium;
3131
font-size: 14px;
3232
line-height: 18px;
33-
color: $primary-text;
33+
color: $gray-darkest;
3434
text-decoration: none;
3535
@include ellipsis;
3636
}
@@ -88,7 +88,7 @@ ios-card .challenge.tile-view {
8888
.time-remaining {
8989
margin-top: 5px;
9090
font-size: 24px;
91-
color: $primary-text;
91+
color: $gray-darkest;
9292
}
9393

9494
.unit-of-time {
@@ -107,7 +107,7 @@ ios-card .challenge.tile-view {
107107
.roles {
108108
min-height: 36px;
109109
margin-bottom: 25px;
110-
color: $primary-text;
110+
color: $gray-darkest;
111111
@include source-sans-regular;
112112
font-size: 13px;
113113
line-height: 18px;
@@ -146,7 +146,7 @@ ios-card .challenge.tile-view {
146146
p {
147147
@include sofia-pro-bold;
148148
font-size: 11px;
149-
color: $primary-text;
149+
color: $gray-darkest;
150150
}
151151

152152
.forum p {
@@ -180,20 +180,20 @@ ios-card .challenge.tile-view {
180180

181181
// Dynamic colors based on track
182182
&.DESIGN {
183-
.challenge-track { background-color: $accent-color; }
184-
header p { color: $accent-color; }
183+
.challenge-track { background-color: $design; }
184+
header p { color: $design; }
185185
}
186186
&.DEVELOP {
187-
.challenge-track { background-color: $success-color; }
188-
header p { color: $success-color; }
187+
.challenge-track { background-color: $develop; }
188+
header p { color: $develop; }
189189
}
190190
&.DATA_SCIENCE {
191-
.challenge-track { background-color: #F39426; }
192-
header p { color: #F39426; }
191+
.challenge-track { background-color: $data_science; }
192+
header p { color: $data_science; }
193193
}
194194
&.COPILOT {
195-
.challenge-track { background-color: #7F7F7F; }
196-
header p { color: #7F7F7F; }
195+
.challenge-track { background-color: $copilot; }
196+
header p { color: $copilot; }
197197
}
198198
}
199199

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
@include sofia-pro-medium;
3434
font-size: 14px;
3535
line-height: 49px;
36-
color: $primary-text;
36+
color: $gray-darkest;
3737
text-decoration: none;
3838
@include ellipsis;
3939
}
@@ -73,7 +73,7 @@
7373
&.day {
7474
margin-top: 2px;
7575
font-size: 24px;
76-
color: $primary-text;
76+
color: $gray-darkest;
7777
}
7878
&.month, &.time-zone {
7979
letter-spacing: 1.6px;
@@ -92,7 +92,7 @@
9292
margin-left: 3px;
9393
@include sofia-pro-regular;
9494
font-size: 12px;
95-
color: $primary-text;
95+
color: $gray-darkest;
9696
}
9797
}
9898
}

‎assets/css/layout/footer.scss

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

33
.bottom-footer {
4-
background-color: $primary-text;
4+
background-color: $gray-darkest;
55
padding: 1px 20px 30px 20px;
66
}
77

‎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: $primary-text;
111+
color: $gray-darkest;
112112
font-size: 15px;
113113
line-height: 55px;
114114
font-family: inherit;
@@ -254,7 +254,7 @@
254254
}
255255

256256
.top-header {
257-
background-color: $primary-text;
257+
background-color: $gray-darkest;
258258
}
259259
}
260260

‎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: $primary-text;
6+
color: $gray-darkest;
77
@media only screen and (min-width: 1132px) {
88
padding-bottom: 60px;
99
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@include sofia-pro-bold;
2828
font-size: 22px;
2929
line-height: 26px;
30-
color: $primary-text;
30+
color: $gray-darkest;
3131
text-transform: uppercase;
3232
@media only screen and (min-width: 600px) {
3333
margin-bottom: 0;
@@ -65,7 +65,7 @@
6565
@include sofia-pro-bold;
6666
font-size: 18px;
6767
line-height: 23px;
68-
color: $primary-text;
68+
color: $gray-darkest;
6969
@media only screen and (min-width: 600px) {
7070
font-size: 22px;
7171
line-height: 28px;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
display: flex;
6161
flex-direction: column;
6262
align-items: center;
63-
color: $primary-text;
63+
color: $gray-darkest;
6464
padding-left: 20px;
6565
padding-right: 20px;
6666

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
.section-title {
3838
@include sofia-pro-bold;
3939
font-size: 22px;
40-
color: $primary-text;
40+
color: $gray-darkest;
4141
text-align: center;
4242
text-transform: uppercase;
4343
@media only screen and (min-width: 450px) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
@include sofia-pro-light;
6464
font-size: 23px;
6565
text-transform: uppercase;
66-
color: $primary-text;
66+
color: $gray-darkest;
6767
@media only screen and (min-width: 900px) {
6868
margin-top: 0;
6969
}
@@ -156,7 +156,7 @@
156156
margin-bottom: 37px;
157157
@include sofia-pro-light;
158158
font-size: 20px;
159-
color: $primary-text;
159+
color: $gray-darkest;
160160
}
161161

162162
.badge-timeline {
@@ -210,7 +210,7 @@
210210
@include source-sans-regular;
211211
font-size: 14px;
212212
line-height: 20px;
213-
color: $primary-text;
213+
color: $gray-darkest;
214214
@media only screen and (min-width: 900px) {
215215
font-size: 16px;
216216
}

0 commit comments

Comments
 (0)