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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c7b733f2605616d583dc0d98c77081e1a012a246..aa8b9d65b64c62931c2a372fd91c0ab06d11851c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -891,29 +891,20 @@ div.secondary-actions {
   }
 }
 
-/* Rules for the "Welcome" page */
+/* Rules for the "Welcome" and "Fix the map" pages */
+
 .site-welcome, .site-fixthemap {
   .sprite {
-    background-image: image-url("welcome-sprite.svg");
-    background-size: 500px 250px;
-    display: block;
-  }
-
-  .sprite.small {
     width: 50px;
     height: 50px;
+    background-image: image-url("welcome-sprite.svg");
+    background-size: 500px 250px;
   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 
-  .sprite.term {
-    margin-right: 10px;
-    vertical-align: middle;
-    display: inline-block;
-  }
-
   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }
@@ -939,6 +930,8 @@ div.secondary-actions {
   }
 }
 
+/* Rules for the "About" page */
+
 .site-about #content {
   .content-inner {
     max-width: 760px;

diff --git a/app/views/site/_any_questions.html.erb b/app/views/site/_any_questions.html.erb
index 5098a1eee75790c98307037aefcbf1441c650599..3458999a6dc83902d6e75095251b780c263a4622 100644 (file)
--- a/app/views/site/_any_questions.html.erb
+++ b/app/views/site/_any_questions.html.erb
@@ -1,6 +1,6 @@
-  <h2><%= t ".title" %></h2>
-  <div class='clearfix'>
-  <span class='sprite small term question float-start'></span>
+<h2><%= t ".title" %></h2>
+<div class='d-flex align-items-center gap-2'>
+  <span class='flex-shrink-0 align-self-start sprite question'></span>
   <p><%= t ".paragraph_1_html", :help_link => link_to(t(".get_help_here"), help_path),
                                 :welcome_mat_link => link_to(t(".welcome_mat"), t(".welcome_mat_url")) %></p>
-  </div>
+</div>

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 3f16e08454947e97ab437db2a1b77994f0d890fb..22783ce2d19de49fbbe44a8d2ca6f4a143b3045a 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -12,15 +12,11 @@
 
 <div class='row'>
   <div class='col-sm'>
-    <div>
-      <span class='sprite small check mx-auto'></span>
-    </div>
+    <span class='d-block mx-auto sprite check'></span>
     <p><%= t ".whats_on_the_map.on_the_map_html", :real_and_current => tag.em(t(".whats_on_the_map.real_and_current")) %></p>
   </div>
   <div class='col-sm'>
-    <div>
-      <span class='sprite small x mx-auto'></span>
-    </div>
+    <span class='d-block mx-auto sprite x'></span>
     <p><%= t ".whats_on_the_map.off_the_map_html", :doesnt => tag.em(t(".whats_on_the_map.doesnt")) %></p>
   </div>
 </div>
@@ -29,44 +25,40 @@
 
 <p><%= t ".basic_terms.paragraph_1" %></p>
 
-<div>
-  <div class='align-middle mb-2'>
-    <span class='sprite small term editor'></span>
+<ul class='list-unstyled'>
+  <li class='d-flex align-items-center gap-2 mb-2'>
+    <span class='flex-shrink-0 align-self-start sprite editor'></span>
     <span><%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %></span>
-  </div>
-  <div class='align-middle mb-2'>
-    <span class='sprite small term node'></span>
+  </li>
+  <li class='d-flex align-items-center gap-2 mb-2'>
+    <span class='flex-shrink-0 align-self-start sprite node'></span>
     <span><%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %></span>
-  </div>
-  <div class='align-middle mb-2'>
-    <span class='sprite small term way'></span>
+  </li>
+  <li class='d-flex align-items-center gap-2 mb-2'>
+    <span class='flex-shrink-0 align-self-start sprite way'></span>
     <span><%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %></span>
-  </div>
-  <div class='align-middle mb-2'>
-    <span class='sprite small term tag'></span>
+  </li>
+  <li class='d-flex align-items-center gap-2 mb-2'>
+    <span class='flex-shrink-0 align-self-start sprite tag'></span>
     <span><%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %></span>
-  </div>
-</div>
+  </li>
+</ul>
 
-<div class='clearfix'>
-  <h2><%= t ".rules.title" %></h2>
-  <span class='sprite small term rules float-start'></span>
+<h2><%= t ".rules.title" %></h2>
+<div class='d-flex align-items-center gap-2'>
+  <span class='flex-shrink-0 align-self-start sprite rules'></span>
   <p><%= t ".rules.para_1_html", :imports_link => link_to(t(".rules.imports"), t(".rules.imports_url")),
                                  :automated_edits_link => link_to(t(".rules.automated_edits"), t(".rules.automated_edits_url")) %></p>
 </div>
 
-<div class='clearfix'>
-  <%= render "any_questions" %>
-</div>
+<%= render "any_questions" %>
 
-<div class='clearfix text-center'>
-  <p class="display-5">
+<div class='text-center mb-3'>
 <% if params[:oauth_return_url] %>
   <a class="btn btn-primary" href="<%= params[:oauth_return_url] %>"><%= t ".continue_authorization" %></a>
 <% else %>
-  <a class="button btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
+  <a class="btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
 <% end %>
-  </p>
 </div>
 
 <div class='alert alert-primary'>