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

Commit 0386b94

Browse files
author
Victor George
committed
dashboard and subtrack polishes
1 parent 71208f4 commit 0386b94

File tree

7 files changed

+60
-32
lines changed

7 files changed

+60
-32
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
.history-graph-directive(ng-show="graphState.show == 'history'")
22
.history-graph-container
33

4-
br
5-
64
.history-graph
75

86
.info-port
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
div.paginator
22
tc-section(state="state")
3-
button.tc-btn(ng-show="pageParams.totalCount > pageParams.currentCount", ng-click="loadMore()") Load More
3+
button.tc-btn.tc-btn-s(ng-show="pageParams.totalCount > pageParams.currentCount", ng-click="loadMore()") Load More
44

app/profile/subtrack/nav.jade

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
)
66

77
div(class="name")
8-
img(ng-if="track == 'DATA_SCIENCE'", src="/images/ico-track-data-outline.svg")
9-
img(ng-if="track == 'DEVELOP'", src="/images/ico-track-develop-outline.svg")
10-
img(ng-if="track == 'DESIGN'", src="/images/ico-track-design-outline.svg")
11-
img(ng-if="track == 'COPILOT'", src="/images/ico-track-co_pilot-outline.svg")
8+
img(ng-if="track == 'DATA_SCIENCE'", src="/images/ico-track-data.svg")
9+
img(ng-if="track == 'DEVELOP'", src="/images/ico-track-develop.svg")
10+
img(ng-if="track == 'DESIGN'", src="/images/ico-track-design.svg")
11+
img(ng-if="track == 'COPILOT'", src="/images/ico-track-copilot.svg")
1212
span {{track | track | uppercase}}
1313

1414
.subtrack(

assets/css/directives/challenge-tile.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,13 @@ challenge-tile .challenge.tile-view {
6868
align-items: center;
6969
min-height: 36px;
7070
padding: 0 20px;
71-
@include source-sans-regular;
72-
font-size: 13px;
73-
line-height: 18px;
71+
@include merriweather-sans-regular;
72+
font-size: 12px;
73+
line-height: 17px;
7474
background-color: $gray-lighter;
7575

7676
span {
77+
padding: 0;
7778
@include ellipsis;
7879
span:first-child {
7980
color: $accent-gray;

assets/css/directives/history-graph.scss

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
}
3333

3434
rect {
35-
fill: #f6f6f6;
35+
fill: $white;
36+
stroke: $gray-lighter;
37+
stroke-width: 2.3px;
3638
}
3739

3840
.line {
@@ -42,14 +44,15 @@
4244
}
4345

4446
.grid.x .tick {
45-
stroke: white;
46-
opacity: 0.7;
47+
stroke: $gray-light;
48+
stroke-width: 2px;
49+
stroke-dasharray: 6, 8;
4750
}
4851

4952
.grid.y .tick {
50-
stroke: #d7d7d7;
51-
stroke-dasharray: 5, 5;
52-
opacity: 0.3;
53+
stroke: none;
54+
opacity: 0;
55+
stroke-width: 1px;
5356
}
5457

5558
.y.axis .tick text {
@@ -58,6 +61,17 @@
5861
text-align: left;
5962
}
6063

64+
circle {
65+
r: 5.5px;
66+
stroke: $white;
67+
stroke-width: 1.5px;
68+
}
69+
70+
circle::hover {
71+
r: 7.5px;
72+
stroke-width: 2px;
73+
}
74+
6175

6276
}
6377
.info-port {
@@ -114,6 +128,11 @@
114128
}
115129

116130
@media (min-width: 768px) {
131+
132+
.stats > .graphs {
133+
margin-top: -40px !important;
134+
}
135+
117136
.history-graph-container {
118137
width: 950px;
119138
margin-left: auto;
@@ -137,10 +156,6 @@
137156
display: none;
138157
}
139158

140-
rect {
141-
fill: #f6f6f6;
142-
}
143-
144159
.line {
145160
fill: none;
146161
stroke: #c5c5c5;

assets/css/directives/tc-tabs.scss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,26 @@
2222
line-height: 24px;
2323
@include sofia-pro-medium;
2424
text-transform: uppercase;
25-
margin: auto 30px;
25+
margin: auto 45px;
2626
&.selected {
2727
color: $gray-darkest;
2828
padding-bottom: 14px;
2929
border-bottom: solid 2px $primary;
3030
}
3131
}
3232
}
33+
a:hover {
34+
color: $accent-gray-dark;
35+
}
3336
}
3437
}
3538
.tab-view {}
3639
}
40+
41+
.page-header + tc-tab-set {
42+
.tab-panel .tab-set {
43+
border-top: none;
44+
}
45+
}
46+
47+

assets/css/profile/subtrack.scss

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@
101101
margin-bottom: 10px;
102102
background-color: #fff;
103103
padding: 30px auto;
104-
104+
& + .develop {
105+
// move the cards up to compensate for size. Refactor of the component will make this obsolete!
106+
margin-top: -40px;
107+
}
105108
}
106109

107110
.bottom {
@@ -163,9 +166,9 @@
163166
justify-content: center;
164167
}
165168
h2.detailed {
166-
margin: 50px auto 25px auto;
169+
margin: 30px auto 0;
167170
text-align: center;
168-
font-family: 'Lucida Grande';
171+
@include sofia-pro-medium;
169172
font-size: 18px;
170173
line-height: 21px;
171174
font-weight: bold;
@@ -281,7 +284,7 @@
281284
margin-top: -3px;
282285
width: 90%;
283286
border: 0;
284-
border-top: 1px solid #d1d3d4;
287+
border-top: 1px solid $gray-lighter;
285288
margin-left: auto;
286289
margin-right: auto;
287290
}
@@ -376,13 +379,13 @@
376379
justify-content: center;
377380
}
378381
h2.detailed {
379-
margin: 50px auto 25px auto;
382+
margin: 30px auto 0;
380383
@include sofia-pro-regular;
381-
font-size: 28px;
382-
line-height: 34px;
384+
font-size: 24px;
385+
line-height: 30px;
383386
}
384387
ul.vertical-stats {
385-
margin-top: 50px;
388+
margin-top: 30px;
386389
width: 95%;
387390
align-content: space-between;
388391
height: 300px;
@@ -398,12 +401,12 @@
398401
font-size: 15px;
399402
line-height: 18px;
400403
padding: 14px;
401-
border-bottom: 1px solid #f6f6f6;
404+
border-bottom: 1px solid $gray-lighter;
402405
.right {
403-
color: #00aeff;
406+
color: $primary;
404407
}
405408
&.first {
406-
border-top: 1px solid #f6f6f6;
409+
border-top: 1px solid $gray-lighter;
407410
}
408411
}
409412
}

0 commit comments

Comments
 (0)