From: Anton Khorev <tony29@yandex.ru>
Date: Wed, 15 May 2024 13:42:21 +0000 (+0300)
Subject: Replace .term sprite class with .d-flex container
X-Git-Tag: live~471^2~5
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4e42bccd5043141dd6acbeaa2e5b5a29f70fb45a

Replace .term sprite class with .d-flex container
---

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c99fb9e4e..71de054ce 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -905,12 +905,6 @@ div.secondary-actions {
     /*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;
   }
diff --git a/app/views/site/_any_questions.html.erb b/app/views/site/_any_questions.html.erb
index 6036623f9..3458999a6 100644
--- 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 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 ed3d6ceb3..a10849585 100644
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -30,27 +30,27 @@
 <p><%= t ".basic_terms.paragraph_1" %></p>
 
 <ul class='list-unstyled'>
-  <li class='mb-2'>
-    <span class='sprite term editor'></span>
+  <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>
   </li>
-  <li class='mb-2'>
-    <span class='sprite term node'></span>
+  <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>
   </li>
-  <li class='mb-2'>
-    <span class='sprite term way'></span>
+  <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>
   </li>
-  <li class='mb-2'>
-    <span class='sprite term tag'></span>
+  <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>
   </li>
 </ul>
 
-<div class='clearfix'>
-  <h2><%= t ".rules.title" %></h2>
-  <span class='sprite 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>