From: Tom Hughes <tom@compton.nu>
Date: Thu, 10 Aug 2023 17:06:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4152'
X-Git-Tag: live~1584
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a02e37250b53a086547a900b5570d8ff197b81f1?hp=09ce3d6abb876b49c8b939903b87a52493ac58c5

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 00b2be4d7..fb580fb7b 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1244,17 +1244,6 @@ div.secondary-actions {
   text-align: center;
 }
 
-/* Create a single-line dl */
-
-dl.dl-inline {
-  dt, dd {
-    display: inline-block;
-  }
-  dd {
-    margin-right: 1em;
-  }
-}
-
 /* Rules for rich text */
 
 .richtext,
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 4dcc9ab05..81e33dddb 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -118,12 +118,12 @@
 
       <div class='text-muted'>
         <small>
-          <dl class="dl-inline">
-            <dt><%= t ".mapper since" %></dt>
-            <dd><%= l @user.created_at.to_date, :format => :long %></dd>
+          <dl class="list-inline">
+            <dt class="list-inline-item m-0"><%= t ".mapper since" %></dt>
+            <dd class="list-inline-item"><%= l @user.created_at.to_date, :format => :long %></dd>
             <% unless @user.terms_agreed %>
-              <dt><%= t ".ct status" %></dt>
-              <dd>
+              <dt class="list-inline-item m-0"><%= t ".ct status" %></dt>
+              <dd class="list-inline-item">
                 <% if @user.terms_seen? -%>
                   <%= t ".ct declined" %>
                 <% else -%>
@@ -188,17 +188,17 @@
       <% if current_user and current_user.administrator? -%>
         <div class='text-muted'>
           <small>
-            <dl class='dl-inline'>
-              <dt><%= t ".email address" %></dt>
-              <dd><%= @user.email %></dd>
+            <dl class="list-inline">
+              <dt class="list-inline-item m-0"><%= t ".email address" %></dt>
+              <dd class="list-inline-item"><%= @user.email %></dd>
               <% unless @user.creation_ip.nil? -%>
-                <dt><%= t ".created from" %></dt>
-                <dd><%= @user.creation_ip %></dd>
+                <dt class="list-inline-item m-0"><%= t ".created from" %></dt>
+                <dd class="list-inline-item"><%= @user.creation_ip %></dd>
               <% end -%>
-              <dt><%= t ".status" %></dt>
-              <dd><%= @user.status.capitalize %></dd>
-              <dt><%= t ".spam score" %></dt>
-              <dd><%= @user.spam_score %></dd>
+              <dt class="list-inline-item m-0"><%= t ".status" %></dt>
+              <dd class="list-inline-item"><%= @user.status.capitalize %></dd>
+              <dt class="list-inline-item m-0"><%= t ".spam score" %></dt>
+              <dd class="list-inline-item"><%= @user.spam_score %></dd>
             </dl>
           </small>
         </div>