From: Tom Hughes <tom@compton.nu>
Date: Sun, 15 Sep 2024 18:08:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5214'
X-Git-Tag: live~689
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3025500b9cf904593a504992357fcebb22e806ee?hp=ed74bc036b3203bb14c3fbb986c077f2958d004d

Merge remote-tracking branch 'upstream/pull/5214'
---

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 5aef4e7ca..9ea384811 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -92,7 +92,7 @@ module BrowseHelper
     end
     link_classes = ["page-link", { "px-1" => width > max_width_for_default_padding }]
 
-    tag.ul :class => "pagination pagination-sm mb-1 ms-auto" do
+    tag.ul :class => "pagination pagination-sm mb-2" do
       pagination_items(pages, {}).each do |body, page_or_class|
         linked = !(page_or_class.is_a? String)
         link = if linked
diff --git a/app/views/changesets/_paging_nav.html.erb b/app/views/changesets/_paging_nav.html.erb
index fbdf1d507..058738222 100644
--- a/app/views/changesets/_paging_nav.html.erb
+++ b/app/views/changesets/_paging_nav.html.erb
@@ -1,11 +1,9 @@
-<div class="d-flex flex-wrap gap-2">
-  <h4 class="fs-5 mb-0"><%= type_and_paginated_count(type, pages) %></h4>
-  <% if pages.page_count > 1 %>
-    <%= sidebar_classic_pagination(pages, "#{type}_page") do |page|
-          {
-            :title => type_and_paginated_count(type, pages, page),
-            :data => { :turbo => "true" }
-          }
-        end %>
-  <% end %>
-</div>
+<h4 class="fs-5"><%= type_and_paginated_count(type, pages) %></h4>
+<% if pages.page_count > 1 %>
+  <%= sidebar_classic_pagination(pages, "#{type}_page") do |page|
+        {
+          :title => type_and_paginated_count(type, pages, page),
+          :data => { :turbo => "true" }
+        }
+      end %>
+<% end %>