From 51a331ed57f9334c688295506671c58a90b7661e Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Fri, 16 Oct 2020 12:12:54 +0200
Subject: [PATCH 01/10] PLANET-5501 Update styleguide

---
 assets/src/scss/styleguide | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/src/scss/styleguide b/assets/src/scss/styleguide
index 2da140510f..49115ad76a 160000
--- a/assets/src/scss/styleguide
+++ b/assets/src/scss/styleguide
@@ -1 +1 @@
-Subproject commit 2da140510fb8314cdd2249d92334eedf6927c124
+Subproject commit 49115ad76a14c7d5ef193b4ffec175dbbfadf070

From 249093149751def6ba3b1ef77d5849c77ba0d151 Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Mon, 19 Oct 2020 15:53:34 +0200
Subject: [PATCH 02/10] PLANET-5501 Update Donate button default text

---
 src/MasterSite.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MasterSite.php b/src/MasterSite.php
index 746620ea2c..01408d5a34 100644
--- a/src/MasterSite.php
+++ b/src/MasterSite.php
@@ -473,7 +473,7 @@ public function add_to_context( $context ) {
 		}
 
 		$context['donatelink']           = $options['donate_button'] ?? '#';
-		$context['donatetext']           = $options['donate_text'] ?? __( 'DONATE', 'planet4-master-theme' );
+		$context['donatetext']           = $options['donate_text'] ?? __( 'Donate', 'planet4-master-theme' );
 		$context['website_navbar_title'] = $options['website_navigation_title'] ?? __( 'International (English)', 'planet4-master-theme' );
 		if ( is_front_page() && isset( $options['donate_btn_visible_on_mobile'] ) && $options['donate_btn_visible_on_mobile'] ) {
 			$context['enhanced_donate_btn_class'] = 'btn-enhanced-donate';

From 7cb5268fa04a6bfcc308de0dca0e3a8348d075a6 Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Mon, 19 Oct 2020 16:34:01 +0200
Subject: [PATCH 03/10] PLANET-5501 Update Cookies button text

---
 templates/cookies.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/cookies.twig b/templates/cookies.twig
index e2cf80dabf..5ca2912905 100644
--- a/templates/cookies.twig
+++ b/templates/cookies.twig
@@ -3,6 +3,6 @@
 		<div>
 			{{ cookies.text|e('wp_kses_post')|raw }}
 		</div>
-		<button class="btn p-0" id="hidecookie">{{ __( 'GOT IT!', 'planet4-master-theme' ) }}</button>
+		<button class="btn p-0" id="hidecookie">{{ __( 'Got it!', 'planet4-master-theme' ) }}</button>
 	</div>
 {% endif %}

From 8196c12952ae45f09ed3412268c7e7944ec33940 Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Tue, 20 Oct 2020 14:22:03 +0200
Subject: [PATCH 04/10] PLANET-5501 Remove btn-medium class

---
 templates/author.twig        |  2 +-
 templates/blocks/header.twig |  2 +-
 templates/search.twig        | 12 ++++++------
 templates/taxonomy.twig      |  2 +-
 templates/tease-search.twig  |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/author.twig b/templates/author.twig
index 8b44eae352..937a7e4cee 100644
--- a/templates/author.twig
+++ b/templates/author.twig
@@ -53,7 +53,7 @@
 						data-page="1"
 						data-total="{{ posts.pagination.total }}"
 						data-url="{{ author.path }}"
-						class="load-more-mt btn btn-medium btn-small btn-secondary mb-5"
+						class="load-more-mt btn btn-small btn-secondary mb-5"
 						data-ga-category="Articles List"
 						data-ga-action="Load More Button"
 						data-ga-label="n/a">
diff --git a/templates/blocks/header.twig b/templates/blocks/header.twig
index 7c3484a780..7f51571b7f 100644
--- a/templates/blocks/header.twig
+++ b/templates/blocks/header.twig
@@ -66,7 +66,7 @@
 							{% if ( header_button_link_checkbox ) %}
 								target="_blank"
 							{% endif %}
-								class="btn btn-primary btn-medium page-header-btn"
+								class="btn btn-primary page-header-btn"
 								data-ga-category="Header"
 								data-ga-action="Call to Action"
 								data-ga-label="n/a">
diff --git a/templates/search.twig b/templates/search.twig
index 888a43fa95..82c3c29058 100644
--- a/templates/search.twig
+++ b/templates/search.twig
@@ -38,15 +38,15 @@
 								{% if ( source_selection ) %}
 									<div class="col-md-4">
 										<div class="btn-group btn-block" role="group" aria-label="" id="search-type">
-											<button type="button" class="btn btn-secondary btn-medium active">{{ __('This Site', 'planet4-master-theme' ) }}</button>
-											<button type="button" class="btn btn-secondary btn-medium">{{ __( 'Archive', 'planet4-master-theme' ) }}</button>
+											<button type="button" class="btn btn-secondary active">{{ __('This Site', 'planet4-master-theme' ) }}</button>
+											<button type="button" class="btn btn-secondary">{{ __( 'Archive', 'planet4-master-theme' ) }}</button>
 										</div>
 									</div>
 								{% endif %}
 								<div class="col-md-3">
 									<button
 										type="submit"
-										class="btn btn-primary btn-medium search-btn btn-block"
+										class="btn btn-primary search-btn btn-block"
 										data-ga-category="Search Page"
 										data-ga-action="Search Button"
 										data-ga-label="n/a" >
@@ -205,8 +205,8 @@
 											</div>
 										</div>
 										<div class="btnact">
-											<button type="button" class="btn btn-action btn-medium btn-small cancelbtn" data-dismiss="modal">{{ __( 'Cancel', 'planet4-master-theme' ) }}</button>
-											<button type="button" class="btn btn-primary btn-medium btn-small applybtn">{{ __( 'Apply Filters', 'planet4-master-theme' ) }}</button>
+											<button type="button" class="btn btn-action btn-small cancelbtn" data-dismiss="modal">{{ __( 'Cancel', 'planet4-master-theme' ) }}</button>
+											<button type="button" class="btn btn-primary btn-small applybtn">{{ __( 'Apply Filters', 'planet4-master-theme' ) }}</button>
 										</div>
 									</div>
 								</div>
@@ -374,7 +374,7 @@
 							{% if ( load_more and found_posts > paged_posts|length ) %}
 								<div class="col-lg-12 mb-5 load-more-button-div">
 									<button
-										class="btn btn-medium btn-small btn-secondary more-btn {{ load_more.async ? 'btn-load-more-async' : '' }} btn-load-more-click-scroll"
+										class="btn btn-small btn-secondary more-btn {{ load_more.async ? 'btn-load-more-async' : '' }} btn-load-more-click-scroll"
 										data-current_page="{{ current_page }}"
 										data-total_posts="{{ found_posts }}"
 										data-posts_per_load="{{ load_more.posts_per_load }}"
diff --git a/templates/taxonomy.twig b/templates/taxonomy.twig
index d58227bdcf..a7335eed41 100644
--- a/templates/taxonomy.twig
+++ b/templates/taxonomy.twig
@@ -35,7 +35,7 @@
 						data-page="1"
 						data-total="{{ posts.pagination.total }}"
 						data-url="{{ fn('get_term_link', taxonomy.term_id ) }}"
-						class="load-more-mt btn btn-medium btn-small btn-secondary mb-5"
+						class="load-more-mt btn btn-small btn-secondary mb-5"
 						data-ga-category="Articles List"
 						data-ga-action="Load More Button"
 						data-ga-label="n/a">
diff --git a/templates/tease-search.twig b/templates/tease-search.twig
index 1779f229c5..e204c3d471 100644
--- a/templates/tease-search.twig
+++ b/templates/tease-search.twig
@@ -117,7 +117,7 @@
 						{%  set link_text = settings['take_action_covers_button_text'] %}
 						<a
 							href="{{ post.link }}"
-							class="btn btn-primary btn-medium btn-small"
+							class="btn btn-primary btn-small"
 							data-ga-category="Search Results"
 							data-ga-action="Call to Action"
 							data-ga-label="{{ ga_page_type }}">

From 318ca7fdb9361428fa6baf58dc508caa9bd9e456 Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Tue, 20 Oct 2020 16:19:50 +0200
Subject: [PATCH 05/10] PLANET-5501 Remove source_selection and btn-secondary
 from search bar

---
 assets/src/scss/pages/search/_search-bar.scss | 55 +------------------
 src/Search.php                                |  1 -
 templates/search.twig                         | 10 +---
 3 files changed, 3 insertions(+), 63 deletions(-)

diff --git a/assets/src/scss/pages/search/_search-bar.scss b/assets/src/scss/pages/search/_search-bar.scss
index dea4197f19..7476d16870 100644
--- a/assets/src/scss/pages/search/_search-bar.scss
+++ b/assets/src/scss/pages/search/_search-bar.scss
@@ -21,55 +21,8 @@
     }
   }
 
