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

[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 15255d9e0d57e1fc73e799a00a87dc431b2ad45c..f495193a61e178760f84198941f21ddd9c3e0d8d 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><%= raw t ".used_by", :name => "<span class='user-name'>OpenStreetMap</span>", :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>
@@ -28,7 +32,8 @@
 
     <div class='section' id='legal'>
       <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
-      <p><%= t ".legal_html", :locale => @locale %></p>
+      <p><%= t ".legal_1_html", :locale => @locale %></p>
+      <p><%= t ".legal_2_html", :locale => @locale %></p>
     </div>
 
     <div class='section' id='partners'>