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

diff --combined app/assets/stylesheets/common.scss
index 3edeeb4d8fcfbc6edcd6b01cd3e9409080c3355e,864b075bb2b11e4b4fae1c37c93c399910613d8d..44ac1a8d710dea4135953ddac4fc58ee991cf318
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -318,14 -318,6 +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,
@@@ -405,6 -397,10 +397,6 @@@
      #sidebar_content {
        padding: $spacer;
      }
 -
 -    > div {
 -      position: relative;
 -    }
    }
  
    .overlay-sidebar #sidebar {
@@@ -428,6 -424,11 +420,6 @@@
  
    .welcome {
      display: none;
 -
 -    p {
 -      font-size: 110%;
 -      font-weight: 300;
 -    }
    }
  
    #banner {
@@@ -843,6 -844,11 +835,6 @@@ tr.turn:hover 
      bottom: 0;
      width: 100%;
    }
 -
 -  #map {
 -    height: 100%;
 -    overflow: hidden;
 -  }
  }
  
  /* Rules for non-map content pages */
@@@ -901,6 -907,15 +893,6 @@@
    }
  }
  
 -#content.maximised {
 -  top: 0;
 -  left: 0;
 -  right: 0;
 -  bottom: 0;
 -  border: 0;
 -  z-index: 2000;
 -}
 -
  /* Rules for small maps in content areas */
  
  .content_map {
@@@ -1079,6 -1094,13 +1071,6 @@@ div.secondary-actions 
    }
  }
  
 -/* Rules for the iD editor */
 -
 -.id-embed {
 -  width: 100%;
 -  height: 100%;
 -}
 -
  /* Rules for the "Welcome" page */
  .site-welcome, .site-fixthemap {
    .sprite {

diff --combined app/views/layouts/map.html.erb
index 646c22dea4fca3258f5600634d5cb6178415a622,a4e1891ffcb7173bc41fc772f1e3a620b1b4596f..62b6acf4301437de6e476e9248c4f528be4e9de1
--- 1/app/views/layouts/map.html.erb
--- 2/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@@ -43,19 -43,21 +43,19 @@@
      <% unless current_user %>
        <div class="welcome p-3" hidden>
          <%= render "sidebar_header", :title => t("layouts.intro_header") %>
 -        <div>
 -          <p><%= t "layouts.intro_text" %></p>
 -          <p><%= t "layouts.hosting_partners_html",
 -                   :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
 -                   :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
 -                   :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
 -                   :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
 -          </p>
 -          <div class="d-flex mx-n1">
 -            <div class="w-50 px-1">
 -              <a class="btn btn-primary w-100" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
 -            </div>
 -            <div class="w-50 px-1">
 -              <a class="btn btn-primary w-100" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
 -            </div>
 +        <p class="fs-6 fw-light"><%= t "layouts.intro_text" %></p>
 +        <p class="fs-6 fw-light"><%= t "layouts.hosting_partners_html",
 +                                       :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
 +                                       :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
 +                                       :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
 +                                       :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
 +        </p>
 +        <div class="d-flex mx-n1">
 +          <div class="w-50 px-1">
 +            <a class="btn btn-primary w-100" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
 +          </div>
 +          <div class="w-50 px-1">
 +            <a class="btn btn-primary w-100" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
            </div>
          </div>
        </div>
@@@ -65,7 -67,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>