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

[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 646c22dea4fca3258f5600634d5cb6178415a622..0630dace5bc0f93e3ebbbae7e646f7a216a5cc5f 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -21,7 +21,7 @@
 <% end %>
 
 <% content_for :content do %>
 <% end %>
 
 <% content_for :content do %>

-  <div id="sidebar">
+  <div id="sidebar" class="bg-body z-1">

     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
     <div id="flash">
     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
     <div id="flash">


@@ -36,7 +36,7 @@
       </div>
     </div>
 
       </div>
     </div>
 

-    <div id="sidebar_content">
+    <div id="sidebar_content" class="p-3">

       <%= yield %>
     </div>
 
       <%= yield %>
     </div>
 


@@ -44,19 +44,14 @@
       <div class="welcome p-3" hidden>
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
         <p class="fs-6 fw-light"><%= t "layouts.intro_text" %></p>
       <div class="welcome p-3" hidden>
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
         <p class="fs-6 fw-light"><%= t "layouts.intro_text" %></p>

-        <p class="fs-6 fw-light"><%= t "layouts.hosting_partners_html",
-                                       :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+        <p class="fs-6 fw-light"><%= t "layouts.hosting_partners_2024_html",

                                        :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
                                        :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),

-                                       :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
+                                       :corpmembers => link_to(t("layouts.partners_corpmembers"), "https://osmfoundation.org/wiki/Corporate_Members"),

                                        :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
         </p>
                                        :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
         </p>

-        <div class="d-flex mx-n1">
-          <div class="w-50 px-1">
-            <a class="btn btn-primary w-100" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
-          </div>
-          <div class="w-50 px-1">
-            <a class="btn btn-primary w-100" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
-          </div>
+        <div class="d-flex gap-2">
+          <a class="btn btn-primary w-100 d-flex align-items-center justify-content-center" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
+          <a class="btn btn-primary w-100 d-flex align-items-center justify-content-center" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>

         </div>
       </div>
     <% end %>
         </div>
       </div>
     <% end %>


@@ -65,16 +60,16 @@
   </div>
 
   <noscript>
   </div>
 
   <noscript>

-    <div id="noscript">
+    <div class="mt-5 p-3">

       <p><%= t "site.index.js_1" %></p>
       <p><%= t "site.index.js_2" %></p>
     </div>
   </noscript>
 
       <p><%= t "site.index.js_1" %></p>
       <p><%= t "site.index.js_2" %></p>
     </div>
   </noscript>
 

-  <div id="map-ui">
+  <div id="map-ui" class="bg-body z-2">

   </div>
 
   </div>
 

-  <div id="map" tabindex="2">
+  <div id="map" tabindex="2" class="bg-body-secondary z-0">

   </div>
 
   <div id="attribution" class="d-none">
   </div>
 
   <div id="attribution" class="d-none">