Restore the grey border around the user image on the profile page

This approach keeps the look without adding in the margins (and floats)
which are inappropriate for the flex-based layout.

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 644517ff2175fbac05db4b5718fdc8859f62af6d..67f7be123568d9b07b71a638b6c8c4dea612ae18 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1445,6 +1445,12 @@ img.user_image {
   margin-right: $lineheight;
 }
 
+img.user_image_no_margins {
+  max-width: 100px;
+  max-height: 100px;
+  border: 1px solid $grey;
+}
+
 img.user_thumbnail {
   max-width: 50px;
   max-height: 50px;

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 3943a2d02267dfceca40c787175a2c4a0318bbe4..5aaeabb23b85f99f572005a8221e03fbba95a628 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
   <div id="userinformation" class="row">
     <div class="col-sm-auto">
-      <%= user_image @user, :class => "" %>
+      <%= user_image @user, :class => "user_image_no_margins" %>
     </div>
     <div class="col">
       <h1><%= @user.display_name %> <%= role_icons(@user) %></h1>