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

diff --combined app/views/traces/index.html.erb
index 840069a02b45e956c47de8add746e949dfbfd22d,77cd600a49b819d8f1896805cf415e4d3567ced3..b930491c6ded650cd8617d3d6119ed21a83de8f1
--- 1/app/views/traces/index.html.erb
--- 2/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@@ -1,18 -1,12 +1,18 @@@
  <% content_for :heading_class, "pb-0" %>
  <% content_for :heading do %>
    <h1><%= @title %></h1>
 -  <p>
 -    <%= t(".description") %>
 -    <% if params[:tag] %>
 -      <%= link_to t(".remove_tag_filter", :tag => params[:tag]), { :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil }, { :class => "border-left ml-2 pl-2" } %>
 -    <% end %>
 -  </p>
 +  <nav class="secondary-actions mb-3">
 +    <ul>
 +      <li>
 +        <%= t(".description") %>
 +      </li>
 +      <% if params[:tag] %>
 +        <li>
 +          <%= link_to t(".remove_tag_filter", :tag => params[:tag]), { :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil } %>
 +        </li>
 +      <% end %>
 +    </ul>
 +  </nav>
    <ul class="nav nav-tabs flex-column flex-sm-row">
      <% if @target_user.blank? %>
        <!-- public traces -->
@@@ -49,7 -43,7 +49,7 @@@
  
      <li class="nav-item flex-sm-grow-1"></li>
      <li class="nav-item">
-       <div class="px-3 py-1">
+       <div class="px-3 py-2 py-sm-0">
          <%= link_to({ :action => :georss, :display_name => @target_user&.display_name, :tag => params[:tag] }, { :class => "btn btn-secondary btn-sm" }) do %>
            <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="white" viewBox="0 0 16 16">
              <path d="M5.5 12a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm-3-8.5a1 1 0 0 1 1-1c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1-1-1zm0 4a1 1 0 0 1 1-1 6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1-1-1z" />