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

[rails.git] / app / assets / stylesheets / leaflet-all.scss

diff --git a/app/assets/stylesheets/leaflet-all.scss b/app/assets/stylesheets/leaflet-all.scss
index 10ad2607a5a4c5bbbc56b6df50892edff384ac54..d12c61f77766d4aa635397db6907871164618a28 100644 (file)
--- a/app/assets/stylesheets/leaflet-all.scss
+++ b/app/assets/stylesheets/leaflet-all.scss
@@ -1,6 +1,7 @@
 /*
 /*

- *= require leaflet
+ *= require leaflet/dist/leaflet

  *= require leaflet.locationfilter
  *= require leaflet.locationfilter

+ *= require leaflet.contextmenu

  */
 
 /* Override to serve images through the asset pipeline. */
  */
 
 /* Override to serve images through the asset pipeline. */


@@ -14,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 */
 
 /* 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;
 
 .user_popup p {
   margin: 0 !important;