From 09bde1a070170b9a4806ec2a507a42536995f71d Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Sat, 4 Jul 2026 01:10:57 +0200
Subject: [PATCH] Migrate map float layout to flex layout

---
 app/assets/stylesheets/common.scss | 8 ++++++--
 app/views/layouts/map.html.erb     | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 989fa5e58..9a11400f9 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -234,6 +234,8 @@ nav.primary, nav.secondary {
     top: $headerHeight;
     bottom: 0;
     width: 100%;
+    display: flex;
+    flex-direction: column;
   }
 
   #sidebar, #map, #map-ui {
@@ -243,7 +245,6 @@ nav.primary, nav.secondary {
   }
 
   #sidebar {
-    float: left;
     overflow-x: hidden;
     overflow-y: auto;
   }
@@ -299,11 +300,14 @@ nav.primary, nav.secondary {
 
   #map-ui {
     display: none;
-    float: right;
     overflow: auto;
   }
 
   @include media-breakpoint-up(md) {
+    #content {
+      flex-direction: row;
+    }
+
     #sidebar, #map, #map-ui {
       height: 100%;
     }
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 145fbdd45..4e1261898 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -9,7 +9,7 @@
 <% end %>
 
 <% content_for :content do %>
-  <div id="sidebar" class="bg-body z-1">
+  <div id="sidebar" class="bg-body flex-shrink-0 z-1">
     <%= render :partial => "layouts/search", :locals => { :autofocus => true, :extra_classes => ["d-none d-md-block"] } %>
 
     <div id="flash">
@@ -59,7 +59,7 @@
     </div>
   </noscript>
 
-  <div id="map-ui" class="bg-body z-2">
+  <div id="map-ui" class="bg-body flex-shrink-0 order-md-1 z-2">
     <%= render :partial => "layouts/sidebar_close" %>
   </div>
 
-- 
2.47.3