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

[rails.git] / app / views / traces / _trace.html.erb

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index cd4dce99e1c2eca1592f1213027ec22a1f3c7fa6..f60eea7f1cbe22834e631359484b592f6cddb0a7 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -2,7 +2,7 @@
   <td>
     <% if Settings.status != "gpx_offline" %>
       <% if trace.inserted %>
   <td>
     <% if Settings.status != "gpx_offline" %>
       <% if trace.inserted %>

-        <%= link_to image_tag(trace_icon_path(trace.user, trace), :alt => "", :class => "trace_image"),
+        <%= link_to trace_icon(trace),

                     show_trace_path(trace.user, trace),
                     :class => "d-inline-block" %>
       <% else %>
                     show_trace_path(trace.user, trace),
                     :class => "d-inline-block" %>
       <% else %>


@@ -30,7 +30,7 @@
         <span class="badge bg-<%= badge_class %> text-white"><%= t(".#{trace.visibility}") %></span>
       </li>
     </ul>
         <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) %>
       <% 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 @@
                                          :tags => safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
       <% end %>
     </p>
                                          :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>
       <%= trace.description %>
     </p>
   </td>