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

[rails.git] / app / views / site / about.html.erb

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index f495193a61e178760f84198941f21ddd9c3e0d8d..b4b21a567f177b28b5c091fef39ace932776bc50 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -3,19 +3,19 @@
     <div class='row'>
       <div class='col-sm-7 user-image'></div>
       <div class='col-sm-5 px-5 py-3 byosm'>
     <div class='row'>
       <div class='col-sm-7 user-image'></div>
       <div class='col-sm-5 px-5 py-3 byosm'>

-        <h5 class='text-white text-nowrap'><%= t ".copyright_html", :locale => @locale %></h4>
+        <h5 class='text-white text-nowrap'><%= t ".copyright_html", :locale => @locale %></h5>

       </div>
     </div>
     <div class='row'>
       <div class="w-100 px-5 py-4 bg-dark">
       </div>
     </div>
     <div class='row'>
       <div class="w-100 px-5 py-4 bg-dark">

-        <h1 class="text-white font-weight-light"><%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>
+        <h1 class="text-white fw-light"><%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>

       </div>
     </div>
   </div>
 
   <div class='bg-white px-5 py-4'>
     <div class='section'>
       </div>
     </div>
   </div>
 
   <div class='bg-white px-5 py-4'>
     <div class='section'>

-      <p><strong><%= t ".lede_text", :locale => @locale %></strong></p>
+      <p class="lead"><%= t ".lede_text", :locale => @locale %></p>

       <h2><div class='icon local'></div><%= t ".local_knowledge_title", :locale => @locale %></h2>
       <p><%= t ".local_knowledge_html", :locale => @locale %></p>
     </div>
       <h2><div class='icon local'></div><%= t ".local_knowledge_title", :locale => @locale %></h2>
       <p><%= t ".local_knowledge_html", :locale => @locale %></p>
     </div>


@@ -40,6 +40,7 @@
       <h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2>
       <p><%= t "layouts.hosting_partners_html", :locale => @locale,
                                                 :ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"),
       <h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2>
       <p><%= 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/") %>
       </p>
                                                 :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/") %>
       </p>