-  .btn-secondary {
-    background-color: transparentize($white, .8);
-    border-color: $grey-20;
-    color: $grey-80;
-    text-transform: capitalize;
-    width: 50%;
-    cursor: pointer;
-    margin-bottom: 10px;
-
-    @include small-and-up {
-      margin-bottom: 0;
-    }
-
-    &.active {
-      background-color: $dark-blue;
-      border-color: transparent;
-      color: $white;
-
-      &:before {
-        content: "";
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 8px;
-        height: 8px;
-        background-color: $white;
-        margin-top: 18px;
-        margin-left: 5px;
-
-        @include large-and-up {
-          margin-top: 25px;
-          margin-left: 12px;
-        }
-      }
-
-      &:hover {
-        z-index: 2;
-        background-color: $dark-blue;
-      }
-    }
-
-    &:hover {
-      z-index: 0;
-      background-color: $grey-20;
-    }
-  }
-
-  .search-btn,
-  .btn-secondary {
+  .search-btn {
+    box-shadow: 0 8px 15px rgba(0, 0, 0, 0.1);
     font-size: $font-size-sm;
     line-height: 2.75;
 
@@ -89,8 +42,4 @@
       }
     }
   }
-
-  .search-btn {
-    box-shadow: 0 8px 15px rgba(0, 0, 0, 0.1);
-  }
 }
