From efecaa651f0a050d56c444943cb2e89f00a6831e Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Wed, 3 Nov 2021 18:52:06 +0200
Subject: [PATCH 01/11] Update for #5764

---
 .../Contentful/Tabs/themes/pills.scss         |  6 ++-
 .../Contentful/Tabs/themes/vertical.scss      | 44 +++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/shared/components/Contentful/Tabs/themes/pills.scss b/src/shared/components/Contentful/Tabs/themes/pills.scss
index 86149011fd..564b427ff8 100644
--- a/src/shared/components/Contentful/Tabs/themes/pills.scss
+++ b/src/shared/components/Contentful/Tabs/themes/pills.scss
@@ -22,9 +22,9 @@ $text-color-black: #262628;
   border-bottom: none;
 
   @include xs-to-sm {
-    -webkit-flex-direction: column; /* Safari */
-    flex-direction: column;
+    overflow: auto;
     align-items: center;
+    justify-content: flex-start;
   }
 }
 
@@ -38,9 +38,11 @@ $text-color-black: #262628;
   cursor: pointer;
   border-radius: 15px;
   padding: 0 15px;
+  white-space: nowrap;
 
   @include xs-to-sm {
     margin: 2px;
+    padding: 0 25px;
   }
 
   &:hover {
diff --git a/src/shared/components/Contentful/Tabs/themes/vertical.scss b/src/shared/components/Contentful/Tabs/themes/vertical.scss
index 5ceefa6945..ef7d17d2ad 100644
--- a/src/shared/components/Contentful/Tabs/themes/vertical.scss
+++ b/src/shared/components/Contentful/Tabs/themes/vertical.scss
@@ -11,6 +11,10 @@ $gray-border-color: #e9e9e9;
   display: flex;
   max-width: $screen-lg;
   margin: auto;
+
+  @media (max-width: 768px) {
+    flex-direction: column;
+  }
 }
 
 .tablist {
@@ -24,6 +28,15 @@ $gray-border-color: #e9e9e9;
   border-right: 5px solid $gray-border-color;
   margin-right: 58px;
   padding: 7px 0;
+
+  @media (max-width: 768px) {
+    flex-direction: row;
+    border-right: none;
+    margin-right: 0;
+    margin-bottom: 15px;
+    overflow: auto;
+    padding: 0;
+  }
 }
 
 .tab {
@@ -35,6 +48,15 @@ $gray-border-color: #e9e9e9;
   cursor: pointer;
   padding-right: 30px;
 
+  @media (max-width: 768px) {
+    padding-right: 20px;
+    border-bottom: 5px solid $gray-border-color;
+
+    &:first-child {
+      padding-left: 7px;
+    }
+  }
+
   &:hover,
   &.selected {
     font-weight: 700;
@@ -52,6 +74,28 @@ $gray-border-color: #e9e9e9;
       border-radius: 5px;
       border-top: 1px solid white;
       border-bottom: 1px solid white;
+
+      @media (max-width: 768px) {
+        display: none;
+      }
+    }
+
+    p {
+      position: relative;
+
+      &::after {
+        @media (max-width: 768px) {
+          content: '';
+          background: $selected-color;
+          height: 5px;
+          width: 100%;
+          display: flex;
+          position: absolute;
+          border-radius: 15%;
+          border-left: 2px solid white;
+          border-right: 2px solid white;
+        }
+      }
     }
   }
 

From bd8ab14be957043875976b25d1b5c5db6b1e6385 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Fri, 5 Nov 2021 12:33:16 +0200
Subject: [PATCH 02/11] Tabs update

---
 src/shared/components/Contentful/Tabs/Tabs.jsx             | 5 ++++-
 src/shared/components/Contentful/Tabs/index.jsx            | 1 +
 src/shared/components/Contentful/Tabs/themes/vertical.scss | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/Contentful/Tabs/Tabs.jsx b/src/shared/components/Contentful/Tabs/Tabs.jsx
