Merge remote-tracking branch 'origin/new-develop' into new-develop

Author: birdofpreyru

config/contentful/space.json

@@ -1495,9 +1495,9 @@
                 "design",
                 "data-science",
                 "development",
-                "competitive_programming"
+                "competitive-programming"
               ],
-              "message": "Select on of: design, development, data-science"
+              "message": "Select on of: design, development, data-science, competitive-programming"
             }
           ],
           "disabled": false,
@@ -2349,9 +2349,9 @@
                 "design",
                 "development",
                 "data-science",
-                "competitive_programming"
+                "competitive-programming"
               ],
-              "message": "Select one of: design, development, data-science"
+              "message": "Select one of: design, development, data-science, competitive-programming"
             }
           ],
           "disabled": false,

src/shared/components/TrackHomePages/HomePage/CompetitionLeaderboard/TrackIcon/style.scss

@@ -35,6 +35,10 @@
       background: $tc-orange-30;
     }
 
+    &.competitive-programming {
+      background: $tc-orange-30;
+    }
+
     &:hover {
       &.design,
       &.generic {
@@ -48,6 +52,10 @@
       &.data-science {
         background: $tc-orange;
       }
+
+      &.competitive-programming {
+        background: $tc-orange-30;
+      }
     }
   }
 
@@ -77,6 +85,10 @@
       background: $tc-orange;
     }
 
+    &.competitive-programming {
+      background: $tc-orange;
+    }
+
     &:hover {
       &.design,
       &.generic {
@@ -90,6 +102,10 @@
       &.data-science {
         background: $tc-orange;
       }
+
+      &.competitive-programming {
+        background: $tc-orange;
+      }
     }
   }
 
@@ -118,6 +134,10 @@
       background: $tc-orange;
     }
 
+    &.competitive-programming {
+      background: $tc-orange;
+    }
+
     @media screen and (max-width: $screen-md) {
       font-size: 20px;
       line-height: 60px;

src/shared/components/TrackHomePages/HomePage/ImportantPolicies/index.jsx

@@ -32,10 +32,12 @@ const ImportantPolicies = ({ data }) => {
                   {
                     datas.policies.map(policy => (
                       <div key={policy.fields.title} styleName="policy">
-                        <img styleName="icon" src={policy.fields.icon.fields.file.url} alt="Policy" />
-                        <div styleName="title">
+                        <a href={policy.fields.linkUrl} styleName="icon">
+                          <img styleName="icon" src={policy.fields.icon.fields.file.url} alt="Policy" />
+                        </a>
+                        <a href={policy.fields.linkUrl} styleName="title">
                           {policy.fields.title}
-                        </div>
+                        </a>
                         <div styleName="text">
                           {policy.fields.shortDescription}
                         </div>

src/shared/components/TrackHomePages/HomePage/ImportantPolicies/styles.scss

@@ -32,11 +32,21 @@
   margin-bottom: 10px;
   font-size: 20px;
   line-height: 30px;
+  display: block;
+
+  &:hover {
+    background: transparent;
+  }
 }
 
 .icon {
   height: 96px;
   width: 96px;
+  display: inline-block;
+
+  &:hover {
+    background: transparent;
+  }
 
   @media screen and (max-width: $screen-md) {
     height: 72px;