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

[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 717059fa24d9255a75b1da63e1790aac225475d4..e127cc5b502c2cae6ec1422299a6ff64bd42ae32 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -1,15 +1,19 @@
 <%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
-  <div class='attr'>
-    <div class='byosm'>
-      <%= t ".copyright_html", :locale => @locale %>
+  <div class="container-lg attr">
+    <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>
+      </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>
+      </div>
     </div>
-
-    <div class='user-image'></div>
-
-    <h1><%= t ".used_by_html", :name => content_tag(:span, "OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>
   </div>
 
-  <div class='text'>
+  <div class='bg-white px-5 py-4'>
     <div class='section'>
       <p><strong><%= t ".lede_text", :locale => @locale %></strong></p>
       <h2><div class='icon local'></div><%= t ".local_knowledge_title", :locale => @locale %></h2>
@@ -36,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"),
+                                                :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>