Merge remote-tracking branch 'openstreetmap/pull/1030' into next

[rails.git] / vendor / assets / leaflet / leaflet.css

diff --git a/vendor/assets/leaflet/leaflet.css b/vendor/assets/leaflet/leaflet.css
index 6e0789c6652244c97f18bde90c69e542aa5d2b20..72998d005411dfe8999922760439764ff3d433b7 100644 (file)
--- a/vendor/assets/leaflet/leaflet.css
+++ b/vendor/assets/leaflet/leaflet.css
@@ -5,8 +5,8 @@
 .leaflet-marker-icon,
 .leaflet-marker-shadow,
 .leaflet-tile-container,
-.leaflet-map-pane svg,
-.leaflet-map-pane canvas,
+.leaflet-pane > svg,
+.leaflet-pane > canvas,
 .leaflet-zoom-box,
 .leaflet-image-layer,
 .leaflet-layer {
@@ -43,6 +43,7 @@
 /* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
 .leaflet-container .leaflet-overlay-pane svg,
 .leaflet-container .leaflet-marker-pane img,
+.leaflet-container .leaflet-shadow-pane img,
 .leaflet-container .leaflet-tile-pane img,
 .leaflet-container img.leaflet-image-layer {
        max-width: none !important;
@@ -55,7 +56,7 @@
 .leaflet-container.leaflet-touch-drag {
        -ms-touch-action: pinch-zoom;
        }
-.leaflet-container.leaflet-touch-drag.leaflet-touch-drag {
+.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
        -ms-touch-action: none;
        touch-action: none;
 }
@@ -376,7 +377,7 @@
 
 /* Default icon URLs */
 .leaflet-default-icon-path {
-       background-image: url(images/);
+       background-image: url(images/marker-icon.png);
        }