Merge remote-tracking branch 'upstream/pull/2921' into master

[rails.git] / app / views / users / show.html.erb

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 4e48ee983ea4bee5fcbc62d1d7a2fca3f4d986ce..440d68874ff9e323b38e63f3f8a9f86086f2d5b7 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -147,7 +147,7 @@
 
         <% end %>
 
-      <p class='deemphasize'>
+      <p class='text-muted'>
         <small>
           <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
           <% unless @user.terms_agreed %>
@@ -168,7 +168,7 @@
   </div>
 
   <% if current_user and current_user.administrator? -%>
-    <div class='admin-user-info deemphasize'>
+    <div class='admin-user-info text-muted'>
       <small><b><%= t ".email address" %></b> <%= @user.email %></small>
       <% unless @user.creation_ip.nil? -%>
         <small><b><%= t ".created from" %></b> <%= @user.creation_ip %></small>