From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Nov 2023 15:40:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4345'
X-Git-Tag: live~1454
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ab54ab95b70afea238040a7401060cb6d4f429a8?hp=4022d84ccb1640c19ea0f380ac8a7ed8f3f4c0cb

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

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index a65934d02..69d625eca 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -48,7 +48,7 @@ OSM.initializeBrowse = function (map) {
 
   function displayFeatureWarning(count, limit, add, cancel) {
     $("#browse_status").html(
-      $("<div>").append(
+      $("<div class='p-3'>").append(
         $("<div class='d-flex'>").append(
           $("<h2 class='flex-grow-1 text-break'>")
             .text(I18n.t("browse.start_rjs.load_data")),
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 44ac1a8d7..1a3e9daca 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -393,10 +393,6 @@ body.small-nav {
     #sidebar_loader {
       display: none;
     }
-
-    #sidebar_content {
-      padding: $spacer;
-    }
   }
 
   .overlay-sidebar #sidebar {
@@ -581,10 +577,6 @@ body.small-nav {
     margin-left: auto;
     margin-right: auto;
   }
-
-  > div {
-   padding: $spacer;
-  }
 }
 
 /* Temporary label size override until we remove site-wide font customisation */
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 62b6acf43..55066f25f 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -36,7 +36,7 @@
       </div>
     </div>
 
-    <div id="sidebar_content">
+    <div id="sidebar_content" class="p-3">
       <%= yield %>
     </div>