From 4f99dd3bb21c5eff3415af4add66763c9382843b Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 31 May 2021 14:17:16 +0300
Subject: [PATCH 1/8] Fix #5540

---
 src/shared/containers/EDU/styles/home.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/containers/EDU/styles/home.scss b/src/shared/containers/EDU/styles/home.scss
index d37e3e578c..eada7f4629 100644
--- a/src/shared/containers/EDU/styles/home.scss
+++ b/src/shared/containers/EDU/styles/home.scss
@@ -146,7 +146,7 @@
           align-items: center;
           background-image: url(assets/images/data-back.svg);
           width: 78px;
-          height: 69px;
+          height: 71px;
         }
 
         .trackIconDesign {

From 610751ac881e4a635607626befcd90912ff9383f Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 31 May 2021 14:27:02 +0300
Subject: [PATCH 2/8] Fix #5539

---
 src/shared/containers/EDU/styles/home.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/containers/EDU/styles/home.scss b/src/shared/containers/EDU/styles/home.scss
index eada7f4629..dcc79b3169 100644
--- a/src/shared/containers/EDU/styles/home.scss
+++ b/src/shared/containers/EDU/styles/home.scss
@@ -207,6 +207,7 @@
 
           @include xs-to-sm {
             margin: 32px 0 0 0;
+            text-align: center;
           }
 
           .trackTitle {
@@ -219,7 +220,7 @@
             text-align: left;
             text-transform: uppercase;
             margin-bottom: 13px;
-            display: block;
+            display: inline-block;
 
             @include xs-to-sm {
               text-align: center;

From 93d0bd211ed5a3a1133a41f230dc11c97c47bbac Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 31 May 2021 14:39:19 +0300
Subject: [PATCH 3/8] Fix #5536

---
 .../components/Contentful/SearchPageFilter/SearchPageFilter.jsx | 2 +-
 .../components/Contentful/SearchPageFilter/themes/default.scss  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/Contentful/SearchPageFilter/SearchPageFilter.jsx b/src/shared/components/Contentful/SearchPageFilter/SearchPageFilter.jsx
index 448544e525..b7978b243a 100644
--- a/src/shared/components/Contentful/SearchPageFilter/SearchPageFilter.jsx
+++ b/src/shared/components/Contentful/SearchPageFilter/SearchPageFilter.jsx
@@ -110,7 +110,7 @@ export class SearchPageFilterInner extends Component {
             <div className={theme.section}>
               <button
                 type="button"
-                className={`${theme['section-header']} ${isShowSubCategory ? theme.expanded : ''}`}
+                className={`${theme['section-header']} ${!isShowSubCategory ? theme.expanded : ''}`}
                 onClick={() => { this.setState({ isShowSubCategory: !isShowSubCategory }); }}
               >
                 <span className={theme['section-title']}>sub category</span>
diff --git a/src/shared/components/Contentful/SearchPageFilter/themes/default.scss b/src/shared/components/Contentful/SearchPageFilter/themes/default.scss
index 6fa8d3464e..fdf55054c5 100644
--- a/src/shared/components/Contentful/SearchPageFilter/themes/default.scss
+++ b/src/shared/components/Contentful/SearchPageFilter/themes/default.scss
@@ -102,6 +102,8 @@ $green-color: #137d60;
 }
 
 .expanded {
+  margin-bottom: 0 !important;
+
   svg {
     -moz-transform: scale(-1, -1);
     -o-transform: scale(-1, -1);

From 8638778c738c8d66ec034917f545a541acf7b2b1 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 31 May 2021 14:48:39 +0300
Subject: [PATCH 4/8] Fix #5537

---
 .../Contentful/TracksTree/ChildListRow/themes/default.scss      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/Contentful/TracksTree/ChildListRow/themes/default.scss b/src/shared/components/Contentful/TracksTree/ChildListRow/themes/default.scss
index 0144d7e406..1b547fe027 100644
--- a/src/shared/components/Contentful/TracksTree/ChildListRow/themes/default.scss
+++ b/src/shared/components/Contentful/TracksTree/ChildListRow/themes/default.scss
@@ -77,7 +77,7 @@ $text-gray: #7f7f7f;
   flex-direction: column;
   margin-left: 22px;
   color: $text-black;
-  cursor: pointer;
+  align-items: flex-start;
 
   > div {
     position: relative;

From 3becae740e4f99e09d9f9c4b211045c25a557ccf Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Mon, 31 May 2021 14:52:55 +0300
Subject: [PATCH 5/8] Fix #5535

---
 src/assets/images/icon-gesture.svg | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/assets/images/icon-gesture.svg b/src/assets/images/icon-gesture.svg
index bf6af4c94f..35990c0e11 100644
--- a/src/assets/images/icon-gesture.svg
+++ b/src/assets/images/icon-gesture.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="22px" height="20px" viewBox="0 0 22 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
-    <title>Group 9</title>
-    <desc>Created with Sketch.</desc>
+    <title>Click to show preference!</title>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="D03_1_Article" transform="translate(-208.000000, -2452.000000)">
             <g id="Group-11" transform="translate(189.000000, 2434.000000)">

From 342cb52053232fefe3c072e56c97afddc86b356e Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Mon, 31 May 2021 15:07:55 +0300
Subject: [PATCH 6/8] 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 66156c3f8c..46981bb304 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -353,7 +353,7 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - thrive-bug-fixes
       # This is stage env for production QA releases
       - deployStag:
           context : org-global         

From 41c8923dbe5747363e4a9f7b9cb3b626f5fbd78b Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Mon, 31 May 2021 23:27:44 +0300
Subject: [PATCH 7/8] ci: on staging

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 46981bb304..5c775d3f96 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -353,14 +353,14 @@ workflows:
           filters:
             branches:
               only:
-                - thrive-bug-fixes
+                - free
       # This is stage env for production QA releases
       - deployStag:
           context : org-global         
           filters:
             branches:
               only:
-                - develop
+                - thrive-bug-fixes
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

From 2a9d3c7f80b84934779fe091ff111753647ab85d Mon Sep 17 00:00:00 2001
From: Luiz Ricardo Rodrigues <contato@luizrrodrigues.com.br>
Date: Tue, 1 Jun 2021 05:09:02 -0300
Subject: [PATCH 8/8] ci: Deploy thrive-bug-fixes to Beta env

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5c775d3f96..7ee773c7e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -353,14 +353,14 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - thrive-bug-fixes
       # This is stage env for production QA releases
       - deployStag:
           context : org-global         
           filters:
             branches:
               only:
-                - thrive-bug-fixes
+                - free
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration