Skip to content

Commit e0c494c

Browse files
Merge pull request #5758 from topcoder-platform/develop
Release v1.13.7
2 parents c6802cf + 7b196f2 commit e0c494c

File tree

37 files changed

+201
-215
lines changed

37 files changed

+201
-215
lines changed

.circleci/config.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,7 @@ workflows:
342342
filters:
343343
branches:
344344
only:
345-
- develop
346-
- fix/issue-5739
345+
- gigs-apply-integration
347346
# This is alternate dev env for parallel testing
348347
- "build-test":
349348
context : org-global
@@ -357,14 +356,14 @@ workflows:
357356
filters:
358357
branches:
359358
only:
360-
- referral-api-bug
359+
- free
361360
# This is beta env for production soft releases
362361
- "build-prod-beta":
363362
context : org-global
364363
filters:
365364
branches:
366365
only:
367-
- thrive-vulnerability-1
366+
- free
368367
# This is stage env for production QA releases
369368
- "build-prod-staging":
370369
context : org-global

src/shared/components/ChallengeTile/style.scss

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
display: flex;
2424

2525
.title {
26-
@include sofia-pro-light;
26+
@include roboto-light;
2727

2828
font-size: 18px;
2929
line-height: 23px;
@@ -36,7 +36,7 @@
3636
}
3737

