Skip to content

Release v1.13.7 #5758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 28, 2021
7 changes: 3 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,7 @@ workflows:
filters:
branches:
only:
- develop
- fix/issue-5739
- gigs-apply-integration
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
Expand All @@ -357,14 +356,14 @@ workflows:
filters:
branches:
only:
- referral-api-bug
- free
# This is beta env for production soft releases
- "build-prod-beta":
context : org-global
filters:
branches:
only:
- thrive-vulnerability-1
- free
# This is stage env for production QA releases
- "build-prod-staging":
context : org-global
Expand Down
56 changes: 28 additions & 28 deletions src/shared/components/ChallengeTile/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
display: flex;

.title {
@include sofia-pro-light;
@include roboto-light;

font-size: 18px;
line-height: 23px;
Expand All @@ -36,7 +36,7 @@
}

span {
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "BarlowCondensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
font-size: 11px;
line-height: 15px;
Expand All @@ -52,7 +52,7 @@
display: flex;

.title {
@include sofia-pro-light;
@include roboto-light;

font-size: 18px;
line-height: 23px;
Expand All @@ -65,7 +65,7 @@
}

span {
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
font-size: 11px;
line-height: 15px;
Expand Down Expand Up @@ -154,7 +154,7 @@
align-items: center;

.place {
@include sofia-pro-regular;
@include roboto-regular;

font-size: 20px;
color: #3d3d3d;
Expand Down Expand Up @@ -206,7 +206,7 @@
.num-images {
margin-left: 8px;

@include sofia-pro-regular;
@include roboto-regular;

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

.place {
@include sofia-pro-light;
@include roboto-light;

font-size: 18px;
line-height: 23px;
Expand Down Expand Up @@ -257,14 +257,14 @@ div .dev-challenge-user-place {
margin-top: 28px;
margin-bottom: 5px;

@include sofia-pro-bold;
@include roboto-bold;

font-size: 18px;
color: #3d3d3d;
}

.last-child {
@include sofia-pro-medium;
@include roboto-medium;

font-size: 9px;
color: #a3a3ae;
Expand All @@ -287,7 +287,7 @@ div .challenge.tile-view {
a.name,
span.name {
display: block;
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: 'Roboto', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 500;
font-size: 12px;
line-height: 16px;
Expand All @@ -306,7 +306,7 @@ div .challenge.tile-view {
}

p.subtrack-color {
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 500;
font-size: 10px;
line-height: 14px;
Expand Down Expand Up @@ -349,7 +349,7 @@ div .challenge.tile-view {
// }

.title {
@include sofia-pro-light;
@include roboto-light;

font-size: 18px;
line-height: 23px;
Expand All @@ -362,7 +362,7 @@ div .challenge.tile-view {
}

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

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

span {
margin-top: 20px;
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
font-size: 11px;
line-height: 15px;
Expand Down Expand Up @@ -447,7 +447,7 @@ div .challenge.tile-view {
.challenge-details {
.currentPhase {
margin-bottom: 20px;
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 300;
font-size: 18px;
line-height: 23px;
Expand All @@ -464,7 +464,7 @@ div .challenge.tile-view {
background-image: url(assets/images/ico-calendar.svg);

> p {
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: 'Roboto', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 700;
}

Expand Down Expand Up @@ -501,7 +501,7 @@ div .challenge.tile-view {
.stalled-challenge {
min-height: 83px;
padding: 21px 20px 0 20px;
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 500;
font-size: 12px;
line-height: 18px;
Expand Down Expand Up @@ -545,7 +545,7 @@ div .challenge.tile-view {
border: 1px solid #f0f0f0;
border-radius: 4px;
background-color: $tc-white;
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: 'BarlowCondensed', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
font-size: 12px;
text-transform: uppercase;
Expand Down Expand Up @@ -583,7 +583,7 @@ div .challenge.tile-view {
position: relative;

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

.score {
margin-bottom: 5px;
font-family: 'Sofia Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: 'Roboto', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
font-size: 32px;
line-height: 38px;
color: #3d3d3d;
}

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

@include sofia-pro-regular;
@include roboto-regular;

font-size: 24px;
line-height: 30px;
Expand All @@ -702,7 +702,7 @@ div .challenge.tile-view {
margin-top: 30px;

li {
@include sofia-pro-regular;
@include roboto-regular;

font-size: 15px;
line-height: 18px;
Expand All @@ -720,7 +720,7 @@ div .challenge.tile-view {
}

ul.divisions {
@include sofia-pro-regular;
@include roboto-regular;

li.division {
border-bottom: 1px solid #f0f0f0;
Expand Down Expand Up @@ -844,7 +844,7 @@ div .challenge.tile-view {
.no-challenges {
margin: 30px;

@include sofia-pro-regular;
@include roboto-regular;

font-size: 16px;
color: #a3a3ae;
Expand Down Expand Up @@ -877,7 +877,7 @@ div .challenge.tile-view {
h2.detailed {
margin: 30px auto 0;

@include sofia-pro-regular;
@include roboto-regular;

font-size: 24px;
line-height: 30px;
Expand All @@ -897,7 +897,7 @@ div .challenge.tile-view {
width: 28%;
margin: 0 15px;

@include sofia-pro-regular;
@include roboto-regular;

font-size: 15px;
line-height: 18px;
Expand Down
6 changes: 4 additions & 2 deletions src/shared/components/Contentful/SearchBar/SearchBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,13 @@ export class SearchBarInner extends Component {
* Update suggestion list with new search text
* This function use debounce delay to avoid processing or requesting too much
*
* @param {String} searchText Search text
* @param {String} searchTerm Search text
*/
updateSuggestionListWithNewSearch(searchText) {
updateSuggestionListWithNewSearch(searchTerm) {
const {
selectedFilter,
} = this.state;
const searchText = searchTerm ? encodeURIComponent(searchTerm) : '';

if (searchText) {
const query = {
Expand Down Expand Up @@ -499,6 +500,7 @@ export class SearchBarInner extends Component {
<IconSearch className={theme['icon-search']} />
<input
value={inputlVal}
maxLength={115}
ref={this.setSearchFieldRef}
type="text"
placeholder="Search..."
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Handle/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.handle {
font-family: 'Sofia Pro', Arial, Helvetica, sans-serif;
font-family: 'Roboto', Arial, Helvetica, sans-serif;
font-weight: 500;
line-height: 1.2;
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "~styles/mixins";

.container {
@include sofia-pro-regular;
@include roboto-regular;

border-radius: $corner-radius;
font-size: 11px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "~styles/mixins";

header.head {
@include sofia-pro-extra-light;
@include roboto-extra-light;

font-size: 28px;
line-height: 34px;
Expand Down
14 changes: 7 additions & 7 deletions src/shared/components/ProfilePage/ExternalLink/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
margin-bottom: 10px;
border-radius: 4px;

@include sofia-pro-medium;
@include roboto-medium;

&:hover {
cursor: pointer;
Expand Down Expand Up @@ -63,7 +63,7 @@
height: 100%;

.handle {
@include sofia-pro-light;
@include roboto-light;

font-size: 18px;
height: 20px;
Expand All @@ -75,12 +75,12 @@
font-size: 12px;
line-height: 14px;

@include sofia-pro-medium;
@include roboto-medium;
}

.pending {
p {
@include sofia-pro-regular;
@include roboto-regular;

font-size: 16px;
color: $tc-gray-10;
Expand Down Expand Up @@ -114,7 +114,7 @@
}

.link-title {
@include sofia-pro-medium;
@include roboto-medium;

font-size: 12px;
line-height: 20px;
Expand Down Expand Up @@ -165,7 +165,7 @@
text-align: center;
padding: 0;

@include sofia-pro-medium;
@include roboto-medium;

i {
color: #7f7f7f;
Expand Down Expand Up @@ -223,7 +223,7 @@
margin: 10px 0 10px 0;
width: 90px;

@include sofia-pro-medium;
@include roboto-medium;

.value {
color: $tc-gray-90;
Expand Down
Loading