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

Show grid above 768px for all challenge cards #226

Merged
merged 1 commit into from
Sep 26, 2015
+130 −77
Merged

Show grid above 768px for all challenge cards #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion app/index.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ html
script(src='../bower_components/angucomplete-alt/angucomplete-alt.js')
script(src='../bower_components/angular-cookies/angular-cookies.js')
script(src='../bower_components/angular-dropdowns/dist/angular-dropdowns.js')
script(src='../bower_components/angular-filter/dist/angular-filter.js')
script(src='../bower_components/angular-filter/dist/angular-filter.min.js')
script(src='../bower_components/angular-img-fallback/angular.dcb-img-fallback.js')
script(src='../bower_components/intro.js/intro.js')
script(src='../bower_components/angular-intro.js/src/angular-intro.js')
Expand Down
30 changes: 15 additions & 15 deletions app/topcoder.constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
angular.module("CONSTANTS", [])

.constant("CONSTANTS", {
"API_URL": "https://api.topcoder-qa.com/v3.0.0-BETA",
"API_URL_V2": "https://api.topcoder-qa.com/v2",
"API_URL": "https://api.topcoder-dev.com/v3",
"API_URL_V2": "https://api.topcoder-dev.com/v2",
"ASSET_PREFIX": "",
"auth0Callback": "https://api.topcoder-qa.com/pub/callback.html",
"auth0Domain": "topcoder-qa.auth0.com",
"BLOG_LOCATION": "https://www.topcoder-qa.com/feed/?post_type=blog",
"clientId": "EVOgWZlCtIFlbehkq02treuRRoJk12UR",
"COMMUNITY_URL": "//community.topcoder-qa.com",
"domain": "topcoder-qa.com",
"ENVIRONMENT": "qa-beta",
"FORUMS_APP_URL": "//apps.topcoder-qa.com/forums",
"HELP_APP_URL": "help.topcoder-qa.com",
"MAIN_URL": "https://www.topcoder-qa.com",
"ARENA_URL": "//arena.topcoder-qa.com",
"auth0Callback": "https://api.topcoder-dev.com/pub/callback.html",
"auth0Domain": "topcoder-dev.auth0.com",
"BLOG_LOCATION": "https://www.topcoder-dev.com/feed/?post_type=blog",
"clientId": "JFDo7HMkf0q2CkVFHojy3zHWafziprhT",
"COMMUNITY_URL": "//community.topcoder-dev.com",
"domain": "topcoder-dev.com",
"ENVIRONMENT": "development",
"FORUMS_APP_URL": "//apps.topcoder-dev.com/forums",
"HELP_APP_URL": "help.topcoder-dev.com",
"MAIN_URL": "https://www.topcoder-dev.com",
"ARENA_URL": "//arena.topcoder-dev.com",
"NEW_CHALLENGES_URL": "https://www.topcoder.com/challenges/develop/upcoming/",
"NEW_RELIC_APPLICATION_ID": "",
"PHOTO_LINK_LOCATION": "https://community.topcoder-qa.com",
"PHOTO_LINK_LOCATION": "https://community.topcoder-dev.com",
"submissionDownloadPath": "/review/actions/DownloadContestSubmission?uid=",
"SWIFT_PROGRAM_ID": 3445,
"SWIFT_PROGRAM_URL": "apple.topcoder-qa.com",
"SWIFT_PROGRAM_URL": "apple.topcoder-dev.com",
"UPCOMING_SRMS_URL": "https://www.topcoder.com/challenges/data/upcoming/",
"EVENT_USER_LOGGED_IN": "user_logged_in",
"EVENT_USER_LOGGED_OUT": "user_logged_out",
Expand Down
64 changes: 37 additions & 27 deletions assets/css/my-dashboard/my-challenges.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,48 +102,58 @@
}

.hasChallenges {
display: flex;
justify-content: center;
padding-top: 20px;
padding: 15px;
border-top: 1px solid #F0F0F0;
border-bottom: 1px solid #F0F0F0;
background-color: #FCFCFC;

.challenges {
width: 100%;
@include horizontal-scroll;
@media only screen and (min-width: 1125px) {
@media only screen and (min-width: 768px) {
display: flex;
flex-flow: row wrap;
width: 1125px;
margin: 0 auto;
overflow: visible;
white-space: normal;
width: 555px;
}
@media only screen and (min-width: 870px) {
width: 840px;
}
@media only screen and (min-width: 1155px) {
width: 1125px;
}
}

challenge-tile {
challenge-tile {
display: inline;
margin-bottom: 15px;
@media only screen and (max-width: 767px) {
display: inline-block;
@media only screen and (min-width: 1125px) {
display: block;
}

&.tile-view {
margin-left: 15px;
margin-bottom: 15px;
@media only screen and (min-width: 1125px) {
&:nth-child(4n + 1) {
margin-left: 0;
}
}
margin-left: 15px;

&:last-child {
margin-right: 15px;
@media only screen and (min-width: 1125px) {
margin-right: 0;
}
}
&:first-child {
margin-left: 0;
}
}
@media only screen and (min-width: 768px) {
&:nth-child(2n + 1) {
margin-right: 15px;
}
}
@media only screen and (min-width: 870px) {
margin-right: 15px;

&.list-view {
width: 100%;
&:nth-child(3n) {
margin-right: 0;
}
}
@media only screen and (min-width: 1155px) {
&:nth-child(3n) {
margin-right: 15px;
}
&:nth-child(4n) {
margin-right: 0;
}
}
}
Expand Down
57 changes: 38 additions & 19 deletions assets/css/my-dashboard/programs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,37 +111,38 @@
}

.registered {
display: flex;
justify-content: center;
padding-top: 20px;
padding-bottom: 15px;
padding: 15px;
border-top: 1px solid #F0F0F0;
border-bottom: 1px solid #F0F0F0;
background-color: #FCFCFC;

.badge-and-challenges {
width: 100%;
@include horizontal-scroll;
@media only screen and (min-width: 1125px) {
@media only screen and (min-width: 768px) {
display: flex;
flex-flow: row wrap;
width: 1125px;
margin: 0 auto;
overflow: visible;
white-space: normal;
width: 555px;
}
@media only screen and (min-width: 870px) {
width: 840px;
}
@media only screen and (min-width: 1155px) {
width: 1125px;
}
}

.registered-badge {
display: inline-block;
display: inline;
height: 370px;
width: 270px;
margin-left: 15px;
margin-right: 15px;
border: 1px solid #DCDCDC;
border-radius: 4px;
background-color: $white;
@media only screen and (min-width: 1125px) {
display: block;
margin-left: 0;
@media only screen and (max-width: 767px) {
display: inline-block;
}

.flex-wrapper {
Expand Down Expand Up @@ -172,13 +173,31 @@
}

ios-card {
display: inline-block;
margin-right: 15px;
@media only screen and (min-width: 1125px) {
display: block;
display: inline;
margin-bottom: 15px;
@media only screen and (max-width: 767px) {
display: inline-block;
margin-left: 15px;

&:first-child {
margin-left: 0;
}
}
@media only screen and (min-width: 768px) {
&:nth-child(2n) {
margin-left: 15px;
}
}
@media only screen and (min-width: 870px) {
margin-left: 15px;

&:last-child {
margin-right: 0;
&:nth-child(4n) {
margin-left: 0;
}
}
@media only screen and (min-width: 1155px) {
&:nth-child(4n) {
margin-left: 15px;
}
}
}
Expand Down
54 changes: 39 additions & 15 deletions assets/css/my-dashboard/srms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,47 +18,71 @@
}

section {
display: flex;
justify-content: center;
padding: 20px 0;
padding: 15px;
border-top: 1px solid #F0F0F0;
border-bottom: 1px solid #F0F0F0;
background-color: #FCFCFC;

.srm-tiles {
width: 100%;
@include horizontal-scroll;
@media only screen and (min-width: 1125px) {
@media only screen and (min-width: 768px) {
display: flex;
flex-flow: row wrap;
width: 1125px;
margin: 0 auto;
overflow: visible;
white-space: normal;
width: 555px;
}
@media only screen and (min-width: 870px) {
width: 840px;
}
@media only screen and (min-width: 1155px) {
width: 1125px;
}

srm-tile {
display: inline-block;
margin-left: 15px;
display: inline;
margin-bottom: 15px;
@media only screen and (min-width: 1125px) {
display: block;
@media only screen and (max-width: 767px) {
display: inline-block;
margin-left: 15px;

&:first-child {
margin-left: 0;
}
}
@media only screen and (min-width: 768px) {
&:nth-child(2n + 1) {
margin-right: 15px;
}
}
@media only screen and (min-width: 870px) {
margin-right: 15px;

&:nth-child(3n) {
margin-right: 0;
}
}
@media only screen and (min-width: 1155px) {
&:nth-child(3n) {
margin-right: 15px;
}
&:nth-child(4n) {
margin-right: 0;
}
}
}

.srm-links-card {
display: inline-block;
display: inline;
width: 270px;
height: 319px;
margin-right: 15px;
margin-bottom: 15px;
padding: 0 21px;
border: 1px solid #DCDCDC;
border-radius: 4px;
@media only screen and (min-width: 1125px) {
margin-right: 0;
display: block;
@media only screen and (max-width: 767px) {
display: inline-block;
margin-left: 15px;
}
}
Expand Down