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 5453cd7377e1533b0aa00fcfc230e77ff3794089..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,11 +57,20 @@
        }
 .leaflet-container.leaflet-touch-drag {
        -ms-touch-action: pinch-zoom;
-       }
-.leaflet-container.leaflet-touch-drag.leaflet-touch-drag {
+       /* 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;
 }
+.leaflet-container {
+       -webkit-tap-highlight-color: transparent;
+}
+.leaflet-container a {
+       -webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
+}
 .leaflet-tile {
        filter: inherit;
        visibility: hidden;
@@ -158,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 {
@@ -175,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;
        }
 
@@ -199,6 +207,7 @@
 .leaflet-grab {
        cursor: -webkit-grab;
        cursor:    -moz-grab;
+       cursor:         grab;
        }
 .leaflet-crosshair,
 .leaflet-crosshair .leaflet-interactive {
@@ -214,6 +223,7 @@
        cursor: move;
        cursor: -webkit-grabbing;
        cursor:    -moz-grabbing;
+       cursor:         grabbing;
        }
 
 /* marker & overlays interactivity */
@@ -303,7 +313,14 @@
        height: 30px;
        line-height: 30px;
        }
-
+.leaflet-touch .leaflet-bar a:first-child {
+       border-top-left-radius: 2px;
+       border-top-right-radius: 2px;
+       }
+.leaflet-touch .leaflet-bar a:last-child {
+       border-bottom-left-radius: 2px;
+       border-bottom-right-radius: 2px;
+       }
 
 /* zoom control */
 
@@ -312,16 +329,10 @@
        font: bold 18px 'Lucida Console', Monaco, monospace;
        text-indent: 1px;
        }
-.leaflet-control-zoom-out {
-       font-size: 20px;
-       }
 
-.leaflet-touch .leaflet-control-zoom-in {
+.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out  {
        font-size: 22px;
        }
-.leaflet-touch .leaflet-control-zoom-out {
-       font-size: 24px;
-       }
 
 
 /* layers control */
@@ -359,6 +370,7 @@
        }
 .leaflet-control-layers-scrollbar {
        overflow-y: scroll;
+       overflow-x: hidden;
        padding-right: 5px;
        }
 .leaflet-control-layers-selector {
@@ -482,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,