Merge pull request #6594 from topcoder-platform/develop

Release v1.17.11
topcoder-platform · Jul 26, 2022 · 0a198e3 · 0a198e3
2 parents c771bcd + 207111f
commit 0a198e3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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

diff --git a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
@@ -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]}

diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -666,8 +666,9 @@ export default function FiltersPanel({
             </React.Fragment>
           )
         }
-        {isTcoChallengesVisible
-            && (
+        {
+          isTcoChallengesVisible
+          && (
             <React.Fragment>
               <div styleName="filter-row tco-challenges-filter">
                 <span
@@ -678,7 +679,7 @@ export default function FiltersPanel({
                 >
                   <SwitchWithLabel
                     enabled={tcoToggle}
-                    labelAfter="TCO Eligible Challenges"
+                    labelAfter="Only Show TCO Eligible Challenges"
                     onSwitch={onSwitchTcoChallenge}
                   />
                 </span>
@@ -695,9 +696,8 @@ export default function FiltersPanel({
                 </div>
               </div>
             </React.Fragment>
-            )
+          )
         }
-
       </div>
 
       {

diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
@@ -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;
@@ -133,8 +131,6 @@ hr.hr {
       }
 
       @include sm-to-md {
-        width: 50%;
-
         > div {
           display: inline-flex;
           flex-direction: row-reverse;
@@ -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;
-      }
     }
   }
 }