From: Tom Hughes <tom@compton.nu>
Date: Fri, 12 Apr 2024 17:06:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4686'
X-Git-Tag: live~183
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/df77a937587ea00a358f6858d4eb6a68c8254e32?hp=de18a0fe023304cd4f7b588c6b6b03e579895957

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 42046c0a6..629d26a81 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -90,7 +90,6 @@ time[title] {
 header {
   height: $headerHeight;
   position: relative;
-  z-index: 1001;
   font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li {
@@ -329,7 +328,6 @@ body.small-nav {
 
   .overlay-sidebar #sidebar {
     position: absolute;
-    z-index: 1000;
     height: auto;
     overflow: hidden;
 
@@ -396,7 +394,6 @@ body.small-nav {
     }
 
     #map-ui {
-      z-index: 9999;
       width: 100%;
       height: 50%;
       overflow-y: scroll;
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d5b6a9e01..9f3d01b02 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,4 +1,4 @@
-<header class="d-flex bg-body text-nowrap closed">
+<header class="d-flex bg-body text-nowrap closed z-3">
   <h1 class="m-0 fw-semibold">
     <a href="<%= root_path %>" class="text-body-emphasis text-decoration-none geolink">
       <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :width => 30, :height => 30, :class => "logo" %>
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 65ba2ee6a..bcbe20968 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -21,7 +21,7 @@
 <% end %>
 
 <% content_for :content do %>
-  <div id="sidebar" class="bg-body">
+  <div id="sidebar" class="bg-body z-1">
     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
     <div id="flash">
@@ -66,10 +66,10 @@
     </div>
   </noscript>
 
-  <div id="map-ui" class="bg-body">
+  <div id="map-ui" class="bg-body z-2">
   </div>
 
-  <div id="map" tabindex="2">
+  <div id="map" tabindex="2" class="z-0">
   </div>
 
   <div id="attribution" class="d-none">