Use Bootstrap to set z-indexes of map-overlapping ui

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1ccdc7871454547b94623c1f393e469a1c222e1f..b40c60835401d509586e8d5797e6ac0507132533 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -90,7 +90,6 @@ time[title] {
 header {
   height: $headerHeight;
   position: relative;
 header {
   height: $headerHeight;
   position: relative;

-  z-index: 1001;

   font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li {
   font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li {


@@ -329,7 +328,6 @@ body.small-nav {
 
   .overlay-sidebar #sidebar {
     position: absolute;
 
   .overlay-sidebar #sidebar {
     position: absolute;

-    z-index: 1000;

     height: auto;
     overflow: hidden;
 
     height: auto;
     overflow: hidden;
 


@@ -396,7 +394,6 @@ body.small-nav {
     }
 
     #map-ui {
     }
 
     #map-ui {

-      z-index: 9999;

       width: 100%;
       height: 50%;
       overflow-y: scroll;
       width: 100%;
       height: 50%;
       overflow-y: scroll;

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d5b6a9e01a4e303b7637f38681dbea1c6190553c..9f3d01b02590d1ac1655f4acd43069e38dc212c6 100644 (file)
--- 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" %>
   <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 310a976336b61f11871b1c1df8388b5f8cf8ca28..bcbe2096803e6117f1733f5f563cad1a1442fea3 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -21,7 +21,7 @@
 <% end %>
 
 <% content_for :content do %>
 <% 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">
     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
     <div id="flash">


@@ -66,7 +66,7 @@
     </div>
   </noscript>
 
     </div>
   </noscript>
 

-  <div id="map-ui" class="bg-body">
+  <div id="map-ui" class="bg-body z-2">

   </div>
 
   <div id="map" tabindex="2" class="z-0">
   </div>
 
   <div id="map" tabindex="2" class="z-0">