index c823afdc73..85280aa4bd 100644
--- a/src/shared/components/Contentful/Tabs/Tabs.jsx
+++ b/src/shared/components/Contentful/Tabs/Tabs.jsx
@@ -87,6 +87,7 @@ export default class TabsItemsLoader extends Component {
       theme,
       tabId,
       themeName,
+      forceRenderTabPanel,
     } = this.props;
     const { tabIndex, mobileTabsShow } = this.state;
 
@@ -102,7 +103,7 @@ export default class TabsItemsLoader extends Component {
             selectedIndex={tabIndex}
             selectedTabClassName={theme.selected}
             onSelect={tIndx => this.setState({ tabIndex: tIndx, mobileTabsShow: false })}
-            forceRenderTabPanel
+            forceRenderTabPanel={forceRenderTabPanel}
           >
             <div className={theme.tabListWrap}>
               {
@@ -230,6 +231,7 @@ TabsItemsLoader.defaultProps = {
   selected: 0,
   spaceName: null,
   environment: null,
+  forceRenderTabPanel: true,
 };
 
 TabsItemsLoader.propTypes = {
@@ -241,4 +243,5 @@ TabsItemsLoader.propTypes = {
   theme: PT.shape().isRequired,
   tabId: PT.string.isRequired,
   themeName: PT.string.isRequired,
+  forceRenderTabPanel: PT.bool,
 };
diff --git a/src/shared/components/Contentful/Tabs/index.jsx b/src/shared/components/Contentful/Tabs/index.jsx
index f9b1da4ca3..1dcee00579 100644
--- a/src/shared/components/Contentful/Tabs/index.jsx
+++ b/src/shared/components/Contentful/Tabs/index.jsx
@@ -36,6 +36,7 @@ function ContentfulTabs(props) {
             theme={TAB_THEMES[fields.theme || 'Default']}
             tabId={fields.urlQueryName || id}
             themeName={fields.theme}
+            forceRenderTabPanel={fields.forceRenderTabPanel}
           />
         );
       }}
diff --git a/src/shared/components/Contentful/Tabs/themes/vertical.scss b/src/shared/components/Contentful/Tabs/themes/vertical.scss
index ef7d17d2ad..6cce8aa4a5 100644
--- a/src/shared/components/Contentful/Tabs/themes/vertical.scss
+++ b/src/shared/components/Contentful/Tabs/themes/vertical.scss
@@ -1,3 +1,4 @@
+/* stylelint-disable no-descending-specificity */
 @import '~styles/mixins';
 
 $text-color-black: #262628;

From 134552ed2cdbfdf5d37cd54054d4784ed7496382 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Fri, 5 Nov 2021 12:34:29 +0200
Subject: [PATCH 03/11] ci: on beta

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3294f14378..3b3e9ded30 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -363,7 +363,7 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - contentful-tabs-mobile
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         

From 3b0a9e838e1eb70da50efbeeb63497b33a1c2c61 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Fri, 5 Nov 2021 17:11:34 +0200
Subject: [PATCH 04/11] fixed tab sizes

---
 src/shared/components/Contentful/Tabs/themes/vertical.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/Contentful/Tabs/themes/vertical.scss b/src/shared/components/Contentful/Tabs/themes/vertical.scss
index 6cce8aa4a5..b2c0b9bcd5 100644
--- a/src/shared/components/Contentful/Tabs/themes/vertical.scss
+++ b/src/shared/components/Contentful/Tabs/themes/vertical.scss
@@ -40,7 +40,7 @@ $gray-border-color: #e9e9e9;
   }
 }
 
