From f7fc1bd4b865c2eedbbab019e232d042205ddb10 Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Fri, 25 Sep 2020 08:51:33 +0200
Subject: [PATCH 1/2] wrap all buttons in btn-group to improve styling

---
 .../tmpl/category/default_articles.php        | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php
index 53aed65489830..8f3faa458e982 100644
--- a/components/com_content/tmpl/category/default_articles.php
+++ b/components/com_content/tmpl/category/default_articles.php
@@ -68,8 +68,8 @@
 <?php if ($this->params->get('filter_field') !== 'hide' || $this->params->get('show_pagination_limit')) : ?>
 	<fieldset class="com-content-category__filters filters btn-toolbar clearfix">
 		<legend class="hidden-xs-up"><?php echo Text::_('COM_CONTENT_FORM_FILTER_LEGEND'); ?></legend>
-		<?php if ($this->params->get('filter_field') !== 'hide') : ?>
-			<div class="btn-group">
+		<div class="btn-group">
+			<?php if ($this->params->get('filter_field') !== 'hide') : ?>
 				<?php if ($this->params->get('filter_field') === 'tag') : ?>
 					<select name="filter_tag" id="filter_tag" onchange="document.adminForm.submit();" >
 						<option value=""><?php echo Text::_('JOPTION_SELECT_TAG'); ?></option>
@@ -86,28 +86,29 @@
 					</label>
 					<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo Text::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo Text::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL'); ?>">
 				<?php endif; ?>
+			<?php endif; ?>
+			
+			<?php if ($this->params->get('show_pagination_limit')) : ?>
+				<div class="com-content-category__pagination btn-group float-right">
+					<label for="limit" class="sr-only">
+						<?php echo Text::_('JGLOBAL_DISPLAY_NUM'); ?>
+					</label>
+					<?php echo $this->pagination->getLimitBox(); ?>
+				</div>
+			<?php endif; ?>
+
+			<div class="com-content-category__filter-submit control-group hidden-xs-up float-right">
+				<div class="controls">
+					<button type="submit" name="filter_submit" class="btn btn-primary"><?php echo Text::_('COM_CONTENT_FORM_FILTER_SUBMIT'); ?></button>
+				</div>
 			</div>
-		<?php endif; ?>
-		<?php if ($this->params->get('show_pagination_limit')) : ?>
-			<div class="com-content-category__pagination btn-group float-right">
-				<label for="limit" class="sr-only">
-					<?php echo Text::_('JGLOBAL_DISPLAY_NUM'); ?>
-				</label>
-				<?php echo $this->pagination->getLimitBox(); ?>
-			</div>
-		<?php endif; ?>
+		</div>
 
 		<input type="hidden" name="filter_order" value="">
 		<input type="hidden" name="filter_order_Dir" value="">
 		<input type="hidden" name="limitstart" value="">
 		<input type="hidden" name="task" value="">
 	</fieldset>
-
-	<div class="com-content-category__filter-submit control-group hidden-xs-up float-right">
-		<div class="controls">
-			<button type="submit" name="filter_submit" class="btn btn-primary"><?php echo Text::_('COM_CONTENT_FORM_FILTER_SUBMIT'); ?></button>
-		</div>
-	</div>
 <?php endif; ?>
 
 <?php if (empty($this->items)) : ?>

From f74fdb1a3c3ff34242823d7c433560e1f9eeb80e Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Fri, 25 Sep 2020 11:35:56 +0200
Subject: [PATCH 2/2] add if-then statement to hide button if not needed

---
 .../com_content/tmpl/category/default_articles.php   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php
index 8f3faa458e982..6d9cbc01b9648 100644
--- a/components/com_content/tmpl/category/default_articles.php
+++ b/components/com_content/tmpl/category/default_articles.php
@@ -96,12 +96,14 @@
 					<?php echo $this->pagination->getLimitBox(); ?>
 				</div>
 			<?php endif; ?>
-
-			<div class="com-content-category__filter-submit control-group hidden-xs-up float-right">
-				<div class="controls">
-					<button type="submit" name="filter_submit" class="btn btn-primary"><?php echo Text::_('COM_CONTENT_FORM_FILTER_SUBMIT'); ?></button>
+			
+			<?php if ($this->params->get('filter_field') !== 'hide') : ?>
+				<div class="com-content-category__filter-submit control-group hidden-xs-up float-right">
+					<div class="controls">
+						<button type="submit" name="filter_submit" class="btn btn-primary"><?php echo Text::_('COM_CONTENT_FORM_FILTER_SUBMIT'); ?></button>
+					</div>
 				</div>
-			</div>
+			<?php endif; ?>
 		</div>
 
 		<input type="hidden" name="filter_order" value="">