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

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index a65934d0227c3f53eee00c23e2e97d63d6628ce4..69d625ecab5420ca85f83bcb1a2a0895ef5ec44e 100644 (file)
--- 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 44ac1a8d710dea4135953ddac4fc58ee991cf318..1a3e9dacaa3ef21d7eff3952f623cdc138cfcbfe 100644 (file)
--- 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 62b6acf4301437de6e476e9248c4f528be4e9de1..55066f25f227e1bee738d23f7763c0895d1d298e 100644 (file)
--- 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>