From: Tom Hughes <tom@compton.nu>
Date: Mon, 13 Nov 2023 18:40:55 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4341'
X-Git-Tag: live~1451
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/96ee97ff93db3191459b5e15b7ba3da61f4d1748?hp=b8609d2eaec86c29d23a473e0f6892c73b70a5bf

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 563082f5d..7d620f7d3 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -843,11 +843,6 @@ tr.turn:hover {
     bottom: 0;
     width: 100%;
   }
-
-  #map {
-    height: 100%;
-    overflow: hidden;
-  }
 }
 
 /* Rules for non-map content pages */
@@ -1093,13 +1088,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 --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index c0ea3631b..0ba4200a8 100644
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,10 +1,10 @@
 <%= javascript_include_tag "edit/id" %>
 
-<div id="map">
+<div id="map" class="h-100 overflow-hidden">
   <% data = { :configured => Settings.key?(:id_application) }
      data[:lat] = @lat if @lat
      data[:lon] = @lon if @lon
      data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]
      data[:url] = id_url(:locale => params[:locale]) %>
-  <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
+  <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "w-100 h-100", :allowfullscreen => "", :data => data %>
 </div>