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

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

diff --git a/vendor/assets/leaflet/leaflet.css b/vendor/assets/leaflet/leaflet.css
index fa5abca60dacf6a541441eac116713856910f722..70802f36874bffb5d8fee4b57a8c7d8f93a3aa1a 100644 (file)
--- a/vendor/assets/leaflet/leaflet.css
+++ b/vendor/assets/leaflet/leaflet.css
@@ -45,8 +45,10 @@
 .leaflet-container .leaflet-marker-pane img,
 .leaflet-container .leaflet-shadow-pane img,
 .leaflet-container .leaflet-tile-pane img,
-.leaflet-container img.leaflet-image-layer {
+.leaflet-container img.leaflet-image-layer,
+.leaflet-container .leaflet-tile {
        max-width: none !important;
+       max-height: none !important;
        }
 
 .leaflet-container.leaflet-touch-zoom {
@@ -55,7 +57,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;
@@ -164,7 +169,6 @@
        opacity: 0;
        -webkit-transition: opacity 0.2s linear;
           -moz-transition: opacity 0.2s linear;
-            -o-transition: opacity 0.2s linear;
                transition: opacity 0.2s linear;
        }
 .leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
@@ -181,14 +185,12 @@
 .leaflet-zoom-anim .leaflet-zoom-animated {
        -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
           -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
-            -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
                transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
        }
 .leaflet-zoom-anim .leaflet-tile,
 .leaflet-pan-anim .leaflet-tile {
        -webkit-transition: none;
           -moz-transition: none;
-            -o-transition: none;
                transition: none;
        }
 
@@ -205,6 +207,7 @@
 .leaflet-grab {
        cursor: -webkit-grab;
        cursor:    -moz-grab;
+       cursor:         grab;
        }
 .leaflet-crosshair,
 .leaflet-crosshair .leaflet-interactive {
@@ -220,6 +223,7 @@
        cursor: move;
        cursor: -webkit-grabbing;
        cursor:    -moz-grabbing;
+       cursor:         grabbing;
        }
 
 /* marker & overlays interactivity */
@@ -490,7 +494,6 @@
        -webkit-transform: rotate(45deg);
           -moz-transform: rotate(45deg);
            -ms-transform: rotate(45deg);
-            -o-transform: rotate(45deg);
                transform: rotate(45deg);
        }
 .leaflet-popup-content-wrapper,