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

Sup 2453 organize ui kit #528

Merged
merged 2 commits into from
Nov 4, 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
3 changes: 1 addition & 2 deletions app/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ html

// build:css /styles/app.css
//- inject:css
link(rel="stylesheet", href="assets/css/reset.css")
link(rel="stylesheet", href="assets/css/vendors/angucomplete.css")
link(rel="stylesheet", href="assets/css/topcoder.css")
link(rel="stylesheet", href="assets/css/skill-picker/skill-picker.css")
Expand Down Expand Up @@ -72,7 +71,6 @@ html
link(rel="stylesheet", href="assets/css/directives/profile-widget.css")
link(rel="stylesheet", href="assets/css/directives/page-state-header.directive.css")
link(rel="stylesheet", href="assets/css/directives/ios-card.css")
link(rel="stylesheet", href="assets/css/directives/input-sticky-placeholder.css")
link(rel="stylesheet", href="assets/css/directives/history-graph.css")
link(rel="stylesheet", href="assets/css/directives/external-link-data.css")
link(rel="stylesheet", href="assets/css/directives/external-account.css")
Expand All @@ -86,6 +84,7 @@ html
link(rel="stylesheet", href="assets/css/directives/badge-tooltip.css")
link(rel="stylesheet", href="assets/css/community/statistics.css")
link(rel="stylesheet", href="assets/css/community/members.css")
link(rel="stylesheet", href="assets/css/community/community.css")
link(rel="stylesheet", href="assets/css/account/reset-password.css")
link(rel="stylesheet", href="assets/css/account/registered-successfully.css")
link(rel="stylesheet", href="assets/css/account/register.css")
Expand Down
9 changes: 4 additions & 5 deletions assets/css/account/account.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

.login-container,
.register-container,
Expand Down Expand Up @@ -98,7 +97,7 @@
.password-tips {
@media screen and (min-width: 915px) {
left: 395px;
}
}
}

// Autocomplete
Expand Down Expand Up @@ -257,7 +256,7 @@
display: flex;
flex-flow: row wrap;
margin-top: 30px;
justify-content: center;
justify-content: center;
text-transform: uppercase;
font-size: $label-small;
@include font-with-weight('Sofia Pro', 500);
Expand Down Expand Up @@ -290,7 +289,7 @@
.copyright-notice {
color: $gray-dark;
}

}


Expand Down
7 changes: 3 additions & 4 deletions assets/css/account/login.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

.login-container {

Expand Down Expand Up @@ -56,6 +55,6 @@
@media (min-width: 768px) {
margin-bottom: 60px;
}

}
}
}
3 changes: 1 addition & 2 deletions assets/css/account/register.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

