From aa77ff5aec2f843c488f589c1779c745dbd9dabd Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 10 Nov 2021 15:06:54 +0000
Subject: [PATCH] Use flex grid for issue reports and comments

---
 app/views/issues/_comments.html.erb | 18 ++++++++++--------
 app/views/issues/_reports.html.erb  | 20 +++++++++++---------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index 6a90dbbff..046e80163 100644
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,14 +1,16 @@
 <div>
   <% comments.each do |comment| %>
-    <div class="comment">
-      <div class="float-left">
-        <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
+    <div class="row">
+      <div class="col-auto">
+        <%= link_to user_thumbnail(comment.user, :class => "user_image_no_margins"), user_path(comment.user) %>
+      </div>
+      <div class="col">
+        <p class="text-muted mb-0">
+          <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
+                                      :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
+        </p>
+        <p><%= comment.body %></p>
       </div>
-      <p class="text-muted mb-0">
-        <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
-                                    :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
-      </p>
-      <p><%= comment.body %></p>
     </div>
     <hr>
   <% end %>
diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 143f2d887..6a00bfe23 100644
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,14 +1,16 @@
 <% reports.each do |report| %>
-  <div class="report">
-    <div class="float-left">
-      <%= link_to user_thumbnail(report.user), user_path(report.user) %>
+  <div class="row">
+    <div class="col-auto">
+      <%= link_to user_thumbnail(report.user, :class => "user_thumbnail_no_margins"), user_path(report.user) %>
+    </div>
+    <div class="col">
+      <p class="text-muted mb-0">
+        <%= t ".reported_by_html", :category => report.category,
+                                   :user => link_to(report.user.display_name, user_path(report.user)),
+                                   :updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
+      </p>
+      <p><%= report.details %></p>
     </div>
-    <p class="text-muted mb-0">
-      <%= t ".reported_by_html", :category => report.category,
-                                 :user => link_to(report.user.display_name, user_path(report.user)),
-                                 :updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
-    </p>
-    <p><%= report.details %></p>
   </div>
   <hr>
 <% end %>
-- 
2.43.2