3838
span {
39-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
39+
font-family: "BarlowCondensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
4040
font-weight: 400;
4141
font-size: 11px;
4242
line-height: 15px;
@@ -52,7 +52,7 @@
5252
display: flex;
5353

5454
.title {
55-
@include sofia-pro-light;
55+
@include roboto-light;
5656

5757
font-size: 18px;
5858
line-height: 23px;
@@ -65,7 +65,7 @@
6565
}
6666

6767
span {
68-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
68+
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
6969
font-weight: 400;
7070
font-size: 11px;
7171
line-height: 15px;
@@ -154,7 +154,7 @@
154154
align-items: center;
155155

156156
.place {
157-
@include sofia-pro-regular;
157+
@include roboto-regular;
158158

159159
font-size: 20px;
160160
color: #3d3d3d;
@@ -206,7 +206,7 @@
206206
.num-images {
207207
margin-left: 8px;
208208

209-
@include sofia-pro-regular;
209+
@include roboto-regular;
210210

211211
font-size: 10px;
212212
color: #f6f6f6;
@@ -225,7 +225,7 @@ div .dev-challenge-user-place {
225225
align-items: center;
226226

227227
.place {
228-
@include sofia-pro-light;
228+
@include roboto-light;
229229

230230
font-size: 18px;
231231
line-height: 23px;
@@ -257,14 +257,14 @@ div .dev-challenge-user-place {
257257
margin-top: 28px;
258258
margin-bottom: 5px;
259259

260-
@include sofia-pro-bold;
260+
@include roboto-bold;
261261

262262
font-size: 18px;
263263
color: #3d3d3d;
264264
}
265265

266266
.last-child {
267-
@include sofia-pro-medium;
267+
@include roboto-medium;
268268

269269
font-size: 9px;
270270
color: #a3a3ae;
@@ -287,7 +287,7 @@ div .challenge.tile-view {
287287
a.name,
288288
span.name {
289289
display: block;
290-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
290+
font-family: 'Roboto', "Helvetica Neue", Helvetica, Arial, sans-serif;
291291
font-weight: 500;
292292
font-size: 12px;
293293
line-height: 16px;
@@ -306,7 +306,7 @@ div .challenge.tile-view {
306306
}
307307

308308
p.subtrack-color {
309-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
309+
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
310310
font-weight: 500;
311311
font-size: 10px;
312312
line-height: 14px;
@@ -349,7 +349,7 @@ div .challenge.tile-view {
349349
// }
350350

351351
.title {
352-
@include sofia-pro-light;
352+
@include roboto-light;
353353

354354
font-size: 18px;
355355
line-height: 23px;
@@ -362,7 +362,7 @@ div .challenge.tile-view {
362362
}
363363

364364
span {
365-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
365+
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
366366
font-weight: 400;
367367
font-size: 11px;
368368
line-height: 15px;
@@ -383,7 +383,7 @@ div .challenge.tile-view {
383383

384384
.title {
385385
margin-bottom: 60px;
386-
font-family: 'Sofia Pro', Arial, Helvetica, sans-serif;
386+
font-family: 'BarlowCondensed', Arial, Helvetica, sans-serif;
387387
font-weight: 300;
388388
font-size: 18px;
389389
line-height: 23px;
@@ -393,7 +393,7 @@ div .challenge.tile-view {
393393

394394
span {
395395
margin-top: 20px;
396-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
396+
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
397397
font-weight: 400;
398398
font-size: 11px;
399399
line-height: 15px;
@@ -447,7 +447,7 @@ div .challenge.tile-view {
447447
.challenge-details {
448448
.currentPhase {
449449
margin-bottom: 20px;
450-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
450+
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
451451
font-weight: 300;
452452
font-size: 18px;
453453
line-height: 23px;
@@ -464,7 +464,7 @@ div .challenge.tile-view {
464464
background-image: url(assets/images/ico-calendar.svg);
465465

466466
> p {
467-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
467+
font-family: 'Roboto', "Helvetica Neue", Helvetica, Arial, sans-serif;
468468
font-weight: 700;
469469
}
470470

@@ -501,7 +501,7 @@ div .challenge.tile-view {
501501
.stalled-challenge {
502502
min-height: 83px;
503503
padding: 21px 20px 0 20px;
504-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
504+
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
505505
font-weight: 500;
506506
font-size: 12px;
507507
line-height: 18px;
@@ -545,7 +545,7 @@ div .challenge.tile-view {
545545
border: 1px solid #f0f0f0;
546546
border-radius: 4px;
547547
background-color: $tc-white;
548-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
548+
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
549549
font-weight: 400;
550550
font-size: 12px;
551551
text-transform: uppercase;
@@ -583,7 +583,7 @@ div .challenge.tile-view {
583583
position: relative;
584584

585585
.date-completed {
586-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
586+
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
587587
font-weight: 500;
588588
font-size: 10px;
589589
line-height: 14px;
@@ -643,15 +643,15 @@ div .challenge.tile-view {
643643

644644
.score {
645645
margin-bottom: 5px;
646-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
646+
font-family: 'Roboto', "Helvetica Neue", Helvetica, Arial, sans-serif;
647647
font-weight: 400;
648648
font-size: 32px;
649649
line-height: 38px;
650650
color: #3d3d3d;
651651
}
652652

653653
p:last-child {
654-
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
654+
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
655655
font-weight: 400;
656656
font-size: 12px;
657657
line-height: 14px;
@@ -689,7 +689,7 @@ div .challenge.tile-view {
689689
margin: 30px auto 0;
690690
text-align: center;
691691

692-
@include sofia-pro-regular;
692+
@include roboto-regular;
693693

694694
font-size: 24px;
695695
line-height: 30px;
@@ -702,7 +702,7 @@ div .challenge.tile-view {
702702
margin-top: 30px;
703703

704704
li {
705-
@include sofia-pro-regular;
705+
@include roboto-regular;
706706

707707
font-size: 15px;
708708
line-height: 18px;
@@ -720,7 +720,7 @@ div .challenge.tile-view {
720720
}
721721

722722
ul.divisions {
723-
@include sofia-pro-regular;
723+
@include roboto-regular;
724724

725725
li.division {
726726
border-bottom: 1px solid #f0f0f0;
@@ -844,7 +844,7 @@ div .challenge.tile-view {
844844
.no-challenges {
845845
margin: 30px;
846846

847-
@include sofia-pro-regular;
847+
@include roboto-regular;
848848

849849
font-size: 16px;
850850
color: #a3a3ae;
@@ -877,7 +877,7 @@ div .challenge.tile-view {
877877
h2.detailed {
878878
margin: 30px auto 0;
879879

880-
@include sofia-pro-regular;
880+
@include roboto-regular;
881881

882882
font-size: 24px;
883883
line-height: 30px;
@@ -897,7 +897,7 @@ div .challenge.tile-view {
897897
width: 28%;
898898
margin: 0 15px;
899899

900-
@include sofia-pro-regular;
900+
@include roboto-regular;
901901

902902
font-size: 15px;
903903
line-height: 18px;

src/shared/components/Contentful/SearchBar/SearchBar.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,12 +379,13 @@ export class SearchBarInner extends Component {
379379
* Update suggestion list with new search text
380380
* This function use debounce delay to avoid processing or requesting too much
381381
*
382-
* @param {String} searchText Search text
382+
* @param {String} searchTerm Search text
383383
*/
384-
updateSuggestionListWithNewSearch(searchText) {
384+
updateSuggestionListWithNewSearch(searchTerm) {
385385
const {
386386
selectedFilter,
387387
} = this.state;
388+
const searchText = searchTerm ? encodeURIComponent(searchTerm) : '';
388389

389390
if (searchText) {
390391
const query = {
@@ -499,6 +500,7 @@ export class SearchBarInner extends Component {
499500
<IconSearch className={theme['icon-search']} />
500501
<input
501502
value={inputlVal}
503+
maxLength={115}
502504
ref={this.setSearchFieldRef}
503505
type="text"
504506
placeholder="Search..."
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.handle {
2-
font-family: 'Sofia Pro', Arial, Helvetica, sans-serif;
2+
font-family: 'Roboto', Arial, Helvetica, sans-serif;
33
font-weight: 500;
44
line-height: 1.2;
55
}

src/shared/components/ProfilePage/BadgesModal/Popup/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "~styles/mixins";
22

33
.container {
4-
@include sofia-pro-regular;
4+
@include roboto-regular;
55

66
border-radius: $corner-radius;
77
font-size: 11px;

src/shared/components/ProfilePage/BadgesModal/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "~styles/mixins";
22

33
header.head {
4-
@include sofia-pro-extra-light;
4+
@include roboto-extra-light;
55

66
font-size: 28px;
77
line-height: 34px;

src/shared/components/ProfilePage/ExternalLink/styles.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
margin-bottom: 10px;
2222
border-radius: 4px;
2323

24-
@include sofia-pro-medium;
24+
@include roboto-medium;
2525

2626
&:hover {
2727
cursor: pointer;
@@ -63,7 +63,7 @@
6363
height: 100%;
6464

6565
.handle {
66-
@include sofia-pro-light;
66+
@include roboto-light;
6767

6868
font-size: 18px;
6969
height: 20px;
@@ -75,12 +75,12 @@
7575
font-size: 12px;
7676
line-height: 14px;
7777

78-
@include sofia-pro-medium;
78+
@include roboto-medium;
7979
}
8080

8181
.pending {
8282
p {
83-
@include sofia-pro-regular;
83+
@include roboto-regular;
8484

8585
font-size: 16px;
8686
color: $tc-gray-10;
@@ -114,7 +114,7 @@
114114
}
115115

116116
.link-title {
117-
@include sofia-pro-medium;
117+
@include roboto-medium;
118118

119119
font-size: 12px;
120120
line-height: 20px;
@@ -165,7 +165,7 @@
165165
text-align: center;
166166
padding: 0;
167167

168-
@include sofia-pro-medium;
168+
@include roboto-medium;
169169

170170
i {
171171
color: #7f7f7f;
@@ -223,7 +223,7 @@
223223
margin: 10px 0 10px 0;
224224
width: 90px;
225225

226-
@include sofia-pro-medium;
226+
@include roboto-medium;
227227

228228
.value {
229229
color: $tc-gray-90;

0 commit comments

Comments
 (0)