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

dashboard and subtrack polishes #446

Merged
merged 2 commits into from
Oct 23, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/directives/history-graph/history-graph.directive.jade
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
.history-graph-directive(ng-show="graphState.show == 'history'")
.history-graph-container

br

.history-graph

.info-port
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
div.paginator
tc-section(state="state")
button.tc-btn(ng-show="pageParams.totalCount > pageParams.currentCount", ng-click="loadMore()") Load More
button.tc-btn.tc-btn-s(ng-show="pageParams.totalCount > pageParams.currentCount", ng-click="loadMore()") Load More

8 changes: 4 additions & 4 deletions app/profile/subtrack/nav.jade
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
)

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

.subtrack(
Expand Down
7 changes: 4 additions & 3 deletions assets/css/directives/challenge-tile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,13 @@ challenge-tile .challenge.tile-view {
align-items: center;
min-height: 36px;
padding: 0 20px;
@include source-sans-regular;
font-size: 13px;
line-height: 18px;
@include merriweather-sans-regular;
font-size: 12px;
line-height: 17px;
background-color: $gray-lighter;

span {
padding: 0;
@include ellipsis;
span:first-child {
color: $accent-gray;
Expand Down
35 changes: 25 additions & 10 deletions assets/css/directives/history-graph.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
}

rect {
fill: #f6f6f6;
fill: $white;
stroke: $gray-lighter;
stroke-width: 2.3px;
}

.line {
Expand All @@ -42,14 +44,15 @@
}

.grid.x .tick {
stroke: white;
opacity: 0.7;
stroke: $gray-light;
stroke-width: 2px;
stroke-dasharray: 6, 8;
}

.grid.y .tick {
stroke: #d7d7d7;
stroke-dasharray: 5, 5;
opacity: 0.3;
stroke: none;
opacity: 0;
stroke-width: 1px;
}

.y.axis .tick text {
Expand All @@ -58,6 +61,17 @@
text-align: left;
}

circle {
r: 5.5px;
stroke: $white;
stroke-width: 1.5px;
}

circle::hover {
r: 7.5px;
stroke-width: 2px;
}


}
.info-port {
Expand Down Expand Up @@ -114,6 +128,11 @@
}

@media (min-width: 768px) {

.stats > .graphs {
margin-top: -40px !important;
}

.history-graph-container {
width: 950px;
margin-left: auto;
Expand All @@ -137,10 +156,6 @@
display: none;
}

rect {
fill: #f6f6f6;
}

.line {
fill: none;
stroke: #c5c5c5;
Expand Down
13 changes: 12 additions & 1 deletion assets/css/directives/tc-tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,26 @@
line-height: 24px;
@include sofia-pro-medium;
text-transform: uppercase;
margin: auto 30px;
margin: auto 45px;
&.selected {
color: $gray-darkest;
padding-bottom: 14px;
border-bottom: solid 2px $primary;
}
}
}
a:hover {
color: $accent-gray-dark;
}
}
}
.tab-view {}
}

.page-header + tc-tab-set {
.tab-panel .tab-set {
border-top: none;
}
}


8 changes: 8 additions & 0 deletions assets/css/my-challenges/my-challenges.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@import 'topcoder-includes';
@import '../partials/combined';

.my-challenges-links,
.srms-links,
.blog-links {
a {
font-size: 12px;
}
}

.my-challenges-container {
width: 100%;
display: flex;
Expand Down
25 changes: 14 additions & 11 deletions assets/css/profile/subtrack.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@
margin-bottom: 10px;
background-color: #fff;
padding: 30px auto;

& + .develop {
// move the cards up to compensate for size. Refactor of the component will make this obsolete!
margin-top: -40px;
}
}

.bottom {
Expand Down Expand Up @@ -163,9 +166,9 @@
justify-content: center;
}
h2.detailed {
margin: 50px auto 25px auto;
margin: 30px auto 0;
text-align: center;
font-family: 'Lucida Grande';
@include sofia-pro-medium;
font-size: 18px;
line-height: 21px;
font-weight: bold;
Expand Down Expand Up @@ -281,7 +284,7 @@
margin-top: -3px;
width: 90%;
border: 0;
border-top: 1px solid #d1d3d4;
border-top: 1px solid $gray-lighter;
margin-left: auto;
margin-right: auto;
}
Expand Down Expand Up @@ -376,13 +379,13 @@
justify-content: center;
}
h2.detailed {
margin: 50px auto 25px auto;
margin: 30px auto 0;
@include sofia-pro-regular;
font-size: 28px;
line-height: 34px;
font-size: 24px;
line-height: 30px;
}
ul.vertical-stats {
margin-top: 50px;
margin-top: 30px;
width: 95%;
align-content: space-between;
height: 300px;
Expand All @@ -398,12 +401,12 @@
font-size: 15px;
line-height: 18px;
padding: 14px;
border-bottom: 1px solid #f6f6f6;
border-bottom: 1px solid $gray-lighter;
.right {
color: #00aeff;
color: $primary;
}
&.first {
border-top: 1px solid #f6f6f6;
border-top: 1px solid $gray-lighter;
}
}
}
Expand Down