From: Tom Hughes Date: Fri, 26 Apr 2024 16:50:44 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4722' X-Git-Tag: live~1097 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f28a7f3d41fdcd3e44e4b36f0a52725e6c189932?hp=be94bd79394006853e03e2185d252672eb0ce6a0 Merge remote-tracking branch 'upstream/pull/4722' --- diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js index 146d876f7..495470f2f 100644 --- a/app/assets/javascripts/user.js +++ b/app/assets/javascripts/user.js @@ -121,7 +121,7 @@ $(document).ready(function () { var user = $(this).data("user"); if (user.lon && user.lat) { L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map) - .bindPopup(user.description); + .bindPopup(user.description, { minWidth: 200 }); } }); } diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 526fef99e..d73d40ff0 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -778,7 +778,6 @@ tr.turn { /* Rules for user popups on maps */ .user_popup { - min-width: 200px; p { padding: 0 0 5px 0; margin: 0 0 0 60px;