From c5b00ad6d9e5f28cd2d8fd57e5ed4a53bfe8586c Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Wed, 27 May 2020 15:07:51 +0530 Subject: [PATCH 01/15] ci: deploy only on dev and qa --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2540011007..796cd9694d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -236,8 +236,7 @@ workflows: context : org-global filters: branches: - only: - - develop + only: - feature-contentful # This is alternate dev env for parallel testing - "build-qa": @@ -245,14 +244,14 @@ workflows: filters: branches: only: - - develop-on-qa-env + - develop # This is beta env for production soft releases - "build-prod-beta": context : org-global filters: branches: only: - - develop + - hot-fix # This is stage env for production QA releases - "build-prod-staging": context : org-global From c236857ad215717562faf8ead375c6ebe623da81 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Fri, 5 Jun 2020 12:33:54 +0300 Subject: [PATCH 02/15] Init TCO21 #4467 --- src/server/tc-communities/tco21/metadata.json | 20 +++++++ src/shared/actions/contentful.js | 5 +- .../Contentful/MenuLoader/index.jsx | 7 +-- src/shared/routes/Communities/Routes.jsx | 2 + .../routes/Communities/TCO21/Routes.jsx | 57 +++++++++++++++++++ src/shared/routes/Communities/TCO21/index.jsx | 32 +++++++++++ 6 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 src/server/tc-communities/tco21/metadata.json create mode 100644 src/shared/routes/Communities/TCO21/Routes.jsx create mode 100644 src/shared/routes/Communities/TCO21/index.jsx diff --git a/src/server/tc-communities/tco21/metadata.json b/src/server/tc-communities/tco21/metadata.json new file mode 100644 index 0000000000..fa22f3f373 --- /dev/null +++ b/src/server/tc-communities/tco21/metadata.json @@ -0,0 +1,20 @@ +{ + "challengeFilter": { + "tags": ["TCO", "TCO21"] + }, + "communityId": "tco21", + "communityName": "TCO21", + "groupIds": [], + "hideSearch": true, + "logos": [{ + "img": "/community-app-assets/themes/tco/TCO21.svg", + "url": "https://tco21.topcoder.com" + }], + "menuItems": [{ + "navigationMenu": "3UBKZJ0qMHAkqrobue73NB" + }], + "newsFeed": "http://www.topcoder.com/feed", + "subdomains": ["tco21"], + "description": "2021 Topcoder Open. The Ultimate Programming & Design Tournament", + "image": "tco21.jpg" +} diff --git a/src/shared/actions/contentful.js b/src/shared/actions/contentful.js index 2c8f9c3547..153e9d438a 100644 --- a/src/shared/actions/contentful.js +++ b/src/shared/actions/contentful.js @@ -181,12 +181,13 @@ async function getMenuDone(menuProps) { cR2.fields.childRoutes, cR3 => service.getEntry(cR3.sys.id).then( async (c3) => { - const sI3 = menuItemBuilder(url2, c3); + const url3 = urlTarget(url2, cR2); + const sI3 = menuItemBuilder(url3, c3); if (c3.fields.childRoutes) { sI3.subMenu = await Promise.all(_.map( c3.fields.childRoutes, cR4 => service.getEntry(cR4.sys.id).then( - c4 => menuItemBuilder(urlTarget(url2, c3), c4), + c4 => menuItemBuilder(url3, c4), ), )); } diff --git a/src/shared/containers/Contentful/MenuLoader/index.jsx b/src/shared/containers/Contentful/MenuLoader/index.jsx index 2132823f63..cd79399c4b 100644 --- a/src/shared/containers/Contentful/MenuLoader/index.jsx +++ b/src/shared/containers/Contentful/MenuLoader/index.jsx @@ -79,11 +79,6 @@ class MenuLoaderContainer extends React.Component { const { TopNav, LoginNav } = require('navigation-component'); const logoToUse = !_.isEmpty(menuLogo) ? menu logo : ; const menuTheme = fields.theme.split('- '); - const comboMenu = _.flatten(_.map(menu, menuItem => menuItem.subMenu)); - // This is a hack fix that should be removed when possible! - // Its orifing is in the https://github.com/topcoder-platform/navigation-component module - // which breaks if there is NOT an menu item with id = `community` - comboMenu[0].id = 'community'; let normalizedProfile = auth.profile && _.clone(auth.profile); if (auth.profile) { normalizedProfile.photoURL = (_.has(auth.profile, 'photoURL') && auth.profile.photoURL !== null) @@ -94,7 +89,7 @@ class MenuLoaderContainer extends React.Component { return (
+ { + meta.menuItems ? ( + + ) : null + } + + } + exact + path={`${base}/members/:handle([\\w\\-\\[\\].{}]{2,15})`} + /> + } + exact + path={`${base}/members/:handle([\\w\\-\\[\\].{}]{2,15})/details`} + /> + } + id="6wUJl6RRF6MxI3kR6DFq5t" + /> + +
+
+ ); +} + +TCO21.defaultProps = { + base: '', +}; + +TCO21.propTypes = { + base: PT.string, + meta: PT.shape().isRequired, +}; diff --git a/src/shared/routes/Communities/TCO21/index.jsx b/src/shared/routes/Communities/TCO21/index.jsx new file mode 100644 index 0000000000..a1880bb2c2 --- /dev/null +++ b/src/shared/routes/Communities/TCO21/index.jsx @@ -0,0 +1,32 @@ +/** + * Loader for the community's code chunks. + */ + +import LoadingIndicator from 'components/LoadingIndicator'; +import path from 'path'; +import PT from 'prop-types'; +import React from 'react'; +import { AppChunk, webpack } from 'topcoder-react-utils'; + +export default function ChunkLoader({ base, meta }) { + return ( + import(/* webpackChunkName: "tco21-community/chunk" */ './Routes') + .then(({ default: Routes }) => ( + + )) + } + renderPlaceholder={() => } + renderServer={() => { + const Routes = webpack.requireWeak(path.resolve(__dirname, './Routes')); + return ; + }} + /> + ); +} + +ChunkLoader.propTypes = { + base: PT.string.isRequired, + meta: PT.shape().isRequired, +}; From 796d1122222bbd274c55210ea0503ad265b7c328 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 8 Jun 2020 15:40:12 +0300 Subject: [PATCH 03/15] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2540011007..e99d6afa99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -231,6 +231,7 @@ workflows: branches: only: - develop + - tco21 # This is alternate dev env for parallel testing - "build-test": context : org-global From 84a523fb324599e775872c0570190fa71bb1aed2 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 8 Jun 2020 16:13:26 +0300 Subject: [PATCH 04/15] Use state data for loaded menus --- .../Contentful/MenuLoader/index.jsx | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/shared/containers/Contentful/MenuLoader/index.jsx b/src/shared/containers/Contentful/MenuLoader/index.jsx index cd79399c4b..a8bb7b45d3 100644 --- a/src/shared/containers/Contentful/MenuLoader/index.jsx +++ b/src/shared/containers/Contentful/MenuLoader/index.jsx @@ -38,16 +38,19 @@ class MenuLoaderContainer extends React.Component { spaceName, environment, baseUrl, + menu, } = this.props; - // initiate loading the menu data - loadMenuData({ - id, - fields, - preview, - spaceName, - environment, - baseUrl, - }); + if (!menu.length) { + // initiate loading the menu data + loadMenuData({ + id, + fields, + preview, + spaceName, + environment, + baseUrl, + }); + } } handleChangeLevel1Id(menuId) { From 0179a62f35c8e745bb98330b4649368edae437cf Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 9 Jun 2020 00:03:40 +0300 Subject: [PATCH 05/15] Dump menu for debug --- src/shared/containers/Contentful/MenuLoader/index.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/containers/Contentful/MenuLoader/index.jsx b/src/shared/containers/Contentful/MenuLoader/index.jsx index a8bb7b45d3..e0d8087f3f 100644 --- a/src/shared/containers/Contentful/MenuLoader/index.jsx +++ b/src/shared/containers/Contentful/MenuLoader/index.jsx @@ -89,6 +89,7 @@ class MenuLoaderContainer extends React.Component { } else { normalizedProfile = null; } + console.log('menu is', menu); // eslint-disable-line no-console return (
Date: Thu, 11 Jun 2020 22:18:38 +0300 Subject: [PATCH 06/15] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66d90fd976..9e9147ffb6 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#develop", + "navigation-component": "topcoder-platform/navigation-component#issue-175", "node-forge": "^0.7.5", "nuka-carousel": "^4.5.3", "postcss": "^6.0.23", From 00b302ece02e5e3db127d215ee91de5045e59bd9 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 15 Jun 2020 09:34:23 +0300 Subject: [PATCH 07/15] Remove TC footer --- src/shared/containers/Contentful/MenuLoader/index.jsx | 1 - src/shared/routes/Communities/TCO21/Routes.jsx | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/shared/containers/Contentful/MenuLoader/index.jsx b/src/shared/containers/Contentful/MenuLoader/index.jsx index e0d8087f3f..a8bb7b45d3 100644 --- a/src/shared/containers/Contentful/MenuLoader/index.jsx +++ b/src/shared/containers/Contentful/MenuLoader/index.jsx @@ -89,7 +89,6 @@ class MenuLoaderContainer extends React.Component { } else { normalizedProfile = null; } - console.log('menu is', menu); // eslint-disable-line no-console return (
-
); } From f24225088c426b51c0d10ba491f66974397f7ee6 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 17 Jun 2020 16:22:54 +0300 Subject: [PATCH 08/15] New theme for counter --- .../components/Contentful/Countdown/index.jsx | 1 + src/shared/components/Countdown/index.jsx | 37 +++++---- .../components/Countdown/themes/TCO21.scss | 77 +++++++++++++++++++ .../Countdown/{ => themes}/style.scss | 8 -- 4 files changed, 101 insertions(+), 22 deletions(-) create mode 100644 src/shared/components/Countdown/themes/TCO21.scss rename src/shared/components/Countdown/{ => themes}/style.scss (94%) diff --git a/src/shared/components/Contentful/Countdown/index.jsx b/src/shared/components/Contentful/Countdown/index.jsx index 0ff5447e93..67ccb5b868 100644 --- a/src/shared/components/Contentful/Countdown/index.jsx +++ b/src/shared/components/Contentful/Countdown/index.jsx @@ -25,6 +25,7 @@ export default function CountdownLoader(props) { title={data.entries.items[id].fields.title} end={new Date(data.entries.items[id].fields.endDate)} extraStylesForContainer={data.entries.items[id].fields.extraStylesForContainer} + themeName={data.entries.items[id].fields.theme} /> )} renderPlaceholder={LoadingIndicator} diff --git a/src/shared/components/Countdown/index.jsx b/src/shared/components/Countdown/index.jsx index 7fd2a42dc8..4cccc74494 100644 --- a/src/shared/components/Countdown/index.jsx +++ b/src/shared/components/Countdown/index.jsx @@ -8,7 +8,13 @@ import PT from 'prop-types'; import React from 'react'; import { fixStyle } from 'utils/contentful'; -import './style.scss'; +import defaultTheme from './themes/style.scss'; +import TCO21 from './themes/TCO21.scss'; + +const THEMES = { + Default: defaultTheme, + TCO21, +}; /* We have to use state component, as we need to manipulate with DOM nodes to * access nuka-carousel state. */ @@ -34,6 +40,8 @@ export default class Countdown extends React.Component { } render() { + const { themeName } = this.props; + const theme = THEMES[themeName]; let { elapsed } = this.state; const oneDay = 24 * 60 * 60; const oneHour = 60 * 60; @@ -54,27 +62,26 @@ export default class Countdown extends React.Component { ); return (
-
{title}
-
:
-
+
{title}
+
-
{day}
-
days
+
{day}
+
days
-
{hour}
-
hours
+
{hour}
+
hours
-
{minute}
-
minutes
+
{minute}
+
minutes
-
-
{second}
-
seconds
+
+
{second}
+
seconds
@@ -85,10 +92,12 @@ export default class Countdown extends React.Component { Countdown.defaultProps = { title: 'Countdown to TCO19 Final', extraStylesForContainer: {}, + themeName: 'Default', }; Countdown.propTypes = { title: PT.string, end: PT.instanceOf(Date).isRequired, extraStylesForContainer: PT.shape(), + themeName: PT.string, }; diff --git a/src/shared/components/Countdown/themes/TCO21.scss b/src/shared/components/Countdown/themes/TCO21.scss new file mode 100644 index 0000000000..01abb24ba4 --- /dev/null +++ b/src/shared/components/Countdown/themes/TCO21.scss @@ -0,0 +1,77 @@ +@import "~styles/mixins"; + +$text-color-gray: #37373b; +$container-background-yello: #fce217; + +.container { + @include roboto-regular; + + display: -webkit-flex; /* Safari */ + display: flex; + -webkit-flex-direction: row; /* Safari */ + flex-direction: row; + -webkit-justify-content: center; /* Safari */ + justify-content: center; + padding: 40px; + background: $container-background-yello; + + @media only screen and (max-width: 767px) { + -webkit-flex-direction: column; /* Safari */ + flex-direction: column; + } + + .title { + @include barlow-condensed-medium; + + color: #2a2a2a; + font-size: 48px; + line-height: 50px; + text-align: center; + margin: auto 41px auto 0; + text-transform: uppercase; + + @media only screen and (max-width: 767px) { + margin-bottom: 20px; + } + } + + .time-container { + display: -webkit-flex; /* Safari */ + display: flex; + -webkit-flex-direction: row; /* Safari */ + flex-direction: row; + -webkit-justify-content: center; /* Safari */ + justify-content: center; + } + + .time-value { + @include barlow-condensed; + + color: #9d41c9; + font-size: 80px; + line-height: 74px; + text-align: center; + } + + .time-label { + color: #2a2a2a; + font-size: 14px; + letter-spacing: 0.5px; + line-height: 18px; + text-align: center; + width: 100px; + text-transform: uppercase; + margin-top: 4px; + + @media only screen and (max-width: 767px) { + width: auto; + margin-left: 10px; + margin-right: 10px; + font-size: 18px; + } + } + + .time-second { + display: block; + } +} diff --git a/src/shared/components/Countdown/style.scss b/src/shared/components/Countdown/themes/style.scss similarity index 94% rename from src/shared/components/Countdown/style.scss rename to src/shared/components/Countdown/themes/style.scss index feec44e436..966b7500ee 100644 --- a/src/shared/components/Countdown/style.scss +++ b/src/shared/components/Countdown/themes/style.scss @@ -31,16 +31,8 @@ $container-background-yello: #fce217; margin-bottom: auto; text-transform: uppercase; - &.colon { - margin-right: 30px; - } - @media only screen and (max-width: 767px) { margin-bottom: 20px; - - &.colon { - display: none; - } } } From 1d10df6c19e73940a9e032392c1229b8867653d5 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Thu, 18 Jun 2020 10:49:52 +0300 Subject: [PATCH 09/15] Add empty routes support for Navi --- src/shared/actions/contentful.js | 7 ++++--- src/shared/utils/contentful.js | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/shared/actions/contentful.js b/src/shared/actions/contentful.js index 153e9d438a..dd17409407 100644 --- a/src/shared/actions/contentful.js +++ b/src/shared/actions/contentful.js @@ -240,9 +240,10 @@ async function getMenuDone(menuProps) { } else { menu = menuData; } - // add the preconfigured secondary menus - menu[0].secondaryMenuForLoggedInUser = config.SECONDARY_MENU_FOR_LOGGED_USER; - menu[0].secondaryMenuForGuest = config.SECONDARY_MENU_FOR_GUEST; + // add the preconfigured secondary menus? + if (fields.showSecondaryNaviMenu) { + menu[0].secondaryMenu = config.HEADER_MENU[1].secondaryMenu; + } return { id: menuProps.id, diff --git a/src/shared/utils/contentful.js b/src/shared/utils/contentful.js index 17c7b5ff65..3c253aa36b 100644 --- a/src/shared/utils/contentful.js +++ b/src/shared/utils/contentful.js @@ -94,13 +94,13 @@ export function menuItemBuilder(baseUrl, item) { case 'route': return { title: item.fields.naviMenuLinkText || item.fields.name, - href: target(baseUrl, item), + href: item.fields.viewport ? target(baseUrl, item) : null, id: item.sys.id, }; case 'navigationMenuItem': return { title: item.fields.linkText || item.fields.name, - href: target(baseUrl, item), + href: item.fields.viewport ? target(baseUrl, item) : null, id: item.sys.id, }; default: return {}; From 7550f71612d48d81c738c26effb13a0a60ea78fd Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Thu, 18 Jun 2020 11:28:07 +0300 Subject: [PATCH 10/15] Themed buttons fixes and grid --- src/shared/components/Contentful/Viewport/themes/grid.scss | 1 + src/shared/components/buttons/themed/tc.scss | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/shared/components/Contentful/Viewport/themes/grid.scss b/src/shared/components/Contentful/Viewport/themes/grid.scss index 4a9d33cc93..24e8e3c0be 100644 --- a/src/shared/components/Contentful/Viewport/themes/grid.scss +++ b/src/shared/components/Contentful/Viewport/themes/grid.scss @@ -6,6 +6,7 @@ overflow: auto; justify-content: center; width: 100%; + align-items: center; @include xl { max-width: $screen-lg; diff --git a/src/shared/components/buttons/themed/tc.scss b/src/shared/components/buttons/themed/tc.scss index 265c60e689..b990bf4abc 100644 --- a/src/shared/components/buttons/themed/tc.scss +++ b/src/shared/components/buttons/themed/tc.scss @@ -6,6 +6,7 @@ font-weight: 700 !important; text-decoration: none !important; text-transform: uppercase !important; + margin: 0 !important; } @mixin primary-green { @@ -105,6 +106,7 @@ font-weight: 700 !important; text-decoration: none !important; text-transform: uppercase !important; + margin: 0 !important; } @mixin secondary-gray { @@ -130,6 +132,7 @@ font-weight: 700 !important; text-transform: uppercase !important; + margin: 0 !important; } @mixin warn-red { From a9d3461499922e76371dbf74a4e097a78d367502 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Thu, 18 Jun 2020 12:46:13 +0300 Subject: [PATCH 11/15] Remove grid align --- src/shared/components/Contentful/Viewport/themes/grid.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/shared/components/Contentful/Viewport/themes/grid.scss b/src/shared/components/Contentful/Viewport/themes/grid.scss index 24e8e3c0be..4a9d33cc93 100644 --- a/src/shared/components/Contentful/Viewport/themes/grid.scss +++ b/src/shared/components/Contentful/Viewport/themes/grid.scss @@ -6,7 +6,6 @@ overflow: auto; justify-content: center; width: 100%; - align-items: center; @include xl { max-width: $screen-lg; From 12ce76af52b9194965826f0b6a12b0ee0e5d6027 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Fri, 19 Jun 2020 13:06:53 +0300 Subject: [PATCH 12/15] Leaderbord headers fixes --- src/shared/components/Contentful/ContentBlock/themes/TCO19.scss | 2 +- src/shared/components/Contentful/ContentBlock/themes/TCO20.scss | 2 +- .../components/Contentful/ContentBlock/themes/general.scss | 2 +- .../components/Leaderboard/LeaderboardTable/themes/tco20.scss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/components/Contentful/ContentBlock/themes/TCO19.scss b/src/shared/components/Contentful/ContentBlock/themes/TCO19.scss index 6d1dba8192..bffbc19320 100644 --- a/src/shared/components/Contentful/ContentBlock/themes/TCO19.scss +++ b/src/shared/components/Contentful/ContentBlock/themes/TCO19.scss @@ -78,7 +78,7 @@ strong a { th { @include roboto-regular; - color: #808080; + color: #2a2a2a; font-size: 15px; font-weight: bold; line-height: 25px; diff --git a/src/shared/components/Contentful/ContentBlock/themes/TCO20.scss b/src/shared/components/Contentful/ContentBlock/themes/TCO20.scss index 7dca7a7556..936794b27d 100644 --- a/src/shared/components/Contentful/ContentBlock/themes/TCO20.scss +++ b/src/shared/components/Contentful/ContentBlock/themes/TCO20.scss @@ -94,7 +94,7 @@ strong a { th { @include roboto-regular; - color: #808080; + color: #2a2a2a; font-size: 15px; font-weight: bold; line-height: 25px; diff --git a/src/shared/components/Contentful/ContentBlock/themes/general.scss b/src/shared/components/Contentful/ContentBlock/themes/general.scss index ad01f09abc..55eb8d43ba 100644 --- a/src/shared/components/Contentful/ContentBlock/themes/general.scss +++ b/src/shared/components/Contentful/ContentBlock/themes/general.scss @@ -122,7 +122,7 @@ strong a { th { @include roboto-regular; - color: #808080; + color: #2a2a2a; font-size: 15px; font-weight: bold; line-height: 25px; diff --git a/src/shared/components/Leaderboard/LeaderboardTable/themes/tco20.scss b/src/shared/components/Leaderboard/LeaderboardTable/themes/tco20.scss index 9a787cf24f..fe4938c6b1 100644 --- a/src/shared/components/Leaderboard/LeaderboardTable/themes/tco20.scss +++ b/src/shared/components/Leaderboard/LeaderboardTable/themes/tco20.scss @@ -191,7 +191,7 @@ $table-bg-hover: #f5f5f5; .col-fulfillment, .col-challenges, .col-points { - color: #7f7f7f; + color: #2a2a2a; font-family: Roboto, sans-serif; font-size: 14px; font-weight: 500; From b6ea43f71e031e1d54bf9cc42b50f5df18d7d65d Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Fri, 19 Jun 2020 14:04:05 +0300 Subject: [PATCH 13/15] More tables style fixes --- .../components/Contentful/ContentBlock/themes/TCO19.scss | 8 ++++---- .../components/Contentful/ContentBlock/themes/TCO20.scss | 8 ++++---- .../Contentful/ContentBlock/themes/general.scss | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/shared/components/Contentful/ContentBlock/themes/TCO19.scss b/src/shared/components/Contentful/ContentBlock/themes/TCO19.scss index bffbc19320..6dd6d736f7 100644 --- a/src/shared/components/Contentful/ContentBlock/themes/TCO19.scss +++ b/src/shared/components/Contentful/ContentBlock/themes/TCO19.scss @@ -81,10 +81,10 @@ strong a { color: #2a2a2a; font-size: 15px; font-weight: bold; - line-height: 25px; + line-height: 18px; text-align: left; text-transform: uppercase; - padding: 7px 10px 7px 0; + padding: 18px 10px 14px 0; @include md-to-xl { white-space: nowrap; @@ -102,8 +102,8 @@ strong a { line-height: 25px; text-align: left; color: $tc-gray-80; - border-top: 1px solid #ededf2; - border-bottom: 1px solid #ededf2; + border-top: 1px solid #d4d4d4; + border-bottom: 1px solid #d4d4d4; padding: 20px 50px 20px 0; min-height: 51px; diff --git a/src/shared/components/Contentful/ContentBlock/themes/TCO20.scss b/src/shared/components/Contentful/ContentBlock/themes/TCO20.scss index 936794b27d..e6b4a5a3e7 100644 --- a/src/shared/components/Contentful/ContentBlock/themes/TCO20.scss +++ b/src/shared/components/Contentful/ContentBlock/themes/TCO20.scss @@ -97,10 +97,10 @@ strong a { color: #2a2a2a; font-size: 15px; font-weight: bold; - line-height: 25px; + line-height: 18px; text-align: left; text-transform: uppercase; - padding: 7px 10px 7px 0; + padding: 18px 10px 14px 0; @include md-to-xl { white-space: nowrap; @@ -118,8 +118,8 @@ strong a { line-height: 25px; text-align: left; color: $tc-gray-80; - border-top: 1px solid #ededf2; - border-bottom: 1px solid #ededf2; + border-top: 1px solid #d4d4d4; + border-bottom: 1px solid #d4d4d4; padding: 20px 50px 20px 0; min-height: 51px; diff --git a/src/shared/components/Contentful/ContentBlock/themes/general.scss b/src/shared/components/Contentful/ContentBlock/themes/general.scss index 55eb8d43ba..195069213b 100644 --- a/src/shared/components/Contentful/ContentBlock/themes/general.scss +++ b/src/shared/components/Contentful/ContentBlock/themes/general.scss @@ -125,10 +125,10 @@ strong a { color: #2a2a2a; font-size: 15px; font-weight: bold; - line-height: 25px; + line-height: 18px; text-align: left; text-transform: uppercase; - padding: 7px 10px 7px 0; + padding: 18px 10px 14px 0; @include md-to-xl { white-space: nowrap; @@ -146,8 +146,8 @@ strong a { line-height: 25px; text-align: left; color: $tc-gray-80; - border-top: 1px solid #ededf2; - border-bottom: 1px solid #ededf2; + border-top: 1px solid #d4d4d4; + border-bottom: 1px solid #d4d4d4; padding: 20px 50px 20px 0; min-height: 51px; From 64b377e7f875e46bce04833ff8c514a46a7915aa Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Mon, 22 Jun 2020 14:46:49 +0530 Subject: [PATCH 14/15] fix: added develop branch to the nav component --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e9147ffb6..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#issue-175", + "navigation-component": "topcoder-platform/navigation-component#develop", "node-forge": "^0.7.5", "nuka-carousel": "^4.5.3", "postcss": "^6.0.23", From 446aa56cd19f04c7b0c7a271407f6f5474b30e05 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Mon, 22 Jun 2020 14:51:13 +0530 Subject: [PATCH 15/15] ci: deploy on beta --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e4578cf16..fbe4c60282 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -252,7 +252,7 @@ workflows: filters: branches: only: - - hot-fix + - develop # This is stage env for production QA releases - "build-prod-staging": context : org-global