From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 19 Jun 2024 14:34:14 +0000 (+0100)
Subject: Merge pull request #4813 from AntonKhorev/no-fst-italic
X-Git-Tag: live~418
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d57dd1f4da4d4605f534607b69944e3c977e4db5?ds=inline;hp=-c

Merge pull request #4813 from AntonKhorev/no-fst-italic

Use font size instead of italic for changeset/trace descriptions
---

d57dd1f4da4d4605f534607b69944e3c977e4db5
diff --combined app/views/changesets/show.html.erb
index 6ae0efb8b,6e4e953ff..915b0ef35
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@@ -3,7 -3,7 +3,7 @@@
  <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
  
  <div class="browse-section">
-   <p class="fst-italic">
+   <p class="fs-6 overflow-x-auto">
      <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
    </p>
    <p class="details"><%= changeset_details(@changeset) %></p>
@@@ -18,17 -18,9 +18,17 @@@
      <% if current_user %>
        <div class="col-auto">
          <% if @changeset.subscribers.exists?(current_user.id) %>
 -          <button class="btn btn-sm btn-primary" name="unsubscribe" data-method="POST" data-url="<%= api_changeset_unsubscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.unsubscribe") %></button>
 +          <%= tag.button t(".unsubscribe"),
 +                         :class => "btn btn-sm btn-primary",
 +                         :name => "unsubscribe",
 +                         :data => { :method => "POST",
 +                                    :url => api_changeset_unsubscribe_url(@changeset) } %>
          <% else %>
 -          <button class="btn btn-sm btn-primary" name="subscribe" data-method="POST" data-url="<%= api_changeset_subscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.subscribe") %></button>
 +          <%= tag.button t(".subscribe"),
 +                         :class => "btn btn-sm btn-primary",
 +                         :name => "subscribe",
 +                         :data => { :method => "POST",
 +                                    :url => api_changeset_subscribe_url(@changeset) } %>
          <% end %>
        </div>
      <% end %>
@@@ -39,13 -31,13 +39,13 @@@
        <% @comments.each do |comment| %>
          <% next unless comment.visible || current_user&.moderator? %>
          <li id="c<%= comment.id %>">
 -          <small class='text-muted'>
 +          <small class='text-body-secondary'>
              <%= t comment.visible ? ".comment_by_html" : ".hidden_comment_by_html",
                    :time_ago => friendly_date_ago(comment.created_at),
                    :user => link_to(comment.author.display_name, comment.author) %>
              <% if current_user&.moderator? %>
                —
 -              <%= tag.button t("javascripts.changesets.show.#{comment.visible ? 'hide' : 'unhide'}_comment"),
 +              <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"),
                               :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
                               :data => { :method => "POST",
                                          :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %>
@@@ -74,12 -66,7 +74,12 @@@
          <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
          </div>
          <div>
 -          <button name="comment" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled class="btn btn-sm btn-primary"><%= t("javascripts.changesets.show.comment") %></button>
 +          <%= tag.button t(".comment"),
 +                         :class => "btn btn-primary",
 +                         :name => "comment",
 +                         :disabled => true,
 +                         :data => { :method => "POST",
 +                                    :url => changeset_comment_url(@changeset) } %>
          </div>
        </form>
      <% else %>
diff --combined app/views/traces/_trace.html.erb
index 37713679f,ad731c6db..ba503f730
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@@ -30,7 -30,7 +30,7 @@@
          <span class="badge bg-<%= badge_class %> text-white"><%= t(".#{trace.visibility}") %></span>
        </li>
      </ul>
 -    <p class="text-muted mb-0">
 +    <p class="text-body-secondary mb-0">
        <% if trace.tags.empty? %>
          <%= t ".details_without_tags_html", :time_ago => friendly_date_ago(trace.timestamp),
                                              :user => link_to(trace.user.display_name, trace.user) %>
@@@ -40,7 -40,7 +40,7 @@@
                                           :tags => safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
        <% end %>
      </p>
-     <p class="fst-italic mb-0">
+     <p class="fs-6 mb-0">
        <%= trace.description %>
      </p>
    </td>