From b0a9b39c8d6c2ec32ed0748f8a7130b813fb123e Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 13 Oct 2021 17:36:48 +0100
Subject: [PATCH] Use flexbox instead of floating to position the comment icon

This ensures both components get appropriate padding. Fixes #3305
---
 app/assets/stylesheets/common.scss       |  1 -
 app/views/changesets/_changeset.html.erb | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index e0eec7bda..f8cd32438 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -791,7 +791,6 @@ tr.turn:hover {
   }
 
   .comments {
-    float: right;
     color: $darkgrey;
   }
 
diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index 267bdb555..714cd14b5 100644
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -16,13 +16,15 @@
       <%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %>
     </a>
   </p>
-  <div class="comments comments-<%= changeset.comments.length %>">
-    <%= changeset.comments.length %>
-    <span class="icon note grey"></span>
-  </div>
-  <div class="details">
-    <%= changeset_details(changeset) %>
-    &middot;
-    #<%= changeset.id %>
+  <div class="row">
+    <div class="col">
+      <%= changeset_details(changeset) %>
+      &middot;
+      #<%= changeset.id %>
+    </div>
+    <div class="col-auto comments comments-<%= changeset.comments.length %>">
+      <%= changeset.comments.length %>
+      <span class="icon note grey"></span>
+    </div>
   </div>
 <% end %>
-- 
2.43.2