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

This commit is contained in:
Tom Hughes 2023-11-13 18:40:55 +00:00
commit 96ee97ff93
2 changed files with 2 additions and 14 deletions

View file

@ -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 {

View file

@ -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>