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

This commit is contained in:
Tom Hughes 2023-11-13 18:39:32 +00:00
commit b8609d2eae
2 changed files with 13 additions and 20 deletions

View file

@ -428,11 +428,6 @@ body.small-nav {
.welcome {
display: none;
p {
font-size: 110%;
font-weight: 300;
}
}
#banner {

View file

@ -43,21 +43,19 @@
<% unless current_user %>
<div class="welcome p-3" hidden>
<%= render "sidebar_header", :title => t("layouts.intro_header") %>
<div>
<p><%= t "layouts.intro_text" %></p>
<p><%= t "layouts.hosting_partners_html",
:ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
:fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
:bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
: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>
<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"),
:fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
:bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
: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>
</div>