From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 15 Sep 2021 13:11:05 +0000 (+0100)
Subject: Restore the grey border around the user image on the profile page
X-Git-Tag: live~2148^2~3
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/31e247c1e223145a6ac8ce9012fe5eb586f1aaea

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 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>