Skip to content

Release v1.17.11 #6594

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.

Sign up for GitHub

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 4 commits into from
Jul 26, 2022
Merged

Release v1.17.11 #6594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b75dd0
Update toggle name for TCO challenges
jmgasper Jul 21, 2022
749dd01
Fix test
jmgasper Jul 22, 2022
f3f775d
Deploy develop branch to dev environment for validation purposes
jmgasper Jul 22, 2022
207111f
Test fix for TCO Eligible Challenges text
jmgasper Jul 23, 2022
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: 2 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,9 @@ workflows:
filters:
branches:
only:
- develop
- free
- justin-fixes
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
Expand Down
2 changes: 1 addition & 1 deletion __tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ exports[`Matches shallow shapshot 2`] = `
composeAdhocTheme="deeply"
composeContextTheme="softly"
enabled={false}
labelAfter="TCO Eligible Challenges"
labelAfter="Only Show TCO Eligible Challenges"
labelBefore=""
mapThemrProps={[Function]}
onSwitch={[Function]}
Expand Down
10 changes: 5 additions & 5 deletions src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,9 @@ export default function FiltersPanel({
</React.Fragment>
)
}
{isTcoChallengesVisible
&& (
{
isTcoChallengesVisible
&& (
<React.Fragment>
<div styleName="filter-row tco-challenges-filter">
<span
Expand All @@ -678,7 +679,7 @@ export default function FiltersPanel({
>
<SwitchWithLabel
enabled={tcoToggle}
labelAfter="TCO Eligible Challenges"
labelAfter="Only Show TCO Eligible Challenges"
onSwitch={onSwitchTcoChallenge}
/>
</span>
Expand All @@ -695,9 +696,8 @@ export default function FiltersPanel({
</div>
</div>
</React.Fragment>
)
)
}

</div>

{
Expand Down
13 changes: 3 additions & 10 deletions src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,8 @@ hr.hr {

.recommended-select-label,
.tco-select-label {
width: 45%;
margin-bottom: 16px;
display: flex;
white-space: nowrap;
line-height: 30px;
justify-content: flex-start;
margin-top: 15px;
Expand All @@ -133,8 +131,6 @@ hr.hr {
}

@include sm-to-md {
width: 50%;

> div {
display: inline-flex;
flex-direction: row-reverse;
Expand Down Expand Up @@ -623,16 +619,13 @@ hr.hr {

.recommended-challenge-tooltip,
.tco-challenge-tooltip {
position: absolute;
left: 210px;
position: relative;
left: 7px;
top: 18px;
display: flex;
flex-direction: column;
justify-content: center;
height: 100%;

@include xs-to-md {
left: 210px;
}
}
}
}
Expand Down