-.tab {
+li.tab {
   text-align: left;
   color: $text-color-black;
   font-size: 16px;
@@ -52,6 +52,7 @@ $gray-border-color: #e9e9e9;
   @media (max-width: 768px) {
     padding-right: 20px;
     border-bottom: 5px solid $gray-border-color;
+    min-width: auto;
 
     &:first-child {
       padding-left: 7px;
@@ -83,6 +84,7 @@ $gray-border-color: #e9e9e9;
 
     p {
       position: relative;
+      display: inline-block;
 
       &::after {
         @media (max-width: 768px) {

From 2e4aa214ae1ed52e56bc702bd2405ad005e7fe50 Mon Sep 17 00:00:00 2001
From: Rakib Ansary <rakibansary@gmail.com>
Date: Fri, 12 Nov 2021 18:28:37 +0600
Subject: [PATCH 05/11] feat: take user to /onboard in activation email

---
 src/shared/components/Gigs/GigApply/index.jsx      | 4 +++-
 src/shared/components/Gigs/LoginModal/index.jsx    | 8 ++++++--
 src/shared/components/Gigs/ReferralModal/index.jsx | 4 +++-
 src/shared/components/LoginModal/index.jsx         | 5 ++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/shared/components/Gigs/GigApply/index.jsx b/src/shared/components/Gigs/GigApply/index.jsx
index bcd84a6782..05426e1781 100644
--- a/src/shared/components/Gigs/GigApply/index.jsx
+++ b/src/shared/components/Gigs/GigApply/index.jsx
@@ -28,6 +28,8 @@ export default function GigApply(props) {
     recruitProfile,
   } = props;
   const retUrl = window.location.href;
+  const signupRetUrl = `${config.PLATFORM_SITE_URL}/onboard`;
+
   const duration = getCustomField(job.custom_fields, 'Duration');
   const isPlaced = _.find(_.isEmpty(recruitProfile) ? [] : recruitProfile.custom_fields, { field_id: 12 });
 
@@ -326,7 +328,7 @@ export default function GigApply(props) {
           <div styleName="cta-buttons">
             <Link to={`${config.URL.AUTH}/member?retUrl=${encodeURIComponent(retUrl)}`} styleName="primaryBtn">Login</Link>
           </div>
-          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>here</a>.</p>
+          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(signupRetUrl)}&mode=signUp&utm_source=gig_listing`}>here</a>.</p>
         </div>
       </div>
     </div>
diff --git a/src/shared/components/Gigs/LoginModal/index.jsx b/src/shared/components/Gigs/LoginModal/index.jsx
index 47c1124533..9d4062aa75 100644
--- a/src/shared/components/Gigs/LoginModal/index.jsx
+++ b/src/shared/components/Gigs/LoginModal/index.jsx
@@ -30,7 +30,9 @@ const progressBarMid = 'https://images.ctfassets.net/b5f1djy59z3a/517ZRt9geweW3Q
 const progressBarXS = 'https://images.ctfassets.net/b5f1djy59z3a/6QxH7uVKCngtzBaXDn3Od1/3e0222a1ce773cead3f3a45f291f43a6/progress-bar-mobile.svg';
 const blobPurple = 'https://images.ctfassets.net/b5f1djy59z3a/1ZRCwp1uoShcES16lQmeu/ba084734120ffedebcb92b4e3fa2d667/blob-purple.svg';
 
-function LoginModal({ retUrl, onCancel, utmSource }) {
+function LoginModal({
+  retUrl, signupRetUrl, onCancel, utmSource,
+}) {
   return (
     <Modal
       theme={modalStyle}
@@ -56,7 +58,7 @@ function LoginModal({ retUrl, onCancel, utmSource }) {
         <div className={modalStyle.ctaButtons}>
           <PrimaryButton
             onClick={() => {
-              window.location = `${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=${utmSource}`;
+              window.location = `${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(signupRetUrl)}&mode=signUp&utm_source=${utmSource}`;
             }}
             theme={{
               button: buttonThemes.tc['primary-green-md'],
@@ -74,10 +76,12 @@ function LoginModal({ retUrl, onCancel, utmSource }) {
 
 LoginModal.defaultProps = {
   utmSource: 'gig_listing',
+  signupRetUrl: `${config.PLATFORM_SITE_URL}/onboard`,
 };
 
 LoginModal.propTypes = {
   retUrl: PT.string.isRequired,
+  signupRetUrl: PT.string,
   onCancel: PT.func.isRequired,
   utmSource: PT.string,
 };
diff --git a/src/shared/components/Gigs/ReferralModal/index.jsx b/src/shared/components/Gigs/ReferralModal/index.jsx
index f4af505232..ef648459d2 100644
--- a/src/shared/components/Gigs/ReferralModal/index.jsx
+++ b/src/shared/components/Gigs/ReferralModal/index.jsx
@@ -34,6 +34,8 @@ function ReferralModal({
   onReferralDone,
 }) {
   const retUrl = window.location.href;
+  const signupRetUrl = `${config.PLATFORM_SITE_URL}/onboard`;
+
   return (
     <Modal
       onCancel={onCloseButton}
@@ -110,7 +112,7 @@ function ReferralModal({
             >
               LOGIN
             </PrimaryButton>
-            <Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`} className={buttonThemes.tc['primary-white-md']} openNewTab="true">REGISTER</Link>
+            <Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(signupRetUrl)}&mode=signUp&utm_source=gig_listing`} className={buttonThemes.tc['primary-white-md']} openNewTab="true">REGISTER</Link>
           </div>
           <p className={modalStyle.regTxt}>Find out how the referral program works <a href={HELP_INFO_LINK} target="_blank" rel="noreferrer">here</a>.</p>
         </div>
diff --git a/src/shared/components/LoginModal/index.jsx b/src/shared/components/LoginModal/index.jsx
index b68d2170fc..ad2c1d3413 100644
--- a/src/shared/components/LoginModal/index.jsx
+++ b/src/shared/components/LoginModal/index.jsx
@@ -21,6 +21,7 @@ const buttonThemes = {
 function LoginModal({
   onCancel,
   retUrl,
+  signupRetUrl,
   utmSource,
   modalTitle,
   modalText,
@@ -45,7 +46,7 @@ function LoginModal({
           >
             LOGIN
           </PrimaryButton>
-          <Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp${utmSource ? `&utm_source=${utmSource}` : ''}`} className={buttonThemes.tc['primary-white-md']}>REGISTER</Link>
+          <Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(signupRetUrl)}&mode=signUp${utmSource ? `&utm_source=${utmSource}` : ''}`} className={buttonThemes.tc['primary-white-md']}>REGISTER</Link>
         </div>
         {infoNode}
       </div>
@@ -56,11 +57,13 @@ function LoginModal({
 LoginModal.defaultProps = {
   utmSource: null,
   infoNode: null,
+  signupRetUrl: `${config.PLATFORM_SITE_URL}/onboard`,
 };
 
 LoginModal.propTypes = {
   onCancel: PT.func.isRequired,
   retUrl: PT.string.isRequired,
+  signupRetUrl: PT.string,
   utmSource: PT.string,
   modalTitle: PT.string.isRequired,
   modalText: PT.string.isRequired,

From 22dbf14fa88b5c3613a1e5e76517fb64f02c2602 Mon Sep 17 00:00:00 2001
From: Rakib Ansary Saikot <ansaryfantastic@gmail.com>
Date: Fri, 12 Nov 2021 19:23:31 +0600
Subject: [PATCH 06/11] Revert "feat: take user to /onboard in activation
 email"

---
 src/shared/components/Gigs/GigApply/index.jsx      | 4 +---
 src/shared/components/Gigs/LoginModal/index.jsx    | 8 ++------
 src/shared/components/Gigs/ReferralModal/index.jsx | 4 +---
 src/shared/components/LoginModal/index.jsx         | 5 +----
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/shared/components/Gigs/GigApply/index.jsx b/src/shared/components/Gigs/GigApply/index.jsx
index 05426e1781..bcd84a6782 100644
--- a/src/shared/components/Gigs/GigApply/index.jsx
+++ b/src/shared/components/Gigs/GigApply/index.jsx
@@ -28,8 +28,6 @@ export default function GigApply(props) {
     recruitProfile,
   } = props;
   const retUrl = window.location.href;
-  const signupRetUrl = `${config.PLATFORM_SITE_URL}/onboard`;
-
   const duration = getCustomField(job.custom_fields, 'Duration');
   const isPlaced = _.find(_.isEmpty(recruitProfile) ? [] : recruitProfile.custom_fields, { field_id: 12 });
 
@@ -328,7 +326,7 @@ export default function GigApply(props) {
           <div styleName="cta-buttons">
             <Link to={`${config.URL.AUTH}/member?retUrl=${encodeURIComponent(retUrl)}`} styleName="primaryBtn">Login</Link>
           </div>
-          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(signupRetUrl)}&mode=signUp&utm_source=gig_listing`}>here</a>.</p>
+          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>here</a>.</p>
         </div>
       </div>
     </div>
diff --git a/src/shared/components/Gigs/LoginModal/index.jsx b/src/shared/components/Gigs/LoginModal/index.jsx
index 9d4062aa75..47c1124533 100644
--- a/src/shared/components/Gigs/LoginModal/index.jsx
+++ b/src/shared/components/Gigs/LoginModal/index.jsx
@@ -30,9 +30,7 @@ const progressBarMid = 'https://images.ctfassets.net/b5f1djy59z3a/517ZRt9geweW3Q
 const progressBarXS = 'https://images.ctfassets.net/b5f1djy59z3a/6QxH7uVKCngtzBaXDn3Od1/3e0222a1ce773cead3f3a45f291f43a6/progress-bar-mobile.svg';
 const blobPurple = 'https://images.ctfassets.net/b5f1djy59z3a/1ZRCwp1uoShcES16lQmeu/ba084734120ffedebcb92b4e3fa2d667/blob-purple.svg';
 
-function LoginModal({
-  retUrl, signupRetUrl, onCancel, utmSource,
-}) {
+function LoginModal({ retUrl, onCancel, utmSource }) {
   return (
     <Modal
       theme={modalStyle}
@@ -58,7 +56,7 @@ function LoginModal({
         <div className={modalStyle.ctaButtons}>
           <PrimaryButton
             onClick={() => {
-              window.location = `${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(signupRetUrl)}&mode=signUp&utm_source=${utmSource}`;
+              window.location = `${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=${utmSource}`;
             }}
             theme={{
               button: buttonThemes.tc['primary-green-md'],
@@ -76,12 +74,10 @@ function LoginModal({
 
 LoginModal.defaultProps = {
   utmSource: 'gig_listing',
-  signupRetUrl: `${config.PLATFORM_SITE_URL}/onboard`,
 };
 
 LoginModal.propTypes = {
   retUrl: PT.string.isRequired,
-  signupRetUrl: PT.string,
   onCancel: PT.func.isRequired,
   utmSource: PT.string,
 };
diff --git a/src/shared/components/Gigs/ReferralModal/index.jsx b/src/shared/components/Gigs/ReferralModal/index.jsx
index ef648459d2..f4af505232 100644
--- a/src/shared/components/Gigs/ReferralModal/index.jsx
+++ b/src/shared/components/Gigs/ReferralModal/index.jsx
@@ -34,8 +34,6 @@ function ReferralModal({
   onReferralDone,
 }) {
   const retUrl = window.location.href;
-  const signupRetUrl = `${config.PLATFORM_SITE_URL}/onboard`;
-
   return (
     <Modal
       onCancel={onCloseButton}
@@ -112,7 +110,7 @@ function ReferralModal({
             >
               LOGIN
             </PrimaryButton>
-            <Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(signupRetUrl)}&mode=signUp&utm_source=gig_listing`} className={buttonThemes.tc['primary-white-md']} openNewTab="true">REGISTER</Link>
+            <Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`} className={buttonThemes.tc['primary-white-md']} openNewTab="true">REGISTER</Link>
           </div>
           <p className={modalStyle.regTxt}>Find out how the referral program works <a href={HELP_INFO_LINK} target="_blank" rel="noreferrer">here</a>.</p>
         </div>
diff --git a/src/shared/components/LoginModal/index.jsx b/src/shared/components/LoginModal/index.jsx
index ad2c1d3413..b68d2170fc 100644
--- a/src/shared/components/LoginModal/index.jsx
+++ b/src/shared/components/LoginModal/index.jsx
@@ -21,7 +21,6 @@ const buttonThemes = {
 function LoginModal({
   onCancel,
   retUrl,
-  signupRetUrl,
   utmSource,
   modalTitle,
   modalText,
@@ -46,7 +45,7 @@ function LoginModal({
           >
             LOGIN
           </PrimaryButton>
-          <Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(signupRetUrl)}&mode=signUp${utmSource ? `&utm_source=${utmSource}` : ''}`} className={buttonThemes.tc['primary-white-md']}>REGISTER</Link>
+          <Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp${utmSource ? `&utm_source=${utmSource}` : ''}`} className={buttonThemes.tc['primary-white-md']}>REGISTER</Link>
         </div>
         {infoNode}
       </div>
@@ -57,13 +56,11 @@ function LoginModal({
 LoginModal.defaultProps = {
   utmSource: null,
   infoNode: null,
-  signupRetUrl: `${config.PLATFORM_SITE_URL}/onboard`,
 };
 
 LoginModal.propTypes = {
   onCancel: PT.func.isRequired,
   retUrl: PT.string.isRequired,
-  signupRetUrl: PT.string,
   utmSource: PT.string,
   modalTitle: PT.string.isRequired,
   modalText: PT.string.isRequired,

From d4a2ae29d2c3a11efb778e190307cc380c4763fa Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 15 Nov 2021 11:04:09 +0200
Subject: [PATCH 07/11] fixed tab size on mobile

---
 src/shared/components/Contentful/Tabs/themes/vertical.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/Contentful/Tabs/themes/vertical.scss b/src/shared/components/Contentful/Tabs/themes/vertical.scss
index b2c0b9bcd5..47d6f38857 100644
--- a/src/shared/components/Contentful/Tabs/themes/vertical.scss
+++ b/src/shared/components/Contentful/Tabs/themes/vertical.scss
@@ -52,7 +52,7 @@ li.tab {
   @media (max-width: 768px) {
     padding-right: 20px;
     border-bottom: 5px solid $gray-border-color;
-    min-width: auto;
+    min-width: auto !important;
 
     &:first-child {
       padding-left: 7px;

From 9d191c2c6a056699834643dc94928299d3e5960b Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 15 Nov 2021 12:51:57 +0200
Subject: [PATCH 08/11] fix s77,s323,s378

---
 .../Contentful/ArticleCard/themes/article_small.scss        | 1 +
 src/shared/containers/EDU/Search.jsx                        | 6 ++++++
 src/shared/containers/EDU/styles/tracks.scss                | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/shared/components/Contentful/ArticleCard/themes/article_small.scss b/src/shared/components/Contentful/ArticleCard/themes/article_small.scss
index b750b8ad1d..d294f5197e 100644
--- a/src/shared/components/Contentful/ArticleCard/themes/article_small.scss
+++ b/src/shared/components/Contentful/ArticleCard/themes/article_small.scss
@@ -6,6 +6,7 @@
   border-radius: 10px;
   overflow: hidden;
   position: relative;
+  cursor: pointer;
 
   @include xs-to-sm {
     background: #f4f4f4;
diff --git a/src/shared/containers/EDU/Search.jsx b/src/shared/containers/EDU/Search.jsx
index 28d9c7d0a8..99070553ad 100644
--- a/src/shared/containers/EDU/Search.jsx
+++ b/src/shared/containers/EDU/Search.jsx
@@ -44,6 +44,12 @@ export default class EDUSearch extends React.Component {
       // eslint-disable-next-line no-nested-ternary
       urlQuery.tags = _.isArray(urlQuery.tags)
         ? urlQuery.tags : (urlQuery.tags ? [urlQuery.tags] : []);
+      if (urlQuery.phrase && urlQuery.phrase.length > 115) {
+        urlQuery.phrase = urlQuery.phrase.substring(0, 114);
+      }
+      if (urlQuery.title && urlQuery.title.length > 115) {
+        urlQuery.title = urlQuery.title.substring(0, 114);
+      }
       this.setState({
         query: urlQuery,
       });
diff --git a/src/shared/containers/EDU/styles/tracks.scss b/src/shared/containers/EDU/styles/tracks.scss
index 7de1df9462..55baeac0dd 100644
--- a/src/shared/containers/EDU/styles/tracks.scss
+++ b/src/shared/containers/EDU/styles/tracks.scss
@@ -55,9 +55,9 @@
         text-transform: uppercase;
 
         @include xs-to-sm {
-          font-size: 70px;
-          letter-spacing: 0.44px;
-          line-height: 60px;
+          font-size: 42px;
+          letter-spacing: 0;
+          line-height: 38px;
           margin-top: 533px;
         }
       }

From 1e5e791e67c48ffa8c382e3f4071a864a68ce8c7 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Wed, 17 Nov 2021 18:05:46 +0200
Subject: [PATCH 09/11] ci: on beta

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 88aca8cf49..625e18d6e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -363,7 +363,7 @@ workflows:
           filters:
             branches:
               only:
-                - thrive-spooky1-p0-2
+                - thrive-spooky1-p0-3
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         

From 3ed3f85be78c5e3fd2a89e96ad80eb396d920998 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 18 Nov 2021 02:10:08 -0300
Subject: [PATCH 10/11] Revert "[Add Log] Add more log (#5779)"

This reverts commit 150efd6d68e34e1cee92d98251c390fa8a830e09.
---
 src/server/services/recruitCRM.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js
index 1bd5eb961c..086ce533c5 100644
--- a/src/server/services/recruitCRM.js
+++ b/src/server/services/recruitCRM.js
@@ -374,7 +374,6 @@ export default class RecruitCRMService {
     let referralCookie = req.cookies[config.GROWSURF_COOKIE];
     if (referralCookie) referralCookie = JSON.parse(referralCookie);
     if (referralCookie) {
-      logger.info(`The referralCookie is: ${referralCookie}`);
       logger.info(`The referralId is: ${referralCookie.referralId}`);
     }
     const tcHandle = _.findIndex(form.custom_fields, { field_id: 2 });

From 94c29774372453c161848015ce8343316444d393 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Thu, 18 Nov 2021 02:10:16 -0300
Subject: [PATCH 11/11] Revert "[Add Log] Log the referralId  (#5776)"

This reverts commit 637948bb8a78d59eea545a83c1437a2050d1c667.
---
 src/server/services/recruitCRM.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js
index 086ce533c5..e18252f6ee 100644
--- a/src/server/services/recruitCRM.js
+++ b/src/server/services/recruitCRM.js
@@ -373,9 +373,6 @@ export default class RecruitCRMService {
     let isReferred = false;
     let referralCookie = req.cookies[config.GROWSURF_COOKIE];
     if (referralCookie) referralCookie = JSON.parse(referralCookie);
-    if (referralCookie) {
-      logger.info(`The referralId is: ${referralCookie.referralId}`);
-    }
     const tcHandle = _.findIndex(form.custom_fields, { field_id: 2 });
     let growRes;
     try {