From 75bdd5d7e6236f1522f4bc4a4f322eca4c4a3a26 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 13 May 2020 13:19:51 -0300 Subject: [PATCH 1/6] #4297 : Add "Practice" to drop down navigation --- .../shared/components/Header/__snapshots__/index.jsx.snap | 4 ++++ config/default.js | 4 ++++ config/production.js | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap index 8f8fa0afc8..a8b4bb9208 100644 --- a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap +++ b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap @@ -65,6 +65,10 @@ exports[`Default render 1`] = ` "href": "/community/taas", "title": "Gig Work", }, + Object { + "href": "/community/practice", + "title": "Practice", + }, ], "title": "Compete", }, diff --git a/config/default.js b/config/default.js index 7de679aec0..952c9c4e3a 100644 --- a/config/default.js +++ b/config/default.js @@ -314,6 +314,10 @@ module.exports = { title: 'Gig Work', href: '/community/taas', }, + { + title: 'Practice', + href: '/community/practice', + }, ], }, { diff --git a/config/production.js b/config/production.js index 4b23f3f9a5..58ccf51589 100644 --- a/config/production.js +++ b/config/production.js @@ -117,6 +117,10 @@ module.exports = { title: 'Gig Work', href: '/community/taas', }, + { + title: 'Practice', + href: '/community/practice', + }, ], }, { From af08b4b338a1b021be92fa8b7797a19a13250548 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 23 Jun 2020 15:19:05 +0300 Subject: [PATCH 2/6] Adds custom link support for navi logo --- package.json | 2 +- src/shared/containers/Contentful/MenuLoader/index.jsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e9147ffb6..550ea536d5 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "moment-timezone": "^0.5.21", "money": "^0.2.0", "morgan": "^1.9.0", - "navigation-component": "topcoder-platform/navigation-component#issue-175", + "navigation-component": "topcoder-platform/navigation-component#logo-link-fix", "node-forge": "^0.7.5", "nuka-carousel": "^4.5.3", "postcss": "^6.0.23", diff --git a/src/shared/containers/Contentful/MenuLoader/index.jsx b/src/shared/containers/Contentful/MenuLoader/index.jsx index a8bb7b45d3..35cef21d1e 100644 --- a/src/shared/containers/Contentful/MenuLoader/index.jsx +++ b/src/shared/containers/Contentful/MenuLoader/index.jsx @@ -116,6 +116,7 @@ class MenuLoaderContainer extends React.Component { setOpenMore={this.handleChangeOpenMore} loggedIn={!_.isEmpty(auth.profile)} profileHandle={auth.profile ? auth.profile.handle : ''} + logoLink={fields.logoLink} /> ); From f5bbd30d4ecbdfc2491ac25dd9178feff2c69b7c Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 29 Jun 2020 08:36:53 +0300 Subject: [PATCH 3/6] Update font-weight on countdown --- src/shared/components/Countdown/themes/TCO21.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/components/Countdown/themes/TCO21.scss b/src/shared/components/Countdown/themes/TCO21.scss index 01abb24ba4..4304871079 100644 --- a/src/shared/components/Countdown/themes/TCO21.scss +++ b/src/shared/components/Countdown/themes/TCO21.scss @@ -56,6 +56,7 @@ $container-background-yello: #fce217; .time-label { color: #2a2a2a; font-size: 14px; + font-weight: 500; letter-spacing: 0.5px; line-height: 18px; text-align: center; From 927276c564add583277456eb84d81d0dc35c48fe Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 29 Jun 2020 10:49:47 +0300 Subject: [PATCH 4/6] Updated tabs undeline color --- src/shared/components/Contentful/Tabs/themes/underline.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared/components/Contentful/Tabs/themes/underline.scss b/src/shared/components/Contentful/Tabs/themes/underline.scss index 2ea6d8a19b..cdcf7d7a7f 100644 --- a/src/shared/components/Contentful/Tabs/themes/underline.scss +++ b/src/shared/components/Contentful/Tabs/themes/underline.scss @@ -48,7 +48,8 @@ $text-color-pannel: #4a4a4a; &:hover, &.selected { - border-bottom: 5px solid #229174; + border-bottom: 5px solid #43D7B0; + border-radius: 3px; } p { From 507c59a523a73a0801e7b5285091e82fa860754c Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 30 Jun 2020 08:59:42 +0300 Subject: [PATCH 5/6] point to dev for navi --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 550ea536d5..66d90fd976 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "moment-timezone": "^0.5.21", "money": "^0.2.0", "morgan": "^1.9.0", - "navigation-component": "topcoder-platform/navigation-component#logo-link-fix", + "navigation-component": "topcoder-platform/navigation-component#develop", "node-forge": "^0.7.5", "nuka-carousel": "^4.5.3", "postcss": "^6.0.23", From 0836ae74f1d9e239acbfdee49de4228a63392eec Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 30 Jun 2020 10:19:44 +0300 Subject: [PATCH 6/6] Fix lint errors --- src/shared/components/Contentful/Tabs/themes/underline.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/Contentful/Tabs/themes/underline.scss b/src/shared/components/Contentful/Tabs/themes/underline.scss index cdcf7d7a7f..9c014b07d6 100644 --- a/src/shared/components/Contentful/Tabs/themes/underline.scss +++ b/src/shared/components/Contentful/Tabs/themes/underline.scss @@ -48,7 +48,7 @@ $text-color-pannel: #4a4a4a; &:hover, &.selected { - border-bottom: 5px solid #43D7B0; + border-bottom: 5px solid #43d7b0; border-radius: 3px; }