Merge pull request #6374 from topcoder-platform/develop

Release v1.17.2
topcoder-platform · Jun 3, 2022 · ed864e3 · ed864e3
2 parents 352195e + 1764e47
commit ed864e3
Show file tree

Hide file tree

Showing 28 changed files with 670 additions and 334 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -371,6 +371,7 @@ workflows:
             branches:
               only:
                 - footer-update
+                - reskin
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global

diff --git a/src/shared/components/SubmissionManagement/Icons/IconZoom.svg b/src/shared/components/SubmissionManagement/Icons/IconZoom.svg
diff --git a/src/shared/components/Tooltip/style.scss b/src/shared/components/Tooltip/style.scss
@@ -13,6 +13,12 @@
     padding: 0;
   }
 
+  .toolTipPadding {
+    .rc-tooltip-inner {
+      padding: 8px 10px;
+    }
+  }
+
   .rc-tooltip-arrow {
     background: url(assets/images/tooltip-arrow.svg);
     width: 30px;

diff --git a/src/shared/components/TrackIcon/style.scss b/src/shared/components/TrackIcon/style.scss
@@ -83,8 +83,8 @@ $track-code-turquose: #0ab88a;
 
     &.qa,
     &.quality-assurance {
-      color: $tc-purple-120;
-      background: $tc-purple-20;
+      color: #0ab88a;
+      background: #c1f5e7;
     }
 
     &.data_science,

diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
@@ -27,7 +27,7 @@ import { COMPETITION_TRACKS } from 'utils/tc';
 import VerifiedTag from 'components/challenge-listing/VerifiedTag';
 import MatchScore from 'components/challenge-listing/ChallengeCard/MatchScore';
 import { calculateScore } from '../../../utils/challenge-listing/helper';
-import './style.scss';
+import style from './style.scss';
 
 export default function ChallengeTags(props) {
   const {
@@ -97,6 +97,7 @@ export default function ChallengeTags(props) {
           <EventTag
             to={`https://${event}.topcoder.com`}
             key={event}
+            theme={track === COMPETITION_TRACKS.QA ? { button: style.qaTrackEventTag } : undefined}
           >
             {event}
           </EventTag>

diff --git a/src/shared/components/challenge-detail/Header/DeadlinesPanel/index.jsx b/src/shared/components/challenge-detail/Header/DeadlinesPanel/index.jsx
@@ -17,7 +17,7 @@ export default function DeadlinesPanel({ deadlines }) {
   const started = moment(start).isBefore();
 
   return (
-    <div styleName="panel" tabIndex="0" role="tabpanel">
+    <div styleName={`panel ${deadlines.length < 5 ? 'left' : ''}`} tabIndex="0" role="tabpanel">
       <p styleName="timezone">
         Timezone:
         {moment.tz.guess()}

diff --git a/src/shared/components/challenge-detail/Header/DeadlinesPanel/style.scss b/src/shared/components/challenge-detail/Header/DeadlinesPanel/style.scss
@@ -5,7 +5,7 @@
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  padding: 30px 150px 15px 0;
+  padding: 30px 0 15px 0;
   position: relative;
 
   @include xs-to-md {
@@ -14,6 +14,10 @@
     padding-right: 16px;
     padding-left: 16px;
   }
+
+  &.left {
+    justify-content: flex-start;
+  }
 }
 
 .timezone {

diff --git a/src/shared/components/challenge-detail/Header/style.scss b/src/shared/components/challenge-detail/Header/style.scss
@@ -586,3 +586,19 @@
   margin-right: -2px;
   padding: 0;
 }
+
+.qaTrackEventTag {
+  color: #0ab88a;
+  background: #c1f5e7;
+
+  &:active,
+  &:focus,
+  &:hover {
+    color: lighten(#0ab88a, 2%);
+    background: darken(#c1f5e7, 5%);
+  }
+
+  &:visited {
+    color: lighten(#0ab88a, 2%);
+  }
+}