Vertically center about page icons with flex align-items

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d2ab3d272746755d1ecf6d15660e07e7a734be53..d71538e66f1ddaaeba97449678f7f84b2b7f2b5a 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1606,8 +1606,6 @@ dl.dl-inline {
   .icon {
     width: 30px;
     height: 30px;
-    margin-right: 10px;
-    vertical-align: middle;
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 
     &.local {

diff --git a/app/views/site/_about_section.html.erb b/app/views/site/_about_section.html.erb
new file mode 100644 (file)
index 0000000..ead28f9
--- /dev/null
+++ b/app/views/site/_about_section.html.erb
@@ -0,0 +1,7 @@
+<%= tag.div :class => "section", :id => local_assigns[:id] do %>
+  <div class='d-flex align-items-center gap-2 mb-2'>
+    <div class='flex-shrink-0 icon <%= icon %>'></div>
+    <h2 class='flex-grow-1 mb-0'><%= t "site.about.#{title}_title", :locale => @locale %></h2>
+  </div>
+  <%= yield %>
+<% end %>

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index b4b21a567f177b28b5c091fef39ace932776bc50..abf4c60c8bd4786310ede1b8b4f371141c3a07d8 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -14,36 +14,32 @@
   </div>
 
   <div class='bg-white px-5 py-4'>
-    <div class='section'>
-      <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>
+    <p class="lead"><%= t ".lede_text", :locale => @locale %></p>
 
-    <div class='section'>
-      <h2><div class='icon community'></div><%= t ".community_driven_title", :locale => @locale %></h2>
-      <p><%= t ".community_driven_html", :locale => @locale, :diary_path => diary_entries_path %></p>
-    </div>
+    <%= render :layout => "about_section", :locals => { :icon => "local", :title => "local_knowledge" } do %>
+      <p><%= t "site.about.local_knowledge_html", :locale => @locale %></p>
+    <% end %>
 
-    <div class='section' id='open-data'>
-      <h2><div class='icon open'></div><%= t ".open_data_title", :locale => @locale %></h2>
-      <p><%= t ".open_data_html", :locale => @locale, :copyright_path => copyright_path %></p>
-    </div>
+    <%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %>
+      <p><%= t "site.about.community_driven_html", :locale => @locale, :diary_path => diary_entries_path %></p>
+    <% end %>
 
-    <div class='section' id='legal'>
-      <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
-      <p><%= t ".legal_1_html", :locale => @locale %></p>
-      <p><%= t ".legal_2_html", :locale => @locale %></p>
-    </div>
+    <%= render :layout => "about_section", :locals => { :id => "open-data", :icon => "open", :title => "open_data" } do %>
+      <p><%= t "site.about.open_data_html", :locale => @locale, :copyright_path => copyright_path %></p>
+    <% end %>
+
+    <%= render :layout => "about_section", :locals => { :id => "legal", :icon => "legal", :title => "legal" } do %>
+      <p><%= t "site.about.legal_1_html", :locale => @locale %></p>
+      <p><%= t "site.about.legal_2_html", :locale => @locale %></p>
+    <% end %>
 
-    <div class='section' id='partners'>
-      <h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2>
+    <%= render :layout => "about_section", :locals => { :id => "partners", :icon => "partners", :title => "partners" } do %>
       <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>
-    </div>
+    <% end %>
   </div>
 <% end %>