diff --git a/src/Search.php b/src/Search.php
index cf503f9a90..d99c63d0a4 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -693,7 +693,6 @@ protected function set_general_context( &$context ) {
 		$context['default_sort']     = self::DEFAULT_SORT;
 		$context['filters']          = $this->filters;
 		$context['found_posts']      = $this->total_matches;
-		$context['source_selection'] = false;
 		$context['page_category']    = 'Search Page';
 		$context['sort_options']     = [
 			'_score'    => [
diff --git a/templates/search.twig b/templates/search.twig
index 82c3c29058..048aa59298 100644
--- a/templates/search.twig
+++ b/templates/search.twig
@@ -31,18 +31,10 @@
 					<div class="search-bar">
 						<form id="search_form_inner" role="search" class="form" action="{{ data_nav_bar.home_url }}">
 							<div class="row">
-								<div class="{{ source_selection ? 'col-md-5' : 'col-md-9' }}">
+								<div class="col-md-9">
 									<input type="search" class="form-control mb-2 mb-sm-0" placeholder="{{ search_label }}" value="{{ search_query|e('wp_kses_post')|raw }}" name="s" aria-label="Search">
 									<input type="hidden" name="orderby" value="{{ selected_sort ?? default_sort }}" />
 								</div>
-								{% if ( source_selection ) %}
-									<div class="col-md-4">
-										<div class="btn-group btn-block" role="group" aria-label="" id="search-type">
-											<button type="button" class="btn btn-secondary active">{{ __('This Site', 'planet4-master-theme' ) }}</button>
-											<button type="button" class="btn btn-secondary">{{ __( 'Archive', 'planet4-master-theme' ) }}</button>
-										</div>
-									</div>
-								{% endif %}
 								<div class="col-md-3">
 									<button
 										type="submit"

From 36017e39a4da73d5aaf2de7036d4fbeebaf8a0b6 Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Wed, 21 Oct 2020 10:14:02 +0200
Subject: [PATCH 06/10] PLANET-5501 Update search load more button text

---
 src/Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Search.php b/src/Search.php
index d99c63d0a4..daba0e74a1 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -1071,7 +1071,7 @@ public function add_load_more( $args = null ) {
 		$this->context['load_more'] = $args ?? [
 			'posts_per_load' => self::POSTS_PER_LOAD,
 			// Translators: %s = number of results per page.
-			'button_text'    => sprintf( __( 'SHOW %s MORE RESULTS', 'planet4-master-theme' ), self::POSTS_PER_LOAD ),
+			'button_text'    => sprintf( __( 'Show %s more results', 'planet4-master-theme' ), self::POSTS_PER_LOAD ),
 			'async'          => true,
 		];
 	}

From 3867d93a16bb969bbdb83742876613d4f99cd626 Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Wed, 21 Oct 2020 10:30:08 +0200
Subject: [PATCH 07/10] PLANET-5501 Remove btn-small class from search load
 more button

---
 templates/search.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/search.twig b/templates/search.twig
index 048aa59298..8b58e1a535 100644
--- a/templates/search.twig
+++ b/templates/search.twig
@@ -366,7 +366,7 @@
 							{% if ( load_more and found_posts > paged_posts|length ) %}
 								<div class="col-lg-12 mb-5 load-more-button-div">
 									<button
-										class="btn btn-small btn-secondary more-btn {{ load_more.async ? 'btn-load-more-async' : '' }} btn-load-more-click-scroll"
+										class="btn btn-secondary more-btn {{ load_more.async ? 'btn-load-more-async' : '' }} btn-load-more-click-scroll"
 										data-current_page="{{ current_page }}"
 										data-total_posts="{{ found_posts }}"
 										data-posts_per_load="{{ load_more.posts_per_load }}"

From e38d1afd7a50a590a346ed454cebbac12ad837f0 Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Wed, 21 Oct 2020 10:34:26 +0200
Subject: [PATCH 08/10] PLANET-5501 Remove search filter button style overrides

---
 assets/src/scss/pages/search/_filter-sidebar.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/assets/src/scss/pages/search/_filter-sidebar.scss b/assets/src/scss/pages/search/_filter-sidebar.scss
index fc2a7b53e6..73d577f773 100644
--- a/assets/src/scss/pages/search/_filter-sidebar.scss
+++ b/assets/src/scss/pages/search/_filter-sidebar.scss
@@ -137,14 +137,11 @@
     }
 
     .btn-filter {
-      font-size: $font-size-sm;
       height: 40px;
       width: 130px;
       line-height: 40px;
       background: $orange;
-      font-weight: bold;
       padding: 0 $n10;
-      text-transform: uppercase;
       color: $white;
 
       &:hover {

From a26f2b602ee51fb27d32820c70f83bae02925a13 Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Wed, 21 Oct 2020 11:44:52 +0200
Subject: [PATCH 09/10] PLANET-5501 Remove search bar button style overrides

---
 assets/src/scss/pages/search/_search-bar.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/assets/src/scss/pages/search/_search-bar.scss b/assets/src/scss/pages/search/_search-bar.scss
index 7476d16870..a837230502 100644
--- a/assets/src/scss/pages/search/_search-bar.scss
+++ b/assets/src/scss/pages/search/_search-bar.scss
@@ -22,12 +22,11 @@
   }
 
   .search-btn {
-    box-shadow: 0 8px 15px rgba(0, 0, 0, 0.1);
     font-size: $font-size-sm;
     line-height: 2.75;
 
     @include large-and-up {
-      font-size: 1.125rem;
+      margin-top: 2px;
       line-height: 3;
     }
 

From cefcdd14d50dbf0c1b705e7777936282c60a7c1c Mon Sep 17 00:00:00 2001
From: Maud Leray <maudleray035@gmail.com>
Date: Fri, 23 Oct 2020 10:17:38 +0200
Subject: [PATCH 10/10] PLANET-5501 Make cookies button secondary

---
 src/Search.php         | 20 ++++++++++----------
 templates/cookies.twig |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Search.php b/src/Search.php
index daba0e74a1..836aa61816 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -685,16 +685,16 @@ protected function set_context( &$context ) {
 	protected function set_general_context( &$context ) {
 
 		// Search context.
-		$context['posts']            = $this->posts;
-		$context['paged_posts']      = $this->paged_posts;
-		$context['current_page']     = $this->current_page;
-		$context['search_query']     = $this->search_query;
-		$context['selected_sort']    = $this->selected_sort;
-		$context['default_sort']     = self::DEFAULT_SORT;
-		$context['filters']          = $this->filters;
-		$context['found_posts']      = $this->total_matches;
-		$context['page_category']    = 'Search Page';
-		$context['sort_options']     = [
+		$context['posts']         = $this->posts;
+		$context['paged_posts']   = $this->paged_posts;
+		$context['current_page']  = $this->current_page;
+		$context['search_query']  = $this->search_query;
+		$context['selected_sort'] = $this->selected_sort;
+		$context['default_sort']  = self::DEFAULT_SORT;
+		$context['filters']       = $this->filters;
+		$context['found_posts']   = $this->total_matches;
+		$context['page_category'] = 'Search Page';
+		$context['sort_options']  = [
 			'_score'    => [
 				'name'  => __( 'Most relevant', 'planet4-master-theme' ),
 				'order' => 'DESC',
diff --git a/templates/cookies.twig b/templates/cookies.twig
index 5ca2912905..f952c39068 100644
--- a/templates/cookies.twig
+++ b/templates/cookies.twig
@@ -3,6 +3,6 @@
 		<div>
 			{{ cookies.text|e('wp_kses_post')|raw }}
 		</div>
-		<button class="btn p-0" id="hidecookie">{{ __( 'Got it!', 'planet4-master-theme' ) }}</button>
+		<button class="btn btn-secondary p-0" id="hidecookie">{{ __( 'Got it!', 'planet4-master-theme' ) }}</button>
 	</div>
 {% endif %}