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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index e0eec7bda7e03e0e8942dd60013a435f2f948723..f8cd32438fc1a5e329de2fbca71b7aa3f00b87b2 100644 (file)
--- 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 267bdb5556b261dd4195cdb8c4b810c1ca4a1e75..714cd14b57245b217ed1c29de72232071d48a561 100644 (file)
--- 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 %>