From: Andy Allan Date: Wed, 19 Oct 2022 14:58:17 +0000 (+0100) Subject: Merge pull request #3700 from AntonKhorev/about X-Git-Tag: live~1961 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b0a741412f3ea330272c827cf4a9c577498f8de9?ds=inline;hp=-c Merge pull request #3700 from AntonKhorev/about Replace
used to set the font size with Bootstrap class h5 --- b0a741412f3ea330272c827cf4a9c577498f8de9 diff --combined app/views/site/about.html.erb index abf4c60c8,151be7ccf..5011523e1 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@@ -3,7 -3,7 +3,7 @@@
-
<%= t ".copyright_html", :locale => @locale %>
+

<%= t ".copyright_html", :locale => @locale %>

@@@ -14,32 -14,36 +14,32 @@@
-
-

<%= t ".lede_text", :locale => @locale %>

-

<%= t ".local_knowledge_title", :locale => @locale %>

-

<%= t ".local_knowledge_html", :locale => @locale %>

-
+

<%= t ".lede_text", :locale => @locale %>

-
-

<%= t ".community_driven_title", :locale => @locale %>

-

<%= t ".community_driven_html", :locale => @locale, :diary_path => diary_entries_path %>

-
+ <%= render :layout => "about_section", :locals => { :icon => "local", :title => "local_knowledge" } do %> +

<%= t "site.about.local_knowledge_html", :locale => @locale %>

+ <% end %> -
-

<%= t ".open_data_title", :locale => @locale %>

-

<%= t ".open_data_html", :locale => @locale, :copyright_path => copyright_path %>

-
+ <%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %> +

<%= t "site.about.community_driven_html", :locale => @locale, :diary_path => diary_entries_path %>

+ <% end %> - + <%= render :layout => "about_section", :locals => { :id => "open-data", :icon => "open", :title => "open_data" } do %> +

<%= t "site.about.open_data_html", :locale => @locale, :copyright_path => copyright_path %>

+ <% end %> + + <%= render :layout => "about_section", :locals => { :id => "legal", :icon => "legal", :title => "legal" } do %> +

<%= t "site.about.legal_1_html", :locale => @locale %>

+

<%= t "site.about.legal_2_html", :locale => @locale %>

+ <% end %> -
-

<%= t ".partners_title", :locale => @locale %>

+ <%= render :layout => "about_section", :locals => { :id => "partners", :icon => "partners", :title => "partners" } do %>

<%= t "layouts.hosting_partners_html", :locale => @locale, :ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"), :fastly => link_to(t("layouts.partners_fastly", :locale => @locale), "https://www.fastly.com/"), :bytemark => link_to(t("layouts.partners_bytemark", :locale => @locale), "https://www.bytemark.co.uk"), :partners => link_to(t("layouts.partners_partners", :locale => @locale), "https://hardware.openstreetmap.org/thanks/") %>

-
+ <% end %>
<% end %>