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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 3edeeb4d8fcfbc6edcd6b01cd3e9409080c3355e..44ac1a8d710dea4135953ddac4fc58ee991cf318 100644 (file)
--- 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 646c22dea4fca3258f5600634d5cb6178415a622..62b6acf4301437de6e476e9248c4f528be4e9de1 100644 (file)
--- 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>