From 95ea56bb890ec4c2a4c1f97594c3698c07068596 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 18 Oct 2021 09:09:01 -0700
Subject: [PATCH] Forum navigation layout fix.

---
 e107_core/templates/nextprev_template.php                 | 8 ++++----
 e107_plugins/forum/templates/forum_viewforum_template.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/e107_core/templates/nextprev_template.php b/e107_core/templates/nextprev_template.php
index afcdd926b..cd62b952b 100644
--- a/e107_core/templates/nextprev_template.php
+++ b/e107_core/templates/nextprev_template.php
@@ -146,7 +146,7 @@ $NEXTPREV_TEMPLATE['admin_separator'] = '&nbsp;';
 
 $NEXTPREV_TEMPLATE['dropdown_start'] = '
 <!-- Start of Next/Prev -->
-<div class="nextprev form-group form-inline input-group">';
+<div class="nextprev form-group form-inline input-group input-group-btn">';
 
 $NEXTPREV_TEMPLATE['dropdown_end'] = '</div>
 <!-- End of Next/Prev -->
@@ -159,12 +159,12 @@ $NEXTPREV_TEMPLATE['dropdown_nav_first'] = '';
 $NEXTPREV_TEMPLATE['dropdown_nav_last'] = '';
 
 // 'tbox npbutton' classes are deprecated!!!
-$NEXTPREV_TEMPLATE['dropdown_nav_prev'] = '<a class="btn btn-default btn-secondary nextprev-item prev tbox npbutton" href="{url}" title="{url_label}">{label}</a>&nbsp;';
+$NEXTPREV_TEMPLATE['dropdown_nav_prev'] = '<a class="btn btn-default btn-outline-secondary nextprev-item prev tbox npbutton" href="{url}" title="{url_label}">{label}</a>';
 // 'tbox npbutton' classes are deprecated!!!
-$NEXTPREV_TEMPLATE['dropdown_nav_next'] = '&nbsp;<a class="btn btn-default btn-secondary nextprev-item next tbox npbutton" href="{url}" title="{url_label}">{label}</a>';
+$NEXTPREV_TEMPLATE['dropdown_nav_next'] = '<a class="btn btn-default btn-outline-secondary nextprev-item next tbox npbutton" href="{url}" title="{url_label}">{label}</a>';
 
 // 'npdropdown' class is deprecated!!!
-$NEXTPREV_TEMPLATE['dropdown_items_start'] = '<select class="tbox npdropdown nextprev-select form-control" name="pageSelect" onchange="window.location.href=this.options[selectedIndex].value">';
+$NEXTPREV_TEMPLATE['dropdown_items_start'] = '<select class="tbox npdropdown nextprev-select form-control form-select" name="pageSelect" onchange="window.location.href=this.options[selectedIndex].value">';
 $NEXTPREV_TEMPLATE['dropdown_item'] = '<option value="{url}">{label}</option>';
 $NEXTPREV_TEMPLATE['dropdown_item_current'] = '<option value="{url}" selected="selected">{label}</option>';
 $NEXTPREV_TEMPLATE['dropdown_items_end'] = '</select>';
diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php
index b5f07457d..28c318363 100644
--- a/e107_plugins/forum/templates/forum_viewforum_template.php
+++ b/e107_plugins/forum/templates/forum_viewforum_template.php
@@ -350,7 +350,7 @@ $SC_WRAPPER['VIEWABLE_BY'] = "<div class='panel panel-default' style='margin-top
 $FORUM_VIEWFORUM_TEMPLATE['footer'] 				= "</table>
 												<div class='row row-fluid d-flex justify-content-between'>
 
-												<div class='col-md-5 span5 pull-left float-left float-start left'>{THREADPAGES}</div><div class='col-md-3 span3 pull-right float-right float-end right'>{NEWTHREADBUTTONX}</div>
+												<div class='col-md-5 col-lg-2 span5 pull-left float-left float-start left'>{THREADPAGES}</div><div class='col-md-3 span3 pull-right float-right float-end right'>{NEWTHREADBUTTONX}</div>
 
 												</div>