From dc67e54958c50301cd0b8b0ada72936a4ae0b0f2 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 10 Nov 2021 15:19:31 +0000
Subject: [PATCH] Use grid for dashboard map popups

---
 app/assets/stylesheets/leaflet-all.scss |  3 ---
 app/views/dashboards/_popup.html.erb    | 12 ++++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/leaflet-all.scss b/app/assets/stylesheets/leaflet-all.scss
index 34e3d094e..d12c61f77 100644
--- a/app/assets/stylesheets/leaflet-all.scss
+++ b/app/assets/stylesheets/leaflet-all.scss
@@ -15,9 +15,6 @@ div.leaflet-marker-icon.location-filter.move-marker {
 
 /* Override some conflicting styles.
    https://github.com/openstreetmap/openstreetmap-website/pull/121#issuecomment-10206946 */
-.leaflet-popup-content img.user_thumbnail {
-  max-width: 50px !important;
-}
 
 .user_popup p {
   margin: 0 !important;
diff --git a/app/views/dashboards/_popup.html.erb b/app/views/dashboards/_popup.html.erb
index a643b5c90..8a8a94959 100644
--- a/app/views/dashboards/_popup.html.erb
+++ b/app/views/dashboards/_popup.html.erb
@@ -1,5 +1,9 @@
-<div class="user_popup">
-  <%= user_thumbnail popup %>
-  <p><%= t(".#{type}") %></p>
-  <p><%= link_to popup.display_name, user_path(popup) %></p>
+<div class="user_popup row no-gutters mx-1">
+  <div class="col-auto mx-1">
+    <%= user_thumbnail popup, :class => "user_thumbnail_no_margins" %>
+  </div>
+  <div class="col mx-1">
+    <p><%= t(".#{type}") %></p>
+    <p><%= link_to popup.display_name, user_path(popup) %></p>
+  </div>
 </div>
-- 
2.39.5