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

Commit 957cd9e

Browse files
nlitwinnlitwin
committed
Merge pull request #214 from appirio-tech/dev
Merging dev into release
2 parents 199a1c9 + 8a63957 commit 957cd9e

File tree

16 files changed

+203
-48
lines changed

16 files changed

+203
-48
lines changed

‎src/css/challenge-detail-software.css‎

Lines changed: 58 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@
7272
}
7373

7474
#stepBox .middleColumn table h2 {
75-
color: #666666;
76-
font-size: 14px;
77-
font-weight: bold;
75+
margin-top: 11px;
7876
margin-bottom: 27px;
77+
font-size: 14px;
78+
color: #666666;
7979
text-align: center;
8080
}
8181

8282
#stepBox .middleColumn table h3 {
83-
color: #00AEFF;
83+
margin-top: 30px;
8484
font-size: 24px;
85-
font-weight: bold;
85+
color: #00AEFF;
8686
}
8787

8888
.challenge-detail.develop #stepBox .middleColumn table h3 {
@@ -323,9 +323,9 @@ h1.center {
323323

324324
.challenge-detail .tableWrap h2 {
325325
color: #000;
326-
font-size: 14px;
326+
font-size: 16px;
327327
line-height: 22px;
328-
font-weight: bold;
328+
font-weight: 500;
329329
margin-bottom: 10px;
330330
}
331331

@@ -338,10 +338,11 @@ h1.center {
338338
}
339339

340340
.challenge-detail .tableWrap p {
341-
color: #797979;
342-
font-size: 13px;
343-
line-height: 18px;
344341
margin-bottom: 15px;
342+
font-family: 'Merriweather Sans';
343+
font-size: 14px;
344+
line-height: 1.4;
345+
color: #797979;
345346
}
346347

347348
.challenge-detail .tableWrap strong {
@@ -360,15 +361,21 @@ h1.center {
360361
.challenge-detail .tableWrap ul li {
361362
float: none;
362363
display: block;
363-
font-size: 13px;
364-
line-height: 18px;
365-
border: none;
366364
height: auto;
367-
padding-left: 12px;
365+
margin-bottom: 10px;
366+
font-family: 'Merriweather Sans';
367+
font-weight: 300;
368+
font-size: 14px;
369+
line-height: 1.4;
370+
border: none;
368371
background: url("../i/bullet.png") no-repeat 0 7px;
369372
color: #797979;
370373
}
371374

375+
.challenge-detail .tableWrap ul li:last-child {
376+
margin-bottom: 0;
377+
}
378+
372379
/* Issue ID: I-114272 - Add style for ol and li */
373380
.challenge-detail .tableWrap ol {
374381
margin-left: 16px;
@@ -473,10 +480,33 @@ h1.center {
473480
border-bottom: 1px solid #e7e7e7;
474481
}
475482

483+
.challenge-detail .columnSideBar .inner b {
484+
font-size: 14px;
485+
}
486+
487+
.challenge-detail .columnSideBar .inner ul li {
488+
font-family: 'Merriweather Sans';
489+
font-weight: 300;
490+
}
491+
492+
.challenge-detail .columnSideBar .inner ul li:last-child {
493+
margin-bottom: 10px;
494+
}
495+
496+
.challenge-detail .columnSideBar .inner p {
497+
font-family: 'Merriweather Sans';
498+
font-weight: 300;
499+
font-size: 13px;
500+
}
501+
502+
.challenge-detail .columnSideBar .inner p strong {
503+
font-family: 'Sofia Pro';
504+
}
505+
476506
.challenge-detail .columnSideBar h3 {
477507
color: #000 !important;
478-
font-size: 16px;
479-
font-weight: bold;
508+
font-size: 14px;
509+
font-weight: 500;
480510
padding: 11px 10px;
481511
text-transform: uppercase;
482512
}
@@ -494,8 +524,10 @@ h1.center {
494524
}*/
495525

496526
.challenge-detail .columnSideBar p strong {
527+
display: block;
528+
margin-top: 20px;
529+
font-size: 14px;
497530
color: #000;
498-
font-size: 16px;
499531
}
500532

501533
.reviewStyle p {
@@ -747,6 +779,7 @@ h1.center {
747779
display: inline-block;
748780
padding-top: 5px;
749781
width: 77%;
782+
font-weight: normal;
750783
color: #fff;
751784
}
752785

@@ -966,6 +999,12 @@ h1.center {
966999
transition: none;
9671000
}
9681001

1002+
.downloadDocumentList strong {
1003+
font-size: 13px;
1004+
font-weight: 300;
1005+
font-family: 'Merriweather Sans';
1006+
}
1007+
9691008
@media (max-width: 1019px) {
9701009
/* .challenge-detail .pageHeading h1 {
9711010
font-size: 18px;
@@ -2683,7 +2722,7 @@ h1.center {
26832722
color: #000;
26842723
text-transform: uppercase;
26852724
font-family: "Sofia Pro", "Merriweather Sans", Helvetica, Aria, sans-serif;
2686-
margin: 40px 0 10px 0;
2725+
margin: 30px 0 10px 0;
26872726
text-align: left; }
26882727
.cd-wrapper .challenge-detail .columnSideBar h3 {
26892728
color: #3d3d3d;
@@ -2727,7 +2766,7 @@ h1.center {
27272766
.cd-wrapper #mainContent.splitLayout,
27282767
.cd-wrapper #mainContent.layChallenges {
27292768
max-width: 1080px;
2730-
padding: 60px 60px 30px;
2769+
padding: 40px 60px 30px;
27312770
margin: 0 auto;
27322771
background: #fff; }
27332772
.cd-wrapper #mainContent .container {

‎src/css/style-challenges.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,17 @@
3636

3737
.header-container header h1 {
3838
display: inline-block;
39-
vertical-align: middle;
4039
font-size: 36px;
41-
line-height: 1;
40+
line-height: 36px;
4241
overflow: hidden;
4342
text-transform: uppercase;
4443
}
4544

4645
.header-container header span {
4746
display: inline-block;
48-
vertical-align: middle;
49-
padding: 0;
47+
margin-bottom: 9px;
5048
margin-left: 10px;
49+
padding: 0;
5150
}
5251

5352
body, #wrapper {
@@ -1425,6 +1424,7 @@ span.subscribeTopWrapper {
14251424
span.subscribeTopWrapper .feedBtn {
14261425
float: none;
14271426
margin-top: 0;
1427+
line-height: 1;
14281428
}
14291429

14301430
.contestGrid .gdUpcoming > p{

‎src/css/style.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,7 @@
801801
padding: 10px 0 0 55px;
802802
}
803803
.layChallenges .challengeType ul > li{
804+
padding-bottom: 1px;
804805
float: left;
805806
border-left: 1px solid #D0D0D1;
806807
height: 18px;

‎src/js/app/challenge-details/index.html‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,47 +43,53 @@
4343

4444
<tr>
4545
<td ng-if="!CD.isDesign && CD.challenge.challengeType != 'Code'" class="fifty">
46-
<h2>1st PLACE</h2>
47-
4846
<h3>
4947
<small>$</small><span ng-bind="CD.challenge.prize ? (CD.challenge.prize[0] ? CD.challenge.prize[0] : '') : ''"></span>
5048
</h3>
49+
50+
<h2>1st PLACE</h2>
5151
</td>
5252
<td ng-if="!CD.isDesign && CD.challenge.challengeType != 'Code'" class="fifty">
53-
<h2>2nd PLACE</h2>
5453
<h3>
5554
<small>$</small><span ng-bind="CD.challenge.prize ? (CD.challenge.prize[1] ? CD.challenge.prize[1] : '0') : ''"></span>
5655
</h3>
56+
57+
<h2>2nd PLACE</h2>
5758
</td>
5859
<td ng-if="(designOrCode = CD.isDesign || CD.challenge.challengeType == 'Code')" class="twenty {{!(CD.challenge.prize && CD.challenge.prize[0]) ? 'noPrize' : ''}}">
59-
<h2>1st PLACE</h2>
60-
6160
<h3>
62-
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[0]) || 0"></span></h3>
61+
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[0]) || 0"></span>
62+
</h3>
63+
64+
<h2>1st PLACE</h2>
6365
</td>
6466
<td ng-if="designOrCode" class="twenty {{!(CD.challenge.prize && CD.challenge.prize[1]) ? 'noPrize' : ''}}">
65-
<h2>2nd PLACE</h2>
66-
6767
<h3>
68-
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[1]) || 0"></span></h3>
68+
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[1]) || 0"></span>
69+
</h3>
70+
71+
<h2>2nd PLACE</h2>
6972
</td>
7073
<td ng-if="designOrCode" class="twenty {{!(CD.challenge.prize && CD.challenge.prize[2]) ? 'noPrize' : ''}}">
71-
<h2>3rd PLACE</h2>
72-
7374
<h3>
74-
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[2]) || 0"></span></h3>
75+
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[2]) || 0"></span>
76+
</h3>
77+
78+
<h2>3rd PLACE</h2>
7579
</td>
7680
<td ng-if="designOrCode" class="twenty {{!(CD.challenge.prize && CD.challenge.prize[3]) ? 'noPrize' : ''}}">
77-
<h2>4th PLACE</h2>
78-
7981
<h3>
80-
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[3]) || 0"></span></h3>
82+
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[3]) || 0"></span>
83+
</h3>
84+
85+
<h2>4th PLACE</h2>
8186
</td>
8287
<td ng-if="designOrCode" class="twenty {{!(CD.challenge.prize && CD.challenge.prize[4]) ? 'noPrize' : ''}}">
83-
<h2>5th PLACE</h2>
84-
8588
<h3>
86-
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[4]) || 0"></span></h3>
89+
<small>$</small><span ng-bind="(CD.challenge.prize && CD.challenge.prize[4]) || 0"></span>
90+
</h3>
91+
92+
<h2>5th PLACE</h2>
8793
</td>
8894
<td ng-if="designOrCode && (CD.challenge.prize && CD.challenge.prize.length > 5)" class="morePayments active closed" rowspan="2">
8995
</td>
@@ -423,7 +429,7 @@ <h3>Final Submission Guidelines</h3>
423429
<article id="payments">
424430
<h2>Payments</h2>
425431

426-
<p>TopCoder will compensate members in accordance with the payment structure of this challenge.
432+
<p>Topcoder will compensate members in accordance with the payment structure of this challenge.
427433
Initial payment for the winning member will be distributed in two installments. The first payment
428434
will be made at the closure of the approval phase. The second payment will be made at the
429435
completion of the support period.</p>
@@ -562,7 +568,7 @@ <h2>WINNER SELECTION</h2>
562568
<article id="payments">
563569
<h2>PAYMENTS</h2>
564570

565-
<p>TopCoder will compensate members in accordance with the payment structure of this challenge.
571+
<p>Topcoder will compensate members in accordance with the payment structure of this challenge.
566572
Initial payment for the winning member will be distributed in two installments. The first payment
567573
will be made at the closure of the approval phase. The second payment will be made at the
568574
completion of the support period.</p>
@@ -763,11 +769,11 @@ <h3>How to Format Your Submission:</h3>
763769
<a href="/home/studio/the-process/how-to-submit-to-a-contest/">Read this FAQs</a>.</p>
764770

765771
<!-- Bugfix I-111397: removed empty link tags surrounding text -->
766-
<p><strong>Fonts:</strong><br> All fonts within your design must be declared when you submit. DO NOT include any font files in your submission or source files.
772+
<p><strong>Fonts:</strong> All fonts within your design must be declared when you submit. DO NOT include any font files in your submission or source files.
767773
<a href="/home/studio/the-process/font-policy/" style="white-space:nowrap;">Read about the font policy here</a>.
768774
</p>
769775

770-
<p><strong>Screening:</strong><br>All submissions are screened for eligibility before the challenge holder picks
776+
<p><strong>Screening:</strong> All submissions are screened for eligibility before the challenge holder picks
771777
winners. Don't let your hard work go to waste.<br> <a
772778
href="@@community/studio/the-process/screening/">Learn more about how to pass screening
773779
here</a>.

‎src/js/app/challenges/jsx/build/challenge-grid-view.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
React.createElement("div", {className: "contest "+ trackTag +" trackSD type-" + challenge.challengeCommunity, key: challenge.challengeId},
116116
React.createElement("div", {className: "cgCh"},
117117
React.createElement("a", {href: challenge.challengeCommunity != 'data' ? "/challenge-details/" +challenge.challengeId+"/?type="+challenge.challengeCommunity : tcconfig.communityURL + '/tc?module=MatchDetails&rd=' + challenge.roundId, className: "contestName"},
118-
React.createElement("img", {alt: "", className: "allContestIco", src: (scope.contest.contestType == 'data' && challenge.challengeCommunity == 'develop') ? images + 'ico-track-data.svg' : images + 'ico-track-' + challenge.challengeCommunity + '.svg'}),
118+
React.createElement("img", {alt: "", className: "allContestIco", src: (scope.contest.contestType == 'data' && challenge.challengeCommunity == 'develop') ? images + 'banner-data.svg' : images + 'banner-' + challenge.challengeCommunity + '.svg'}),
119119
React.createElement("span", {className: "gridChallengName"}, challenge.challengeName),
120120
React.createElement(Qtip, {text: challenge.challengeType, title: "Challenge Type", community: challenge.challengeCommunity},
121121
React.createElement("span", {className: "track-symbol"}, track.toUpperCase())

‎wp/wp-content/themes/tcs-responsive/i/banner-copilot.svg‎

Lines changed: 22 additions & 0 deletions
Loading

‎wp/wp-content/themes/tcs-responsive/i/banner-copilot@2x.png‎

3.17 KB
Loading

‎wp/wp-content/themes/tcs-responsive/i/banner-cp.svg‎

Lines changed: 20 additions & 0 deletions
Loading

‎wp/wp-content/themes/tcs-responsive/i/banner-cp@2x.png‎

1.68 KB
Loading

‎wp/wp-content/themes/tcs-responsive/i/banner-data.svg‎

Lines changed: 26 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)