From 31e247c1e223145a6ac8ce9012fe5eb586f1aaea Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 15 Sep 2021 14:11:05 +0100
Subject: [PATCH] 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.
---
 app/assets/stylesheets/common.scss | 6 ++++++
 app/views/users/show.html.erb      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 644517ff2..67f7be123 100644
--- 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 3943a2d02..5aaeabb23 100644
--- 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>
-- 
2.39.5