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

[rails.git] / app / views / dashboards / _contact.html.erb

diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb
index b789f721bc828eec29bbc7fc7da2303b6b6eb753..759faab8f7d50d713a301ffab32b29d6ba959e65 100644 (file)
--- a/app/views/dashboards/_contact.html.erb
+++ b/app/views/dashboards/_contact.html.erb
@@ -9,8 +9,8 @@
     <%= user_thumbnail contact %>
   </div>
   <div class="col">
     <%= user_thumbnail contact %>
   </div>
   <div class="col">

-    <p class='text-muted mb-0'>
-      <%= link_to contact.display_name, user_path(contact) %>
+    <p class='text-body-secondary mb-0'>
+      <%= link_to contact.display_name, contact %>

       <% if @user.home_location? and contact.home_location? %>
         <% distance = @user.distance(contact) %>
         <% if distance < 1 %>
       <% if @user.home_location? and contact.home_location? %>
         <% distance = @user.distance(contact) %>
         <% if distance < 1 %>


@@ -25,14 +25,14 @@
       <% if changeset %>
         <%= t(".latest_edit_html", :ago => friendly_date_ago(changeset.created_at)) %>
         <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %>
       <% if changeset %>
         <%= t(".latest_edit_html", :ago => friendly_date_ago(changeset.created_at)) %>
         <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %>

-        <q><%= link_to comment, changeset_path(changeset), :title => t("changesets.changeset.view_changeset_details") %></q>
+        <q><%= link_to comment, changeset, :title => t("changesets.changeset.view_changeset_details") %></q>

       <% else %>
        <%= t "changesets.changeset.no_edits" %>
       <% end %>
     </p>
 
     <nav class='secondary-actions'>
       <% else %>
        <%= t "changesets.changeset.no_edits" %>
       <% end %>
     </p>
 
     <nav class='secondary-actions'>

-      <ul class='clearfix text-muted'>
+      <ul class='clearfix text-body-secondary'>

         <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
         <li>
           <% if current_user.friends_with?(contact) %>
         <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
         <li>
           <% if current_user.friends_with?(contact) %>