From a0c41a789b328c44bf4f2c19d7238e8c293eace0 Mon Sep 17 00:00:00 2001 From: diazz Date: Wed, 23 Nov 2022 12:54:22 +0700 Subject: [PATCH 1/6] fix: navigation should not go below footer fix: keep discuss white even after it was visited --- src/shared/containers/timeline-wall/styles.scss | 1 + .../timeline-wall/timeline-events/right-filter/styles.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/src/shared/containers/timeline-wall/styles.scss b/src/shared/containers/timeline-wall/styles.scss index 5d4eb45b15..678e076183 100644 --- a/src/shared/containers/timeline-wall/styles.scss +++ b/src/shared/containers/timeline-wall/styles.scss @@ -86,6 +86,7 @@ border: none; color: white; + &:visited, &:hover { color: white; } diff --git a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss index ce83f8f22d..a25787f93a 100644 --- a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss +++ b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss @@ -3,6 +3,7 @@ .container { display: flex; flex-direction: column; + z-index: 1; @media (max-width: 768px) { position: fixed; From c47731ba8239fed0d0375f01045ff195c220d600 Mon Sep 17 00:00:00 2001 From: diazz Date: Thu, 1 Dec 2022 13:46:24 +0700 Subject: [PATCH 2/6] fix: navigation should not go below footer --- .../timeline-events/right-filter/styles.scss | 12 ++++++------ .../timeline-wall/timeline-events/styles.scss | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss index a25787f93a..712e920e69 100644 --- a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss +++ b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss @@ -54,16 +54,15 @@ border-top-left-radius: 8px; border-bottom-left-radius: 8px; padding: 10px 0; - position: fixed; - right: 0; - left: 1374px; + position: sticky; + top: 0; max-height: 70%; overflow: scroll; - -ms-overflow-style: none; /* Internet Explorer 10+ */ - scrollbar-width: none; /* Firefox */ + -ms-overflow-style: none; /* Internet Explorer 10+ */ + scrollbar-width: none; /* Firefox */ &::-webkit-scrollbar { - display: none; /* Safari and Chrome */ + display: none; /* Safari and Chrome */ } @media (max-width: 1500px) { @@ -73,6 +72,7 @@ @media (max-width: 768px) { border-radius: 0; width: calc(100% - 10px); + position: relative; } span { diff --git a/src/shared/containers/timeline-wall/timeline-events/styles.scss b/src/shared/containers/timeline-wall/timeline-events/styles.scss index d55b957f54..476d845156 100644 --- a/src/shared/containers/timeline-wall/timeline-events/styles.scss +++ b/src/shared/containers/timeline-wall/timeline-events/styles.scss @@ -4,6 +4,7 @@ display: flex; flex-direction: row; justify-content: space-between; + max-width: 1492px; } .left-content { From b0883198efff4f0c93bf8a4ba5fa83c84073831c Mon Sep 17 00:00:00 2001 From: diazz Date: Thu, 1 Dec 2022 18:40:17 +0700 Subject: [PATCH 3/6] fix: set initial value of sidebar navigation to current year --- src/shared/containers/timeline-wall/index.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/containers/timeline-wall/index.jsx b/src/shared/containers/timeline-wall/index.jsx index 6c1e5aca8e..4bdf3f863b 100644 --- a/src/shared/containers/timeline-wall/index.jsx +++ b/src/shared/containers/timeline-wall/index.jsx @@ -24,6 +24,8 @@ import './styles.scss'; const FETCHING_PENDING_APPROVAL_EVENTS_INTERVAL = _.get(config, 'TIMELINE.FETCHING_PENDING_APPROVAL_EVENTS_INTERVAL', 0); const FORUM_LINK = _.get(config, 'TIMELINE.FORUM_LINK', ''); function TimelineWallContainer(props) { + const currentTime = new Date(); + const thisYear = currentTime.getFullYear(); const [tab, setTab] = useState(0); const fetchingApprovalsInterval = useRef(null); const [showRightFilterMobile, setShowRightFilterMobile] = useState(false); @@ -223,7 +225,7 @@ function TimelineWallContainer(props) { type="button" styleName="filter-dropdown hide-desktop show-mobile" > - {selectedFilterValue.year ? selectedFilterValue.year : ''} + {selectedFilterValue.year ? selectedFilterValue.year : thisYear} From 827d2b6225b0edd84b72242da269c9fc7150fd97 Mon Sep 17 00:00:00 2001 From: diazz Date: Fri, 2 Dec 2022 21:44:35 +0700 Subject: [PATCH 4/6] fix: update error message modal --- .../containers/timeline-wall/modal-event-add/index.jsx | 8 ++++++-- .../containers/timeline-wall/modal-event-add/styles.scss | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/shared/containers/timeline-wall/modal-event-add/index.jsx b/src/shared/containers/timeline-wall/modal-event-add/index.jsx index c4cde0570c..e4fd5517b9 100644 --- a/src/shared/containers/timeline-wall/modal-event-add/index.jsx +++ b/src/shared/containers/timeline-wall/modal-event-add/index.jsx @@ -3,6 +3,7 @@ import PT from 'prop-types'; import { Modal } from 'topcoder-react-ui-kit'; import IconCloseGreen from 'assets/images/icon-close-green.svg'; import LoadingIndicator from 'components/LoadingIndicator'; +import cn from 'classnames'; import style from './styles.scss'; @@ -17,14 +18,17 @@ function ModalEventAdd({ onCancel={onClose} >
- Confirmation + {uploadResult ? 'Error' : 'Confirmation'}
{ uploading ? ( ) : ( - + { uploadResult || successMessage } diff --git a/src/shared/containers/timeline-wall/modal-event-add/styles.scss b/src/shared/containers/timeline-wall/modal-event-add/styles.scss index 58b03c1cc9..7aed3cb770 100644 --- a/src/shared/containers/timeline-wall/modal-event-add/styles.scss +++ b/src/shared/containers/timeline-wall/modal-event-add/styles.scss @@ -44,6 +44,10 @@ strong { @include roboto-bold; } + + &.error { + color: #ef476f; + } } .separator { From d60c7bbd030c1276111b4ddebb4435949eac7c25 Mon Sep 17 00:00:00 2001 From: diazz Date: Fri, 2 Dec 2022 21:51:43 +0700 Subject: [PATCH 5/6] fix: navigation should not go below footer --- .../timeline-wall/timeline-events/right-filter/styles.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss index 712e920e69..db8d39a626 100644 --- a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss +++ b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss @@ -55,6 +55,7 @@ border-bottom-left-radius: 8px; padding: 10px 0; position: sticky; + margin-bottom: 80px; top: 0; max-height: 70%; overflow: scroll; @@ -73,6 +74,7 @@ border-radius: 0; width: calc(100% - 10px); position: relative; + margin-bottom: unset; } span { From d13bbeaa166886d60516398218a39a6b54284f06 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Tue, 10 Jan 2023 01:49:36 -0300 Subject: [PATCH 6/6] ci: remove develop from Dev env --- .circleci/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f224b19da3..7d12896e8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -349,8 +349,7 @@ workflows: filters: branches: only: - - develop - - latex_support + - free # This is alternate dev env for parallel testing - "build-test": context : org-global @@ -379,8 +378,6 @@ workflows: branches: only: - develop - - old-mm-fix - - reskin-profile-settings # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration