Merge remote-tracking branch 'upstream/master' into vagrant

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

diff --git a/vendor/assets/leaflet/leaflet.css b/vendor/assets/leaflet/leaflet.css
index ea3da39071fcacde8a4a453f2aa04381958f8a99..ac0cd174df7fac89d74525d1b06dc79b38af7964 100644 (file)
--- a/vendor/assets/leaflet/leaflet.css
+++ b/vendor/assets/leaflet/leaflet.css
@@ -5,6 +5,7 @@
 .leaflet-marker-icon,\r
 .leaflet-marker-shadow,\r
 .leaflet-tile-pane,\r
+.leaflet-tile-container,\r
 .leaflet-overlay-pane,\r
 .leaflet-shadow-pane,\r
 .leaflet-marker-pane,\r
@@ -27,6 +28,7 @@
        -webkit-user-select: none;\r
           -moz-user-select: none;\r
                user-select: none;\r
+       -webkit-user-drag: none;\r
        }\r
 .leaflet-marker-icon,\r
 .leaflet-marker-shadow {\r
@@ -51,6 +53,10 @@
        width: 0;\r
        height: 0;\r
        }\r
+/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */\r
+.leaflet-overlay-pane svg {\r
+       -moz-user-select: none;\r
+       }\r
 \r
 .leaflet-tile-pane    { z-index: 2; }\r
 .leaflet-objects-pane { z-index: 3; }\r
@@ -59,6 +65,16 @@
 .leaflet-marker-pane  { z-index: 6; }\r
 .leaflet-popup-pane   { z-index: 7; }\r
 \r
