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

[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 5aaeabb23b85f99f572005a8221e03fbba95a628..2a195ca60d40d659569d84bbb73010de47addf5c 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <div id="userinformation" class="row">
+  <div class="row">

     <div class="col-sm-auto">
     <div class="col-sm-auto">

-      <%= user_image @user, :class => "user_image_no_margins" %>
+      <%= user_image @user %>

     </div>
     <div class="col">
       <h1><%= @user.display_name %> <%= role_icons(@user) %></h1>
     </div>
     <div class="col">
       <h1><%= @user.display_name %> <%= role_icons(@user) %></h1>