.register-container {

Expand Down
3 changes: 1 addition & 2 deletions assets/css/account/registered-successfully.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

.registered-successfully-container {
p {
Expand Down
3 changes: 1 addition & 2 deletions assets/css/account/reset-password.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

.reset-password-container {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
@import 'tc-includes';

.community-view {
background: $gray-lighter;
color: $community-text-dark;

.header-community {
@include module-full-width;
background-color: $white;
@include font-with-weight('Sofia Pro', 500);
box-shadow: 0 0 3px 0 rgba(0, 0, 0, .3);

header {
text-align: center;
margin: 0 auto;
padding: 16px 0 13px;

h1 {
font-size: 22px;
line-height: 26px;
text-transform: uppercase;
}
}

@media only screen and (min-width: 1000px) {
box-shadow: none;

header {
text-align: left;
padding: 33px 0 37px 128px;

h1 {
font-size: 32px;
}
Expand Down
20 changes: 18 additions & 2 deletions assets/css/community/members.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
@import '../partials/combined';
@import 'community';
@import 'tc-includes';

.members-container {
padding: 15px 0 0;

a {
text-decoration: none;
}

@media only screen and (min-width: 1070px) {
padding: 60px 67px 0;
}

%reviewboard-panel {
background: $white;
padding: 10px;
Expand Down Expand Up @@ -37,17 +40,20 @@
}
}
}

.platform-stats-container {
background: $white;
padding: 10px;
margin-bottom: 6px;
height: 70px;
font-family: "Sofia Pro",Arial,Helvetica,sans-serif;

.stat {
float: left;
width: 25% ;
text-align: center;
}

.statVal {
color: #3d3d3d;
font-size: 32px;
Expand All @@ -61,13 +67,15 @@
font-weight: 400;
}
}

.search-container {
@include module-full-width;
background: $white;
padding: 15px;
@media only screen and (min-width: 1070px) {
padding: 30px 40px 30px 41px;
}

form {
@include module-full-width;
@include community-form-placeholder;
Expand All @@ -80,6 +88,7 @@
border-radius: 7px;
}
}

input[type="text"] {
@include module-full-width;
@include font-with-weight('Sofia Pro', 300);
Expand All @@ -91,6 +100,7 @@
font-size: 22px;
}
}

.search-ico {
display: inline-block;
height: 15px;
Expand All @@ -112,6 +122,7 @@
}
}
}

h2 {
@include font-with-weight('Sofia Pro', 500);
font-size: 20px;
Expand All @@ -120,6 +131,7 @@
padding-top: 31px;
padding-bottom: 17px;
position: relative;

small {
@include font-with-weight;
font-size: 16px;
Expand All @@ -128,9 +140,11 @@
color: $gray-dark-alt;
padding-top: 8px;
}

span {
color: $member-search-highlight;
}

@media only screen and (min-width: 1070px) {
font-size: 28px;
padding-top: 92px;
Expand All @@ -141,12 +155,14 @@
}
}
}

.default-show-container > div,
.search-result-container {
margin-top: 6px;
background: $white;
position: relative;
}

%members-gray-wrapper {
background: $gray-lightest;
border: {
Expand Down
9 changes: 7 additions & 2 deletions assets/css/community/statistics.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '../partials/combined';
@import 'community';
@import 'tc-includes';

.statistics-container {
margin-top: 15px;

Expand All @@ -10,10 +10,12 @@
@media only screen and (min-width: 1030px) {
margin: 60px 67px;
}

%statistics-panel {
background: $white;
padding: 10px;
margin-bottom: 6px;

h2 {
@include font-with-weight('Sofia Pro', 700);
font-size: 18px;
Expand All @@ -26,18 +28,21 @@
padding-top: 82px;
padding-bottom: 82px;
}

small {
font-size: 16px;
display: block;
text-transform: capitalize;
color: $gray-dark-alt;
padding-top: 8px;
}

span {
color: $member-search-highlight;
}
}
}

.winner-tile {
@include font-with-weight;
display: flex;
Expand Down
7 changes: 3 additions & 4 deletions assets/css/directives/challenge-links.directive.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

.challenge-links.tile-view {
display: flex;
Expand Down Expand Up @@ -57,7 +56,7 @@
@include background-image-size(20px, 17px);
background-image: url(/images/ico-posts.svg);
}
}
}

.challenge-links.list-view {
display: flex;
Expand Down Expand Up @@ -115,4 +114,4 @@
@include background-image-size(30px, 27px);
background-image: url(/images/ico-posts.svg);
}
}
}
7 changes: 3 additions & 4 deletions assets/css/directives/challenge-tile.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

// Default Challenge Tile Stylings
challenge-tile .challenge.tile-view {
Expand Down Expand Up @@ -232,7 +231,7 @@ challenge-tile .challenge.tile-view {
&.DATA_SCIENCE {
flex: 2;
justify-content: center;
}
}

.marathon-score {
margin-bottom: 70px;
Expand Down Expand Up @@ -331,7 +330,7 @@ challenge-tile .challenge.list-view {
color: $gray-darkest;
@include ellipsis;


span:first-child {
color: $accent-gray;
white-space: nowrap;
Expand Down
3 changes: 1 addition & 2 deletions assets/css/directives/design-challenge-user-place.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

// styling for tile view
design-challenge-user-place {
Expand Down
7 changes: 3 additions & 4 deletions assets/css/directives/dev-challenge-user-place.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

// styling for tile view
dev-challenge-user-place {
Expand Down Expand Up @@ -48,7 +47,7 @@ dev-challenge-user-place {
}
}
}

}

// styling for list view
Expand Down Expand Up @@ -122,4 +121,4 @@ dev-challenge-user-place {
}
}
}
}
}
3 changes: 1 addition & 2 deletions assets/css/directives/distribution-graph.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

.distribution-graph-directive {
display: flex;
Expand Down
5 changes: 2 additions & 3 deletions assets/css/directives/empty-state-placeholder.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

.empty-state-placeholder {
display: flex;
Expand Down Expand Up @@ -125,4 +124,4 @@
}
}
}
}
}
3 changes: 1 addition & 2 deletions assets/css/directives/external-account.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'topcoder-includes';
@import '../partials/combined';
@import 'tc-includes';

.ext-tile {
display: flex;
Expand Down
Loading