+.leaflet-vml-shape {\r
+       width: 1px;\r
+       height: 1px;\r
+       }\r
+.lvml {\r
+       behavior: url(#default#VML);\r
+       display: inline-block;\r
+       position: absolute;\r
+       }\r
+\r
 \r
 /* control positioning */\r
 \r
@@ -154,9 +170,8 @@
 .leaflet-control {\r
        cursor: auto;\r
        }\r
-.leaflet-dragging,\r
-.leaflet-dragging .leaflet-clickable,\r
-.leaflet-dragging .leaflet-container {\r
+.leaflet-dragging .leaflet-container,\r
+.leaflet-dragging .leaflet-clickable {\r
        cursor: move;\r
        cursor: -webkit-grabbing;\r
        cursor:    -moz-grabbing;\r
@@ -176,9 +191,8 @@
        outline: 2px solid orange;\r
        }\r
 .leaflet-zoom-box {\r
-       border: 2px dotted #05f;\r
-       background: white;\r
-       opacity: 0.5;\r
+       border: 2px dotted #38f;\r
+       background: rgba(255,255,255,0.5);\r
        }\r
 \r
 \r
@@ -191,104 +205,87 @@
 /* general toolbar styles */\r
 \r
 .leaflet-bar {\r
-       box-shadow: 0 0 8px rgba(0,0,0,0.4);\r
-       border: 1px solid #888;\r
-       -webkit-border-radius: 5px;\r
-               border-radius: 5px;\r
-       }\r
-.leaflet-bar-part {\r
-       background-color: rgba(255, 255, 255, 0.8);\r
-       border-bottom: 1px solid #aaa;\r
-       }\r
-.leaflet-bar-part-top {\r
-       -webkit-border-radius: 4px 4px 0 0;\r
-               border-radius: 4px 4px 0 0;\r
-       }\r
-.leaflet-bar-part-bottom {\r
-       -webkit-border-radius: 0 0 4px 4px;\r
-               border-radius: 0 0 4px 4px;\r
-       border-bottom: none;\r
+       box-shadow: 0 1px 5px rgba(0,0,0,0.65);\r
+       border-radius: 4px;\r
        }\r
-\r
-.leaflet-touch .leaflet-bar {\r
-       -webkit-border-radius: 10px;\r
-               border-radius: 10px;\r
-       }\r
-.leaflet-touch .leaflet-bar-part {\r
-       border-bottom: 4px solid rgba(0,0,0,0.3);\r
-       }\r
-.leaflet-touch .leaflet-bar-part-top {\r
-       -webkit-border-radius: 7px 7px 0 0;\r
-               border-radius: 7px 7px 0 0;\r
-       }\r
-.leaflet-touch .leaflet-bar-part-bottom {\r
-       -webkit-border-radius: 0 0 7px 7px;\r
-               border-radius: 0 0 7px 7px;\r
-       border-bottom: none;\r
-       }\r
-\r
-\r
-/* zoom control */\r
-\r
-.leaflet-container .leaflet-control-zoom {\r
-       margin-left: 13px;\r
-       margin-top: 12px;\r
-       }\r
-.leaflet-control-zoom a {\r
-       width: 22px;\r
-       height: 22px;\r
+.leaflet-bar a,\r
+.leaflet-bar a:hover {\r
+       background-color: #fff;\r
+       border-bottom: 1px solid #ccc;\r
+       width: 26px;\r
+       height: 26px;\r
+       line-height: 26px;\r
+       display: block;\r
        text-align: center;\r
        text-decoration: none;\r
        color: black;\r
        }\r
-.leaflet-control-zoom a,\r
+.leaflet-bar a,\r
 .leaflet-control-layers-toggle {\r
        background-position: 50% 50%;\r
        background-repeat: no-repeat;\r
        display: block;\r
        }\r
-.leaflet-control-zoom a:hover {\r
-       background-color: #fff;\r
-       color: #777;\r
+.leaflet-bar a:hover {\r
+       background-color: #f4f4f4;\r
        }\r
-.leaflet-control-zoom-in {\r
-       font: bold 18px/24px Arial, Helvetica, sans-serif;\r
+.leaflet-bar a:first-child {\r
+       border-top-left-radius: 4px;\r
+       border-top-right-radius: 4px;\r
        }\r
-.leaflet-control-zoom-out {\r
-       font: bold 23px/20px Tahoma, Verdana, sans-serif;\r
+.leaflet-bar a:last-child {\r
+       border-bottom-left-radius: 4px;\r
+       border-bottom-right-radius: 4px;\r
+       border-bottom: none;\r
        }\r
-.leaflet-control-zoom a.leaflet-control-zoom-disabled {\r
+.leaflet-bar a.leaflet-disabled {\r
        cursor: default;\r
-       background-color: rgba(255, 255, 255, 0.8);\r
+       background-color: #f4f4f4;\r
        color: #bbb;\r
        }\r
 \r
-.leaflet-touch .leaflet-control-zoom a {\r
+.leaflet-touch .leaflet-bar a {\r
        width: 30px;\r
        height: 30px;\r
+       line-height: 30px;\r
        }\r
+\r
+\r
+/* zoom control */\r
+\r
+.leaflet-control-zoom-in,\r
+.leaflet-control-zoom-out {\r
+       font: bold 18px 'Lucida Console', Monaco, monospace;\r
+       text-indent: 1px;\r
+       }\r
+.leaflet-control-zoom-out {\r
+       font-size: 20px;\r
+       }\r
+\r
 .leaflet-touch .leaflet-control-zoom-in {\r
-       font-size: 24px;\r
-       line-height: 29px;\r
+       font-size: 22px;\r
        }\r
 .leaflet-touch .leaflet-control-zoom-out {\r
-       font-size: 28px;\r
-       line-height: 24px;\r
+       font-size: 24px;\r
        }\r
 \r
+\r
 /* layers control */\r
 \r
 .leaflet-control-layers {\r
-       box-shadow: 0 1px 7px rgba(0,0,0,0.4);\r
-       background: #f8f8f9;\r
-       -webkit-border-radius: 8px;\r
-               border-radius: 8px;\r
+       box-shadow: 0 1px 5px rgba(0,0,0,0.4);\r
+       background: #fff;\r
+       border-radius: 5px;\r
        }\r
 .leaflet-control-layers-toggle {\r
        background-image: url(images/layers.png);\r
        width: 36px;\r
        height: 36px;\r
        }\r
+.leaflet-retina .leaflet-control-layers-toggle {\r
+       background-image: url(images/layers-2x.png);\r
+       background-size: 26px 26px;\r
+       }\r
 .leaflet-touch .leaflet-control-layers-toggle {\r
        width: 44px;\r
        height: 44px;\r
@@ -324,8 +321,8 @@
 /* attribution and scale controls */\r
 \r
 .leaflet-container .leaflet-control-attribution {\r
-       background-color: rgba(255, 255, 255, 0.7);\r
-       box-shadow: 0 0 5px #bbb;\r
+       background: #fff;\r
+       background: rgba(255, 255, 255, 0.7);\r
        margin: 0;\r
        }\r
 .leaflet-control-attribution,\r
@@ -333,6 +330,12 @@
        padding: 0 5px;\r
        color: #333;\r
        }\r
+.leaflet-control-attribution a {\r
+       text-decoration: none;\r
+       }\r
+.leaflet-control-attribution a:hover {\r
+       text-decoration: underline;\r
+       }\r
 .leaflet-container .leaflet-control-attribution,\r
 .leaflet-container .leaflet-control-scale {\r
        font-size: 11px;\r
@@ -346,21 +349,21 @@
 .leaflet-control-scale-line {\r
        border: 2px solid #777;\r
        border-top: none;\r
-       color: black;\r
        line-height: 1.1;\r
        padding: 2px 5px 1px;\r
        font-size: 11px;\r
-       text-shadow: 1px 1px 1px #fff;\r
-       background-color: rgba(255, 255, 255, 0.5);\r
-       box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.2);\r
        white-space: nowrap;\r
        overflow: hidden;\r
+       -moz-box-sizing: content-box;\r
+            box-sizing: content-box;\r
+\r
+       background: #fff;\r
+       background: rgba(255, 255, 255, 0.5);\r
        }\r
 .leaflet-control-scale-line:not(:first-child) {\r
        border-top: 2px solid #777;\r
        border-bottom: none;\r
        margin-top: -2px;\r
-       box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);\r
        }\r
 .leaflet-control-scale-line:not(:first-child):not(:last-child) {\r
        border-bottom: 2px solid #777;\r
@@ -368,12 +371,13 @@
 \r
 .leaflet-touch .leaflet-control-attribution,\r
 .leaflet-touch .leaflet-control-layers,\r
-.leaflet-touch .leaflet-control-zoom {\r
+.leaflet-touch .leaflet-bar {\r
        box-shadow: none;\r
        }\r
 .leaflet-touch .leaflet-control-layers,\r
-.leaflet-touch .leaflet-control-zoom {\r
-       border: 4px solid rgba(0,0,0,0.3);\r
+.leaflet-touch .leaflet-bar {\r
+       border: 2px solid rgba(0,0,0,0.2);\r
+       background-clip: padding-box;\r
        }\r
 \r
 \r
@@ -386,11 +390,10 @@
 .leaflet-popup-content-wrapper {\r
        padding: 1px;\r
        text-align: left;\r
-       -webkit-border-radius: 20px;\r
-               border-radius: 20px;\r
+       border-radius: 12px;\r
        }\r
 .leaflet-popup-content {\r
-       margin: 14px 20px;\r
+       margin: 13px 19px;\r
        line-height: 1.4;\r
        }\r
 .leaflet-popup-content p {\r
@@ -404,11 +407,11 @@
        overflow: hidden;\r
        }\r
 .leaflet-popup-tip {\r
-       width: 15px;\r
-       height: 15px;\r
+       width: 17px;\r
+       height: 17px;\r
        padding: 1px;\r
 \r
-       margin: -8px auto 0;\r
+       margin: -10px auto 0;\r
 \r
        -webkit-transform: rotate(45deg);\r
           -moz-transform: rotate(45deg);\r
@@ -416,7 +419,8 @@
             -o-transform: rotate(45deg);\r
                transform: rotate(45deg);\r
        }\r
-.leaflet-popup-content-wrapper, .leaflet-popup-tip {\r
+.leaflet-popup-content-wrapper,\r
+.leaflet-popup-tip {\r
        background: white;\r
 \r
        box-shadow: 0 3px 14px rgba(0,0,0,0.4);\r
@@ -425,7 +429,7 @@
        position: absolute;\r
        top: 0;\r
        right: 0;\r
-       padding: 4px 5px 0 0;\r
+       padding: 4px 4px 0 0;\r
        text-align: center;\r
        width: 18px;\r
        height: 14px;\r
@@ -444,6 +448,27 @@
        border-top: 1px solid #ddd;\r
        }\r
 \r
+.leaflet-oldie .leaflet-popup-content-wrapper {\r
+       zoom: 1;\r
+       }\r
+.leaflet-oldie .leaflet-popup-tip {\r
+       width: 24px;\r
+       margin: 0 auto;\r
+\r
+       -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";\r
+       filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);\r
+       }\r
+.leaflet-oldie .leaflet-popup-tip-container {\r
+       margin-top: -1px;\r
+       }\r
+\r
+.leaflet-oldie .leaflet-control-zoom,\r
+.leaflet-oldie .leaflet-control-layers,\r
+.leaflet-oldie .leaflet-popup-content-wrapper,\r
+.leaflet-oldie .leaflet-popup-tip {\r
+       border: 1px solid #999;\r
+       }\r
+\r
 \r
 /* div icon */\r
 \r
@@ -451,7 +476,3 @@
        background: #fff;\r
        border: 1px solid #666;\r
        }\r
-.leaflet-editing-icon {\r
-       -webkit-border-radius: 2px;\r
-               border-radius: 2px;\r
-       }\r