Merge remote-tracking branch 'upstream/pull/4722'

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 146d876f789643d20abfed4043cbf44989c8af59..495470f2fd10ea35281b5f0377d9d19130bc8099 100644 (file)
--- 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 526fef99ef7c2cf07d703bfc924406e33de1f7e4..d73d40ff06d72a524b29b3fb848d2093b8f51182 100644 (file)
--- 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;