From: Tom Hughes <tom@compton.nu>
Date: Mon, 13 Nov 2023 18:44:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4343'
X-Git-Tag: live~1502
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4ed7387551b328a712959098a2eeeadf128ff225?hp=afc8dad0b6fb046e7fddf382879cddd99c2e4f78

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 3edeeb4d8..44ac1a8d7 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -318,14 +318,6 @@ body.small-nav {
   font-weight: $font-weight-normal;
 }
 
-/* Rules for the message shown in place of the map when javascript is disabled */
-
-#noscript {
-  z-index: 20000000;
-  margin-left: 400px;
-  margin-top: 50px;
-}
-
 /* Rules for Leaflet maps */
 
 .leaflet-top.leaflet-right,
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 646c22dea..62b6acf43 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -65,7 +65,7 @@
   </div>
 
   <noscript>
-    <div id="noscript">
+    <div class="mt-5 p-3">
       <p><%= t "site.index.js_1" %></p>
       <p><%= t "site.index.js_2" %></p>
     </div>