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

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

diff --git a/vendor/assets/leaflet/leaflet.css b/vendor/assets/leaflet/leaflet.css
index fa5abca60dacf6a541441eac116713856910f722..d1b47a1251c18df4c08b0b8c0b2c64522c90eab9 100644 (file)
--- a/vendor/assets/leaflet/leaflet.css
+++ b/vendor/assets/leaflet/leaflet.css
@@ -47,6 +47,7 @@
 .leaflet-container .leaflet-tile-pane img,
 .leaflet-container img.leaflet-image-layer {
        max-width: none !important;
+       max-height: none !important;
        }
 
 .leaflet-container.leaflet-touch-zoom {
@@ -55,7 +56,10 @@
        }
 .leaflet-container.leaflet-touch-drag {
        -ms-touch-action: pinch-zoom;
-       }
+       /* Fallback for FF which doesn't support pinch-zoom */
+       touch-action: none;
+       touch-action: pinch-zoom;
+}
 .leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
        -ms-touch-action: none;
        touch-action: none;