From: Tom Hughes <tom@compton.nu>
Date: Sat, 8 Mar 2025 15:25:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5774'
X-Git-Tag: live~28
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/feeaa1b03f0dd8f1ecdcdcdcc8e2b9dbf26f95f5?ds=sidebyside;hp=-c

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

feeaa1b03f0dd8f1ecdcdcdcc8e2b9dbf26f95f5
diff --combined app/views/changesets/_changeset.html.erb
index 18ea581ef,923f869cf..85142c251
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@@ -4,24 -4,20 +4,24 @@@
        <span><%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %></span>
      </a>
    </p>
-   <div class="row">
-     <div class="col pt-3">
+   <div class="d-flex flex-nowrap gap-3 justify-content-between">
+     <div class="overflow-hidden pt-3">
        <%= changeset_details(changeset) %>
        &middot;
        <a class="changeset_id link-body-emphasis" href="<%= changeset_path(changeset) %>">
          #<%= changeset.id %>
        </a>
      </div>
-     <div class="col-auto d-flex flex-column justify-content-end align-items-end text-body-secondary">
+     <div class="d-flex flex-column justify-content-end align-items-end text-body-secondary">
        <%= tag.div :class => ["d-flex align-items-baseline gap-1", { "opacity-50" => changeset.comments.empty? }],
                    :title => t(".comments", :count => changeset.comments.length) do %>
          <%= changeset.comments.length %>
          <svg width="12" height="12" viewBox="0 0 16 16" fill="currentColor">
 -          <path d="M2.678 11.894a1 1 0 0 1 .287.801 11 11 0 0 1-.398 2c1.395-.323 2.247-.697 2.634-.893a1 1 0 0 1 .71-.074A8 8 0 0 0 8 14c3.996 0 7-2.807 7-6s-3.004-6-7-6-7 2.808-7 6c0 1.468.617 2.83 1.678 3.894m-.493 3.905a22 22 0 0 1-.713.129c-.2.032-.352-.176-.273-.362a10 10 0 0 0 .244-.637l.003-.01c.248-.72.45-1.548.524-2.319C.743 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7-3.582 7-8 7a9 9 0 0 1-2.347-.306c-.52.263-1.639.742-3.468 1.105" />
 +          <% if changeset.comments.empty? %>
 +            <path d="M2.678 11.894a1 1 0 0 1 .287.801 11 11 0 0 1-.398 2c1.395-.323 2.247-.697 2.634-.893a1 1 0 0 1 .71-.074A8 8 0 0 0 8 14c3.996 0 7-2.807 7-6s-3.004-6-7-6-7 2.808-7 6c0 1.468.617 2.83 1.678 3.894m-.493 3.905a22 22 0 0 1-.713.129c-.2.032-.352-.176-.273-.362a10 10 0 0 0 .244-.637l.003-.01c.248-.72.45-1.548.524-2.319C.743 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7-3.582 7-8 7a9 9 0 0 1-2.347-.306c-.52.263-1.639.742-3.468 1.105" />
 +          <% else %>
 +            <path d="M8 15c4.418 0 8-3.134 8-7s-3.582-7-8-7-8 3.134-8 7c0 1.76.743 3.37 1.97 4.6-.097 1.016-.417 2.13-.771 2.966-.079.186.074.394.273.362 2.256-.37 3.597-.938 4.18-1.234A9 9 0 0 0 8 15" />
 +          <% end %>
          </svg>
        <% end %>
        <%= tag.div :class => ["d-flex align-items-baseline gap-1", { "opacity-50" => changeset.num_changes.zero? }],