From 70f6cc3a25754eaa121e3b7f8dc828e562095024 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Wed, 15 Jun 2022 12:53:09 +0700 Subject: [PATCH 1/7] improvement(reskin-profile): change modal bg --- src/shared/components/Contentful/Modal/modal-styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/Contentful/Modal/modal-styles.scss b/src/shared/components/Contentful/Modal/modal-styles.scss index 8e3bf60873..079fb0f815 100644 --- a/src/shared/components/Contentful/Modal/modal-styles.scss +++ b/src/shared/components/Contentful/Modal/modal-styles.scss @@ -37,7 +37,7 @@ $light-gray: #d4d4d4; } .overlay { - background-color: #2a2a2a; + background-color: #000000; opacity: 0.95; border: none; height: 100%; From 0fa8dd90d525fcfb1200742569ab1134ee967774 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Wed, 15 Jun 2022 13:29:14 +0700 Subject: [PATCH 2/7] improvement(reskin-profile): change to #000 --- src/shared/components/Contentful/Modal/modal-styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/Contentful/Modal/modal-styles.scss b/src/shared/components/Contentful/Modal/modal-styles.scss index 079fb0f815..7b997d5921 100644 --- a/src/shared/components/Contentful/Modal/modal-styles.scss +++ b/src/shared/components/Contentful/Modal/modal-styles.scss @@ -37,7 +37,7 @@ $light-gray: #d4d4d4; } .overlay { - background-color: #000000; + background-color: #000; opacity: 0.95; border: none; height: 100%; From b64338c392458952deff5a74861ce33721dccfbb Mon Sep 17 00:00:00 2001 From: Rakib Ansary Saikot Date: Wed, 15 Jun 2022 14:37:24 +0600 Subject: [PATCH 3/7] ci: deploy to QA --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 42ec7a0c28..61ab6608c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -364,7 +364,7 @@ workflows: filters: branches: only: - - free + - reskin-profile # This is beta env for production soft releases - "build-prod-beta": context : org-global From 72262e960dd6501873dfdd1c1f1a5eca9dafc7eb Mon Sep 17 00:00:00 2001 From: lunarkid Date: Fri, 17 Jun 2022 15:54:59 +0700 Subject: [PATCH 4/7] improvement(reskin-profile): edit page title --- .../ProfilePage/Activity/ActivityCard/index.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/shared/components/ProfilePage/Activity/ActivityCard/index.jsx b/src/shared/components/ProfilePage/Activity/ActivityCard/index.jsx index 6bc5058817..ab014ee265 100644 --- a/src/shared/components/ProfilePage/Activity/ActivityCard/index.jsx +++ b/src/shared/components/ProfilePage/Activity/ActivityCard/index.jsx @@ -83,7 +83,15 @@ const ActivityCard = ({ subTracks.map((subtrack, index) => (
- {_.upperFirst(subtrack.name.replace('FIRST_2_FINISH', 'FIRST2FINISH').replace(/_/g, ' ').toLowerCase())} + {(_.upperFirst(subtrack.name.replace('FIRST_2_FINISH', 'FIRST2FINISH').replace(/_/g, ' ').toLowerCase())) + .replace('First2finish', 'First2Finish') + .replace('Design first2finish', 'Design First2Finish') + .replace('Srm', 'SRM') + .replace('Ria build competition', 'RIA Build Competition') + .replace('Ria component competition', 'RIA Component Competition') + .replace('Design first2finish', 'Design First2Finish') + .replace('Ui prototype competition', 'UI Prototype Competition') + }
From ddabfe85c7e6da6d82fd8741d03b6db12dcccc11 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Fri, 17 Jun 2022 15:59:23 +0700 Subject: [PATCH 5/7] ci: reskin-profile to qa & beta --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61ab6608c4..8f79e6d2b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -350,7 +350,6 @@ workflows: branches: only: - develop - - reskin-profile # This is alternate dev env for parallel testing - "build-test": context : org-global From abbb0d49000609ce1755d09a084167c0b49fec52 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Fri, 17 Jun 2022 16:00:43 +0700 Subject: [PATCH 6/7] Merge branch 'develop' into reskin-profile From ff10285dbdd0ca71fbbf2871e28ebf1c6f6fc178 Mon Sep 17 00:00:00 2001 From: lunarkid Date: Mon, 20 Jun 2022 09:29:27 +0700 Subject: [PATCH 7/7] improvement(reskin-profile): verified badge