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

[rails.git] / app / views / layouts / map.html.erb

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 66d773f7db59bbeec4cc6e8dcac3f6fea4ab8642..62e979c05e48568c3868b461343da624f9988bb5 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -18,11 +18,7 @@
 
     <div id="browse_status"></div>
 
-    <div class="sidebar-close-controls">
-      <div class="position-absolute end-0 m-2">
-        <button type="button" class="btn-close d-block p-2" aria-label="<%= t("javascripts.close") %>"></button>
-      </div>
-    </div>
+    <%= render :partial => "layouts/sidebar_close" %>
 
     <div id="sidebar_loader" class="my-3 text-center loader" hidden>
       <div class="spinner-border" role="status">
@@ -30,7 +26,7 @@
       </div>
     </div>
 
-    <div id="sidebar_content" class="p-3">
+    <div id="sidebar_content" class="p-3 position-relative z-n1">
       <%= yield %>
     </div>
 
@@ -62,11 +58,7 @@
   </noscript>
 
   <div id="map-ui" class="bg-body z-2">
-    <div class="sidebar-close-controls">
-      <div class="position-absolute end-0 m-2">
-        <button type="button" class="btn-close d-block p-2" aria-label="<%= t("javascripts.close") %>"></button>
-      </div>
-    </div>
+    <%= render :partial => "layouts/sidebar_close" %>
   </div>
 
   <div id="map" tabindex="2" class="bg-body-secondary z-0">