cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-04-12 18:06:59 +01:00
commit df77a93758
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/common.scss
View file

@ -90,7 +90,6 @@ time[title] {
header { header {
height: $headerHeight; height: $headerHeight;
position: relative; position: relative;
z-index: 1001;
font-size: 14px; font-size: 14px;
h1, nav, nav > ul, nav > ul > li { h1, nav, nav > ul, nav > ul > li {
@ -329,7 +328,6 @@ body.small-nav {
.overlay-sidebar #sidebar { .overlay-sidebar #sidebar {
position: absolute; position: absolute;
z-index: 1000;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
@ -396,7 +394,6 @@ body.small-nav {
} }
#map-ui { #map-ui {
z-index: 9999;
width: 100%; width: 100%;
height: 50%; height: 50%;
overflow-y: scroll; overflow-y: scroll;

2
app/views/layouts/_header.html.erb
View file

@ -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"> <h1 class="m-0 fw-semibold">
<a href="<%= root_path %>" class="text-body-emphasis text-decoration-none geolink"> <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" %> <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :width => 30, :height => 30, :class => "logo" %>

6
app/views/layouts/map.html.erb
View file

@ -21,7 +21,7 @@
<% end %> <% end %>
<% content_for :content do %> <% 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 } %> <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
<div id="flash"> <div id="flash">
@ -66,10 +66,10 @@
</div> </div>
</noscript> </noscript>
<div id="map-ui" class="bg-body"> <div id="map-ui" class="bg-body z-2">
</div> </div>
<div id="map" tabindex="2"> <div id="map" tabindex="2" class="z-0">
</div> </div>
<div id="attribution" class="d-none"> <div id="attribution" class="d-none">