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

Commit d372058

Browse files
nlitwinnlitwin
committed
Merge pull request #226 from appirio-tech/fix-horizontal-scrolling
Show grid above 768px for all challenge cards
2 parents 2dd19f5 + d1adde7 commit d372058

File tree

5 files changed

+130
-77
lines changed

5 files changed

+130
-77
lines changed

‎app/index.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ html
9494
script(src='../bower_components/angucomplete-alt/angucomplete-alt.js')
9595
script(src='../bower_components/angular-cookies/angular-cookies.js')
9696
script(src='../bower_components/angular-dropdowns/dist/angular-dropdowns.js')
97-
script(src='../bower_components/angular-filter/dist/angular-filter.js')
97+
script(src='../bower_components/angular-filter/dist/angular-filter.min.js')
9898
script(src='../bower_components/angular-img-fallback/angular.dcb-img-fallback.js')
9999
script(src='../bower_components/intro.js/intro.js')
100100
script(src='../bower_components/angular-intro.js/src/angular-intro.js')

‎app/topcoder.constants.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
angular.module("CONSTANTS", [])
22

33
.constant("CONSTANTS", {
4-
"API_URL": "https://api.topcoder-qa.com/v3.0.0-BETA",
5-
"API_URL_V2": "https://api.topcoder-qa.com/v2",
4+
"API_URL": "https://api.topcoder-dev.com/v3",
5+
"API_URL_V2": "https://api.topcoder-dev.com/v2",
66
"ASSET_PREFIX": "",
7-
"auth0Callback": "https://api.topcoder-qa.com/pub/callback.html",
8-
"auth0Domain": "topcoder-qa.auth0.com",
9-
"BLOG_LOCATION": "https://www.topcoder-qa.com/feed/?post_type=blog",
10-
"clientId": "EVOgWZlCtIFlbehkq02treuRRoJk12UR",
11-
"COMMUNITY_URL": "//community.topcoder-qa.com",
12-
"domain": "topcoder-qa.com",
13-
"ENVIRONMENT": "qa-beta",
14-
"FORUMS_APP_URL": "//apps.topcoder-qa.com/forums",
15-
"HELP_APP_URL": "help.topcoder-qa.com",
16-
"MAIN_URL": "https://www.topcoder-qa.com",
17-
"ARENA_URL": "//arena.topcoder-qa.com",
7+
"auth0Callback": "https://api.topcoder-dev.com/pub/callback.html",
8+
"auth0Domain": "topcoder-dev.auth0.com",
9+
"BLOG_LOCATION": "https://www.topcoder-dev.com/feed/?post_type=blog",
10+
"clientId": "JFDo7HMkf0q2CkVFHojy3zHWafziprhT",
11+
"COMMUNITY_URL": "//community.topcoder-dev.com",
12+
"domain": "topcoder-dev.com",
13+
"ENVIRONMENT": "development",
14+
"FORUMS_APP_URL": "//apps.topcoder-dev.com/forums",
15+
"HELP_APP_URL": "help.topcoder-dev.com",
16+
"MAIN_URL": "https://www.topcoder-dev.com",
17+
"ARENA_URL": "//arena.topcoder-dev.com",
1818
"NEW_CHALLENGES_URL": "https://www.topcoder.com/challenges/develop/upcoming/",
1919
"NEW_RELIC_APPLICATION_ID": "",
20-
"PHOTO_LINK_LOCATION": "https://community.topcoder-qa.com",
20+
"PHOTO_LINK_LOCATION": "https://community.topcoder-dev.com",
2121
"submissionDownloadPath": "/review/actions/DownloadContestSubmission?uid=",
2222
"SWIFT_PROGRAM_ID": 3445,
23-
"SWIFT_PROGRAM_URL": "apple.topcoder-qa.com",
23+
"SWIFT_PROGRAM_URL": "apple.topcoder-dev.com",
2424
"UPCOMING_SRMS_URL": "https://www.topcoder.com/challenges/data/upcoming/",
2525
"EVENT_USER_LOGGED_IN": "user_logged_in",
2626
"EVENT_USER_LOGGED_OUT": "user_logged_out",

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

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -102,48 +102,58 @@
102102
}
103103

104104
.hasChallenges {
105-
display: flex;
106-
justify-content: center;
107-
padding-top: 20px;
105+
padding: 15px;
108106
border-top: 1px solid #F0F0F0;
109107
border-bottom: 1px solid #F0F0F0;
110108
background-color: #FCFCFC;
111109

112110
.challenges {
113-
width: 100%;
114111
@include horizontal-scroll;
115-
@media only screen and (min-width: 1125px) {
112+
@media only screen and (min-width: 768px) {
116113
display: flex;
117114
flex-flow: row wrap;
118-
width: 1125px;
115+
margin: 0 auto;
119116
overflow: visible;
117+
white-space: normal;
118+
width: 555px;
119+
}
120+
@media only screen and (min-width: 870px) {
121+
width: 840px;
122+
}
123+
@media only screen and (min-width: 1155px) {
124+
width: 1125px;
120125
}
126+
}
121127

122-
challenge-tile {
128+
challenge-tile {
129+
display: inline;
130+
margin-bottom: 15px;
131+
@media only screen and (max-width: 767px) {
123132
display: inline-block;
124-
@media only screen and (min-width: 1125px) {
125-
display: block;
126-
}
127-
128-
&.tile-view {
129-
margin-left: 15px;
130-
margin-bottom: 15px;
131-
@media only screen and (min-width: 1125px) {
132-
&:nth-child(4n + 1) {
133-
margin-left: 0;
134-
}
135-
}
133+
margin-left: 15px;
136134

137-
&:last-child {
138-
margin-right: 15px;
139-
@media only screen and (min-width: 1125px) {
140-
margin-right: 0;
141-
}
142-
}
135+
&:first-child {
136+
margin-left: 0;
137+
}
138+
}
139+
@media only screen and (min-width: 768px) {
140+
&:nth-child(2n + 1) {
141+
margin-right: 15px;
143142
}
143+
}
144+
@media only screen and (min-width: 870px) {
145+
margin-right: 15px;
144146

145-
&.list-view {
146-
width: 100%;
147+
&:nth-child(3n) {
148+
margin-right: 0;
149+
}
150+
}
151+
@media only screen and (min-width: 1155px) {
152+
&:nth-child(3n) {
153+
margin-right: 15px;
154+
}
155+
&:nth-child(4n) {
156+
margin-right: 0;
147157
}
148158
}
149159
}

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

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -111,37 +111,38 @@
111111
}
112112

113113
.registered {
114-
display: flex;
115-
justify-content: center;
116-
padding-top: 20px;
117-
padding-bottom: 15px;
114+
padding: 15px;
118115
border-top: 1px solid #F0F0F0;
119116
border-bottom: 1px solid #F0F0F0;
120117
background-color: #FCFCFC;
121118

122119
.badge-and-challenges {
123-
width: 100%;
124120
@include horizontal-scroll;
125-
@media only screen and (min-width: 1125px) {
121+
@media only screen and (min-width: 768px) {
126122
display: flex;
127123
flex-flow: row wrap;
128-
width: 1125px;
124+
margin: 0 auto;
129125
overflow: visible;
126+
white-space: normal;
127+
width: 555px;
128+
}
129+
@media only screen and (min-width: 870px) {
130+
width: 840px;
131+
}
132+
@media only screen and (min-width: 1155px) {
133+
width: 1125px;
130134
}
131135
}
132136

133137
.registered-badge {
134-
display: inline-block;
138+
display: inline;
135139
height: 370px;
136140
width: 270px;
137-
margin-left: 15px;
138-
margin-right: 15px;
139141
border: 1px solid #DCDCDC;
140142
border-radius: 4px;
141143
background-color: $white;
142-
@media only screen and (min-width: 1125px) {
143-
display: block;
144-
margin-left: 0;
144+
@media only screen and (max-width: 767px) {
145+
display: inline-block;
145146
}
146147

147148
.flex-wrapper {
@@ -172,13 +173,31 @@
172173
}
173174

174175
ios-card {
175-
display: inline-block;
176-
margin-right: 15px;
177-
@media only screen and (min-width: 1125px) {
178-
display: block;
176+
display: inline;
177+
margin-bottom: 15px;
178+
@media only screen and (max-width: 767px) {
179+
display: inline-block;
180+
margin-left: 15px;
181+
182+
&:first-child {
183+
margin-left: 0;
184+
}
185+
}
186+
@media only screen and (min-width: 768px) {
187+
&:nth-child(2n) {
188+
margin-left: 15px;
189+
}
190+
}
191+
@media only screen and (min-width: 870px) {
192+
margin-left: 15px;
179193

180-
&:last-child {
181-
margin-right: 0;
194+
&:nth-child(4n) {
195+
margin-left: 0;
196+
}
197+
}
198+
@media only screen and (min-width: 1155px) {
199+
&:nth-child(4n) {
200+
margin-left: 15px;
182201
}
183202
}
184203
}

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

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,47 +18,71 @@
1818
}
1919

2020
section {
21-
display: flex;
22-
justify-content: center;
23-
padding: 20px 0;
21+
padding: 15px;
2422
border-top: 1px solid #F0F0F0;
2523
border-bottom: 1px solid #F0F0F0;
2624
background-color: #FCFCFC;
2725

2826
.srm-tiles {
29-
width: 100%;
3027
@include horizontal-scroll;
31-
@media only screen and (min-width: 1125px) {
28+
@media only screen and (min-width: 768px) {
3229
display: flex;
3330
flex-flow: row wrap;
34-
width: 1125px;
31+
margin: 0 auto;
3532
overflow: visible;
33+
white-space: normal;
34+
width: 555px;
35+
}
36+
@media only screen and (min-width: 870px) {
37+
width: 840px;
38+
}
39+
@media only screen and (min-width: 1155px) {
40+
width: 1125px;
3641
}
3742

3843
srm-tile {
39-
display: inline-block;
40-
margin-left: 15px;
44+
display: inline;
4145
margin-bottom: 15px;
42-
@media only screen and (min-width: 1125px) {
43-
display: block;
46+
@media only screen and (max-width: 767px) {
47+
display: inline-block;
48+
margin-left: 15px;
49+
4450
&:first-child {
4551
margin-left: 0;
4652
}
4753
}
54+
@media only screen and (min-width: 768px) {
55+
&:nth-child(2n + 1) {
56+
margin-right: 15px;
57+
}
58+
}
59+
@media only screen and (min-width: 870px) {
60+
margin-right: 15px;
61+
62+
&:nth-child(3n) {
63+
margin-right: 0;
64+
}
65+
}
66+
@media only screen and (min-width: 1155px) {
67+
&:nth-child(3n) {
68+
margin-right: 15px;
69+
}
70+
&:nth-child(4n) {
71+
margin-right: 0;
72+
}
73+
}
4874
}
4975

5076
.srm-links-card {
51-
display: inline-block;
77+
display: inline;
5278
width: 270px;
5379
height: 319px;
54-
margin-right: 15px;
5580
margin-bottom: 15px;
5681
padding: 0 21px;
5782
border: 1px solid #DCDCDC;
5883
border-radius: 4px;
59-
@media only screen and (min-width: 1125px) {
60-
margin-right: 0;
61-
display: block;
84+
@media only screen and (max-width: 767px) {
85+
display: inline-block;
6286
margin-left: 15px;
6387
}
6488
}

0 commit comments

Comments
 (0)