Update leaflet to 0.7.7
This commit is contained in:
Tom Hughes
parent
91d22710ba
commit
2b015ff522
3 changed files with 497 additions and 491 deletions
|
|
@ -11,13 +11,13 @@ folder 'vendor/assets' do
|
||||||
end
|
end
|
||||||
|
|
||||||
folder 'leaflet' do
|
folder 'leaflet' do
|
||||||
file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.5/leaflet-src.js'
|
file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet-src.js'
|
||||||
file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.5/leaflet.css'
|
file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css'
|
||||||
|
|
||||||
[ 'layers.png', 'layers-2x.png',
|
[ 'layers.png', 'layers-2x.png',
|
||||||
'marker-icon.png', 'marker-icon-2x.png',
|
'marker-icon.png', 'marker-icon-2x.png',
|
||||||
'marker-shadow.png' ].each do |image|
|
'marker-shadow.png' ].each do |image|
|
||||||
file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.5/images/#{image}"
|
file "images/#{image}", "http://cdn.leafletjs.com/leaflet/v0.7.7/images/#{image}"
|
||||||
end
|
end
|
||||||
|
|
||||||
from 'git://github.com/kajic/leaflet-locationfilter.git' do
|
from 'git://github.com/kajic/leaflet-locationfilter.git' do
|
||||||
|
|
|
||||||
957
vendor/assets/leaflet/leaflet.css
vendored
957
vendor/assets/leaflet/leaflet.css
vendored
|
|
@ -1,478 +1,479 @@
|
||||||
/* required styles */
|
/* required styles */
|
||||||
|
|
||||||
.leaflet-map-pane,
|
.leaflet-map-pane,
|
||||||
.leaflet-tile,
|
.leaflet-tile,
|
||||||
.leaflet-marker-icon,
|
.leaflet-marker-icon,
|
||||||
.leaflet-marker-shadow,
|
.leaflet-marker-shadow,
|
||||||
.leaflet-tile-pane,
|
.leaflet-tile-pane,
|
||||||
.leaflet-tile-container,
|
.leaflet-tile-container,
|
||||||
.leaflet-overlay-pane,
|
.leaflet-overlay-pane,
|
||||||
.leaflet-shadow-pane,
|
.leaflet-shadow-pane,
|
||||||
.leaflet-marker-pane,
|
.leaflet-marker-pane,
|
||||||
.leaflet-popup-pane,
|
.leaflet-popup-pane,
|
||||||
.leaflet-overlay-pane svg,
|
.leaflet-overlay-pane svg,
|
||||||
.leaflet-zoom-box,
|
.leaflet-zoom-box,
|
||||||
.leaflet-image-layer,
|
.leaflet-image-layer,
|
||||||
.leaflet-layer {
|
.leaflet-layer {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
}
|
}
|
||||||
.leaflet-container {
|
.leaflet-container {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
-ms-touch-action: none;
|
-ms-touch-action: none;
|
||||||
}
|
touch-action: none;
|
||||||
.leaflet-tile,
|
}
|
||||||
.leaflet-marker-icon,
|
.leaflet-tile,
|
||||||
.leaflet-marker-shadow {
|
.leaflet-marker-icon,
|
||||||
-webkit-user-select: none;
|
.leaflet-marker-shadow {
|
||||||
-moz-user-select: none;
|
-webkit-user-select: none;
|
||||||
user-select: none;
|
-moz-user-select: none;
|
||||||
-webkit-user-drag: none;
|
user-select: none;
|
||||||
}
|
-webkit-user-drag: none;
|
||||||
.leaflet-marker-icon,
|
}
|
||||||
.leaflet-marker-shadow {
|
.leaflet-marker-icon,
|
||||||
display: block;
|
.leaflet-marker-shadow {
|
||||||
}
|
display: block;
|
||||||
/* map is broken in FF if you have max-width: 100% on tiles */
|
}
|
||||||
.leaflet-container img {
|
/* map is broken in FF if you have max-width: 100% on tiles */
|
||||||
max-width: none !important;
|
.leaflet-container img {
|
||||||
}
|
max-width: none !important;
|
||||||
/* stupid Android 2 doesn't understand "max-width: none" properly */
|
}
|
||||||
.leaflet-container img.leaflet-image-layer {
|
/* stupid Android 2 doesn't understand "max-width: none" properly */
|
||||||
max-width: 15000px !important;
|
.leaflet-container img.leaflet-image-layer {
|
||||||
}
|
max-width: 15000px !important;
|
||||||
.leaflet-tile {
|
}
|
||||||
filter: inherit;
|
.leaflet-tile {
|
||||||
visibility: hidden;
|
filter: inherit;
|
||||||
}
|
visibility: hidden;
|
||||||
.leaflet-tile-loaded {
|
}
|
||||||
visibility: inherit;
|
.leaflet-tile-loaded {
|
||||||
}
|
visibility: inherit;
|
||||||
.leaflet-zoom-box {
|
}
|
||||||
width: 0;
|
.leaflet-zoom-box {
|
||||||
height: 0;
|
width: 0;
|
||||||
}
|
height: 0;
|
||||||
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
|
}
|
||||||
.leaflet-overlay-pane svg {
|
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
|
||||||
-moz-user-select: none;
|
.leaflet-overlay-pane svg {
|
||||||
}
|
-moz-user-select: none;
|
||||||
|
}
|
||||||
.leaflet-tile-pane { z-index: 2; }
|
|
||||||
.leaflet-objects-pane { z-index: 3; }
|
.leaflet-tile-pane { z-index: 2; }
|
||||||
.leaflet-overlay-pane { z-index: 4; }
|
.leaflet-objects-pane { z-index: 3; }
|
||||||
.leaflet-shadow-pane { z-index: 5; }
|
.leaflet-overlay-pane { z-index: 4; }
|
||||||
.leaflet-marker-pane { z-index: 6; }
|
.leaflet-shadow-pane { z-index: 5; }
|
||||||
.leaflet-popup-pane { z-index: 7; }
|
.leaflet-marker-pane { z-index: 6; }
|
||||||
|
.leaflet-popup-pane { z-index: 7; }
|
||||||
.leaflet-vml-shape {
|
|
||||||
width: 1px;
|
.leaflet-vml-shape {
|
||||||
height: 1px;
|
width: 1px;
|
||||||
}
|
height: 1px;
|
||||||
.lvml {
|
}
|
||||||
behavior: url(#default#VML);
|
.lvml {
|
||||||
display: inline-block;
|
behavior: url(#default#VML);
|
||||||
position: absolute;
|
display: inline-block;
|
||||||
}
|
position: absolute;
|
||||||
|
}
|
||||||
|
|
||||||
/* control positioning */
|
|
||||||
|
/* control positioning */
|
||||||
.leaflet-control {
|
|
||||||
position: relative;
|
.leaflet-control {
|
||||||
z-index: 7;
|
position: relative;
|
||||||
pointer-events: auto;
|
z-index: 7;
|
||||||
}
|
pointer-events: auto;
|
||||||
.leaflet-top,
|
}
|
||||||
.leaflet-bottom {
|
.leaflet-top,
|
||||||
position: absolute;
|
.leaflet-bottom {
|
||||||
z-index: 1000;
|
position: absolute;
|
||||||
pointer-events: none;
|
z-index: 1000;
|
||||||
}
|
pointer-events: none;
|
||||||
.leaflet-top {
|
}
|
||||||
top: 0;
|
.leaflet-top {
|
||||||
}
|
top: 0;
|
||||||
.leaflet-right {
|
}
|
||||||
right: 0;
|
.leaflet-right {
|
||||||
}
|
right: 0;
|
||||||
.leaflet-bottom {
|
}
|
||||||
bottom: 0;
|
.leaflet-bottom {
|
||||||
}
|
bottom: 0;
|
||||||
.leaflet-left {
|
}
|
||||||
left: 0;
|
.leaflet-left {
|
||||||
}
|
left: 0;
|
||||||
.leaflet-control {
|
}
|
||||||
float: left;
|
.leaflet-control {
|
||||||
clear: both;
|
float: left;
|
||||||
}
|
clear: both;
|
||||||
.leaflet-right .leaflet-control {
|
}
|
||||||
float: right;
|
.leaflet-right .leaflet-control {
|
||||||
}
|
float: right;
|
||||||
.leaflet-top .leaflet-control {
|
}
|
||||||
margin-top: 10px;
|
.leaflet-top .leaflet-control {
|
||||||
}
|
margin-top: 10px;
|
||||||
.leaflet-bottom .leaflet-control {
|
}
|
||||||
margin-bottom: 10px;
|
.leaflet-bottom .leaflet-control {
|
||||||
}
|
margin-bottom: 10px;
|
||||||
.leaflet-left .leaflet-control {
|
}
|
||||||
margin-left: 10px;
|
.leaflet-left .leaflet-control {
|
||||||
}
|
margin-left: 10px;
|
||||||
.leaflet-right .leaflet-control {
|
}
|
||||||
margin-right: 10px;
|
.leaflet-right .leaflet-control {
|
||||||
}
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
/* zoom and fade animations */
|
|
||||||
|
/* zoom and fade animations */
|
||||||
.leaflet-fade-anim .leaflet-tile,
|
|
||||||
.leaflet-fade-anim .leaflet-popup {
|
.leaflet-fade-anim .leaflet-tile,
|
||||||
opacity: 0;
|
.leaflet-fade-anim .leaflet-popup {
|
||||||
-webkit-transition: opacity 0.2s linear;
|
opacity: 0;
|
||||||
-moz-transition: opacity 0.2s linear;
|
-webkit-transition: opacity 0.2s linear;
|
||||||
-o-transition: opacity 0.2s linear;
|
-moz-transition: opacity 0.2s linear;
|
||||||
transition: opacity 0.2s linear;
|
-o-transition: opacity 0.2s linear;
|
||||||
}
|
transition: opacity 0.2s linear;
|
||||||
.leaflet-fade-anim .leaflet-tile-loaded,
|
}
|
||||||
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
|
.leaflet-fade-anim .leaflet-tile-loaded,
|
||||||
opacity: 1;
|
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
|
||||||
}
|
opacity: 1;
|
||||||
|
}
|
||||||
.leaflet-zoom-anim .leaflet-zoom-animated {
|
|
||||||
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
|
.leaflet-zoom-anim .leaflet-zoom-animated {
|
||||||
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
|
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||||
-o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1);
|
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||||
transition: 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,
|
.leaflet-zoom-anim .leaflet-tile,
|
||||||
.leaflet-touching .leaflet-zoom-animated {
|
.leaflet-pan-anim .leaflet-tile,
|
||||||
-webkit-transition: none;
|
.leaflet-touching .leaflet-zoom-animated {
|
||||||
-moz-transition: none;
|
-webkit-transition: none;
|
||||||
-o-transition: none;
|
-moz-transition: none;
|
||||||
transition: none;
|
-o-transition: none;
|
||||||
}
|
transition: none;
|
||||||
|
}
|
||||||
.leaflet-zoom-anim .leaflet-zoom-hide {
|
|
||||||
visibility: hidden;
|
.leaflet-zoom-anim .leaflet-zoom-hide {
|
||||||
}
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
/* cursors */
|
|
||||||
|
/* cursors */
|
||||||
.leaflet-clickable {
|
|
||||||
cursor: pointer;
|
.leaflet-clickable {
|
||||||
}
|
cursor: pointer;
|
||||||
.leaflet-container {
|
}
|
||||||
cursor: -webkit-grab;
|
.leaflet-container {
|
||||||
cursor: -moz-grab;
|
cursor: -webkit-grab;
|
||||||
}
|
cursor: -moz-grab;
|
||||||
.leaflet-popup-pane,
|
}
|
||||||
.leaflet-control {
|
.leaflet-popup-pane,
|
||||||
cursor: auto;
|
.leaflet-control {
|
||||||
}
|
cursor: auto;
|
||||||
.leaflet-dragging .leaflet-container,
|
}
|
||||||
.leaflet-dragging .leaflet-clickable {
|
.leaflet-dragging .leaflet-container,
|
||||||
cursor: move;
|
.leaflet-dragging .leaflet-clickable {
|
||||||
cursor: -webkit-grabbing;
|
cursor: move;
|
||||||
cursor: -moz-grabbing;
|
cursor: -webkit-grabbing;
|
||||||
}
|
cursor: -moz-grabbing;
|
||||||
|
}
|
||||||
|
|
||||||
/* visual tweaks */
|
|
||||||
|
/* visual tweaks */
|
||||||
.leaflet-container {
|
|
||||||
background: #ddd;
|
.leaflet-container {
|
||||||
outline: 0;
|
background: #ddd;
|
||||||
}
|
outline: 0;
|
||||||
.leaflet-container a {
|
}
|
||||||
color: #0078A8;
|
.leaflet-container a {
|
||||||
}
|
color: #0078A8;
|
||||||
.leaflet-container a.leaflet-active {
|
}
|
||||||
outline: 2px solid orange;
|
.leaflet-container a.leaflet-active {
|
||||||
}
|
outline: 2px solid orange;
|
||||||
.leaflet-zoom-box {
|
}
|
||||||
border: 2px dotted #38f;
|
.leaflet-zoom-box {
|
||||||
background: rgba(255,255,255,0.5);
|
border: 2px dotted #38f;
|
||||||
}
|
background: rgba(255,255,255,0.5);
|
||||||
|
}
|
||||||
|
|
||||||
/* general typography */
|
|
||||||
.leaflet-container {
|
/* general typography */
|
||||||
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
|
.leaflet-container {
|
||||||
}
|
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
/* general toolbar styles */
|
|
||||||
|
/* general toolbar styles */
|
||||||
.leaflet-bar {
|
|
||||||
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
|
.leaflet-bar {
|
||||||
border-radius: 4px;
|
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
|
||||||
}
|
border-radius: 4px;
|
||||||
.leaflet-bar a,
|
}
|
||||||
.leaflet-bar a:hover {
|
.leaflet-bar a,
|
||||||
background-color: #fff;
|
.leaflet-bar a:hover {
|
||||||
border-bottom: 1px solid #ccc;
|
background-color: #fff;
|
||||||
width: 26px;
|
border-bottom: 1px solid #ccc;
|
||||||
height: 26px;
|
width: 26px;
|
||||||
line-height: 26px;
|
height: 26px;
|
||||||
display: block;
|
line-height: 26px;
|
||||||
text-align: center;
|
display: block;
|
||||||
text-decoration: none;
|
text-align: center;
|
||||||
color: black;
|
text-decoration: none;
|
||||||
}
|
color: black;
|
||||||
.leaflet-bar a,
|
}
|
||||||
.leaflet-control-layers-toggle {
|
.leaflet-bar a,
|
||||||
background-position: 50% 50%;
|
.leaflet-control-layers-toggle {
|
||||||
background-repeat: no-repeat;
|
background-position: 50% 50%;
|
||||||
display: block;
|
background-repeat: no-repeat;
|
||||||
}
|
display: block;
|
||||||
.leaflet-bar a:hover {
|
}
|
||||||
background-color: #f4f4f4;
|
.leaflet-bar a:hover {
|
||||||
}
|
background-color: #f4f4f4;
|
||||||
.leaflet-bar a:first-child {
|
}
|
||||||
border-top-left-radius: 4px;
|
.leaflet-bar a:first-child {
|
||||||
border-top-right-radius: 4px;
|
border-top-left-radius: 4px;
|
||||||
}
|
border-top-right-radius: 4px;
|
||||||
.leaflet-bar a:last-child {
|
}
|
||||||
border-bottom-left-radius: 4px;
|
.leaflet-bar a:last-child {
|
||||||
border-bottom-right-radius: 4px;
|
border-bottom-left-radius: 4px;
|
||||||
border-bottom: none;
|
border-bottom-right-radius: 4px;
|
||||||
}
|
border-bottom: none;
|
||||||
.leaflet-bar a.leaflet-disabled {
|
}
|
||||||
cursor: default;
|
.leaflet-bar a.leaflet-disabled {
|
||||||
background-color: #f4f4f4;
|
cursor: default;
|
||||||
color: #bbb;
|
background-color: #f4f4f4;
|
||||||
}
|
color: #bbb;
|
||||||
|
}
|
||||||
.leaflet-touch .leaflet-bar a {
|
|
||||||
width: 30px;
|
.leaflet-touch .leaflet-bar a {
|
||||||
height: 30px;
|
width: 30px;
|
||||||
line-height: 30px;
|
height: 30px;
|
||||||
}
|
line-height: 30px;
|
||||||
|
}
|
||||||
|
|
||||||
/* zoom control */
|
|
||||||
|
/* zoom control */
|
||||||
.leaflet-control-zoom-in,
|
|
||||||
.leaflet-control-zoom-out {
|
.leaflet-control-zoom-in,
|
||||||
font: bold 18px 'Lucida Console', Monaco, monospace;
|
.leaflet-control-zoom-out {
|
||||||
text-indent: 1px;
|
font: bold 18px 'Lucida Console', Monaco, monospace;
|
||||||
}
|
text-indent: 1px;
|
||||||
.leaflet-control-zoom-out {
|
}
|
||||||
font-size: 20px;
|
.leaflet-control-zoom-out {
|
||||||
}
|
font-size: 20px;
|
||||||
|
}
|
||||||
.leaflet-touch .leaflet-control-zoom-in {
|
|
||||||
font-size: 22px;
|
.leaflet-touch .leaflet-control-zoom-in {
|
||||||
}
|
font-size: 22px;
|
||||||
.leaflet-touch .leaflet-control-zoom-out {
|
}
|
||||||
font-size: 24px;
|
.leaflet-touch .leaflet-control-zoom-out {
|
||||||
}
|
font-size: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
/* layers control */
|
|
||||||
|
/* layers control */
|
||||||
.leaflet-control-layers {
|
|
||||||
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
|
.leaflet-control-layers {
|
||||||
background: #fff;
|
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
|
||||||
border-radius: 5px;
|
background: #fff;
|
||||||
}
|
border-radius: 5px;
|
||||||
.leaflet-control-layers-toggle {
|
}
|
||||||
background-image: url(images/layers.png);
|
.leaflet-control-layers-toggle {
|
||||||
width: 36px;
|
background-image: url(images/layers.png);
|
||||||
height: 36px;
|
width: 36px;
|
||||||
}
|
height: 36px;
|
||||||
.leaflet-retina .leaflet-control-layers-toggle {
|
}
|
||||||
background-image: url(images/layers-2x.png);
|
.leaflet-retina .leaflet-control-layers-toggle {
|
||||||
background-size: 26px 26px;
|
background-image: url(images/layers-2x.png);
|
||||||
}
|
background-size: 26px 26px;
|
||||||
.leaflet-touch .leaflet-control-layers-toggle {
|
}
|
||||||
width: 44px;
|
.leaflet-touch .leaflet-control-layers-toggle {
|
||||||
height: 44px;
|
width: 44px;
|
||||||
}
|
height: 44px;
|
||||||
.leaflet-control-layers .leaflet-control-layers-list,
|
}
|
||||||
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
|
.leaflet-control-layers .leaflet-control-layers-list,
|
||||||
display: none;
|
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
|
||||||
}
|
display: none;
|
||||||
.leaflet-control-layers-expanded .leaflet-control-layers-list {
|
}
|
||||||
display: block;
|
.leaflet-control-layers-expanded .leaflet-control-layers-list {
|
||||||
position: relative;
|
display: block;
|
||||||
}
|
position: relative;
|
||||||
.leaflet-control-layers-expanded {
|
}
|
||||||
padding: 6px 10px 6px 6px;
|
.leaflet-control-layers-expanded {
|
||||||
color: #333;
|
padding: 6px 10px 6px 6px;
|
||||||
background: #fff;
|
color: #333;
|
||||||
}
|
background: #fff;
|
||||||
.leaflet-control-layers-selector {
|
}
|
||||||
margin-top: 2px;
|
.leaflet-control-layers-selector {
|
||||||
position: relative;
|
margin-top: 2px;
|
||||||
top: 1px;
|
position: relative;
|
||||||
}
|
top: 1px;
|
||||||
.leaflet-control-layers label {
|
}
|
||||||
display: block;
|
.leaflet-control-layers label {
|
||||||
}
|
display: block;
|
||||||
.leaflet-control-layers-separator {
|
}
|
||||||
height: 0;
|
.leaflet-control-layers-separator {
|
||||||
border-top: 1px solid #ddd;
|
height: 0;
|
||||||
margin: 5px -10px 5px -6px;
|
border-top: 1px solid #ddd;
|
||||||
}
|
margin: 5px -10px 5px -6px;
|
||||||
|
}
|
||||||
|
|
||||||
/* attribution and scale controls */
|
|
||||||
|
/* attribution and scale controls */
|
||||||
.leaflet-container .leaflet-control-attribution {
|
|
||||||
background: #fff;
|
.leaflet-container .leaflet-control-attribution {
|
||||||
background: rgba(255, 255, 255, 0.7);
|
background: #fff;
|
||||||
margin: 0;
|
background: rgba(255, 255, 255, 0.7);
|
||||||
}
|
margin: 0;
|
||||||
.leaflet-control-attribution,
|
}
|
||||||
.leaflet-control-scale-line {
|
.leaflet-control-attribution,
|
||||||
padding: 0 5px;
|
.leaflet-control-scale-line {
|
||||||
color: #333;
|
padding: 0 5px;
|
||||||
}
|
color: #333;
|
||||||
.leaflet-control-attribution a {
|
}
|
||||||
text-decoration: none;
|
.leaflet-control-attribution a {
|
||||||
}
|
text-decoration: none;
|
||||||
.leaflet-control-attribution a:hover {
|
}
|
||||||
text-decoration: underline;
|
.leaflet-control-attribution a:hover {
|
||||||
}
|
text-decoration: underline;
|
||||||
.leaflet-container .leaflet-control-attribution,
|
}
|
||||||
.leaflet-container .leaflet-control-scale {
|
.leaflet-container .leaflet-control-attribution,
|
||||||
font-size: 11px;
|
.leaflet-container .leaflet-control-scale {
|
||||||
}
|
font-size: 11px;
|
||||||
.leaflet-left .leaflet-control-scale {
|
}
|
||||||
margin-left: 5px;
|
.leaflet-left .leaflet-control-scale {
|
||||||
}
|
margin-left: 5px;
|
||||||
.leaflet-bottom .leaflet-control-scale {
|
}
|
||||||
margin-bottom: 5px;
|
.leaflet-bottom .leaflet-control-scale {
|
||||||
}
|
margin-bottom: 5px;
|
||||||
.leaflet-control-scale-line {
|
}
|
||||||
border: 2px solid #777;
|
.leaflet-control-scale-line {
|
||||||
border-top: none;
|
border: 2px solid #777;
|
||||||
line-height: 1.1;
|
border-top: none;
|
||||||
padding: 2px 5px 1px;
|
line-height: 1.1;
|
||||||
font-size: 11px;
|
padding: 2px 5px 1px;
|
||||||
white-space: nowrap;
|
font-size: 11px;
|
||||||
overflow: hidden;
|
white-space: nowrap;
|
||||||
-moz-box-sizing: content-box;
|
overflow: hidden;
|
||||||
box-sizing: content-box;
|
-moz-box-sizing: content-box;
|
||||||
|
box-sizing: content-box;
|
||||||
background: #fff;
|
|
||||||
background: rgba(255, 255, 255, 0.5);
|
background: #fff;
|
||||||
}
|
background: rgba(255, 255, 255, 0.5);
|
||||||
.leaflet-control-scale-line:not(:first-child) {
|
}
|
||||||
border-top: 2px solid #777;
|
.leaflet-control-scale-line:not(:first-child) {
|
||||||
border-bottom: none;
|
border-top: 2px solid #777;
|
||||||
margin-top: -2px;
|
border-bottom: none;
|
||||||
}
|
margin-top: -2px;
|
||||||
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
|
}
|
||||||
border-bottom: 2px solid #777;
|
.leaflet-control-scale-line:not(:first-child):not(:last-child) {
|
||||||
}
|
border-bottom: 2px solid #777;
|
||||||
|
}
|
||||||
.leaflet-touch .leaflet-control-attribution,
|
|
||||||
.leaflet-touch .leaflet-control-layers,
|
.leaflet-touch .leaflet-control-attribution,
|
||||||
.leaflet-touch .leaflet-bar {
|
.leaflet-touch .leaflet-control-layers,
|
||||||
box-shadow: none;
|
.leaflet-touch .leaflet-bar {
|
||||||
}
|
box-shadow: none;
|
||||||
.leaflet-touch .leaflet-control-layers,
|
}
|
||||||
.leaflet-touch .leaflet-bar {
|
.leaflet-touch .leaflet-control-layers,
|
||||||
border: 2px solid rgba(0,0,0,0.2);
|
.leaflet-touch .leaflet-bar {
|
||||||
background-clip: padding-box;
|
border: 2px solid rgba(0,0,0,0.2);
|
||||||
}
|
background-clip: padding-box;
|
||||||
|
}
|
||||||
|
|
||||||
/* popup */
|
|
||||||
|
/* popup */
|
||||||
.leaflet-popup {
|
|
||||||
position: absolute;
|
.leaflet-popup {
|
||||||
text-align: center;
|
position: absolute;
|
||||||
}
|
text-align: center;
|
||||||
.leaflet-popup-content-wrapper {
|
}
|
||||||
padding: 1px;
|
.leaflet-popup-content-wrapper {
|
||||||
text-align: left;
|
padding: 1px;
|
||||||
border-radius: 12px;
|
text-align: left;
|
||||||
}
|
border-radius: 12px;
|
||||||
.leaflet-popup-content {
|
}
|
||||||
margin: 13px 19px;
|
.leaflet-popup-content {
|
||||||
line-height: 1.4;
|
margin: 13px 19px;
|
||||||
}
|
line-height: 1.4;
|
||||||
.leaflet-popup-content p {
|
}
|
||||||
margin: 18px 0;
|
.leaflet-popup-content p {
|
||||||
}
|
margin: 18px 0;
|
||||||
.leaflet-popup-tip-container {
|
}
|
||||||
margin: 0 auto;
|
.leaflet-popup-tip-container {
|
||||||
width: 40px;
|
margin: 0 auto;
|
||||||
height: 20px;
|
width: 40px;
|
||||||
position: relative;
|
height: 20px;
|
||||||
overflow: hidden;
|
position: relative;
|
||||||
}
|
overflow: hidden;
|
||||||
.leaflet-popup-tip {
|
}
|
||||||
width: 17px;
|
.leaflet-popup-tip {
|
||||||
height: 17px;
|
width: 17px;
|
||||||
padding: 1px;
|
height: 17px;
|
||||||
|
padding: 1px;
|
||||||
margin: -10px auto 0;
|
|
||||||
|
margin: -10px auto 0;
|
||||||
-webkit-transform: rotate(45deg);
|
|
||||||
-moz-transform: rotate(45deg);
|
-webkit-transform: rotate(45deg);
|
||||||
-ms-transform: rotate(45deg);
|
-moz-transform: rotate(45deg);
|
||||||
-o-transform: rotate(45deg);
|
-ms-transform: rotate(45deg);
|
||||||
transform: rotate(45deg);
|
-o-transform: rotate(45deg);
|
||||||
}
|
transform: rotate(45deg);
|
||||||
.leaflet-popup-content-wrapper,
|
}
|
||||||
.leaflet-popup-tip {
|
.leaflet-popup-content-wrapper,
|
||||||
background: white;
|
.leaflet-popup-tip {
|
||||||
|
background: white;
|
||||||
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
|
|
||||||
}
|
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
|
||||||
.leaflet-container a.leaflet-popup-close-button {
|
}
|
||||||
position: absolute;
|
.leaflet-container a.leaflet-popup-close-button {
|
||||||
top: 0;
|
position: absolute;
|
||||||
right: 0;
|
top: 0;
|
||||||
padding: 4px 4px 0 0;
|
right: 0;
|
||||||
text-align: center;
|
padding: 4px 4px 0 0;
|
||||||
width: 18px;
|
text-align: center;
|
||||||
height: 14px;
|
width: 18px;
|
||||||
font: 16px/14px Tahoma, Verdana, sans-serif;
|
height: 14px;
|
||||||
color: #c3c3c3;
|
font: 16px/14px Tahoma, Verdana, sans-serif;
|
||||||
text-decoration: none;
|
color: #c3c3c3;
|
||||||
font-weight: bold;
|
text-decoration: none;
|
||||||
background: transparent;
|
font-weight: bold;
|
||||||
}
|
background: transparent;
|
||||||
.leaflet-container a.leaflet-popup-close-button:hover {
|
}
|
||||||
color: #999;
|
.leaflet-container a.leaflet-popup-close-button:hover {
|
||||||
}
|
color: #999;
|
||||||
.leaflet-popup-scrolled {
|
}
|
||||||
overflow: auto;
|
.leaflet-popup-scrolled {
|
||||||
border-bottom: 1px solid #ddd;
|
overflow: auto;
|
||||||
border-top: 1px solid #ddd;
|
border-bottom: 1px solid #ddd;
|
||||||
}
|
border-top: 1px solid #ddd;
|
||||||
|
}
|
||||||
.leaflet-oldie .leaflet-popup-content-wrapper {
|
|
||||||
zoom: 1;
|
.leaflet-oldie .leaflet-popup-content-wrapper {
|
||||||
}
|
zoom: 1;
|
||||||
.leaflet-oldie .leaflet-popup-tip {
|
}
|
||||||
width: 24px;
|
.leaflet-oldie .leaflet-popup-tip {
|
||||||
margin: 0 auto;
|
width: 24px;
|
||||||
|
margin: 0 auto;
|
||||||
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
|
|
||||||
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
|
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
|
||||||
}
|
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
|
||||||
.leaflet-oldie .leaflet-popup-tip-container {
|
}
|
||||||
margin-top: -1px;
|
.leaflet-oldie .leaflet-popup-tip-container {
|
||||||
}
|
margin-top: -1px;
|
||||||
|
}
|
||||||
.leaflet-oldie .leaflet-control-zoom,
|
|
||||||
.leaflet-oldie .leaflet-control-layers,
|
.leaflet-oldie .leaflet-control-zoom,
|
||||||
.leaflet-oldie .leaflet-popup-content-wrapper,
|
.leaflet-oldie .leaflet-control-layers,
|
||||||
.leaflet-oldie .leaflet-popup-tip {
|
.leaflet-oldie .leaflet-popup-content-wrapper,
|
||||||
border: 1px solid #999;
|
.leaflet-oldie .leaflet-popup-tip {
|
||||||
}
|
border: 1px solid #999;
|
||||||
|
}
|
||||||
|
|
||||||
/* div icon */
|
|
||||||
|
/* div icon */
|
||||||
.leaflet-div-icon {
|
|
||||||
background: #fff;
|
.leaflet-div-icon {
|
||||||
border: 1px solid #666;
|
background: #fff;
|
||||||
}
|
border: 1px solid #666;
|
||||||
|
}
|
||||||
|
|
|
||||||
25
vendor/assets/leaflet/leaflet.js
vendored
25
vendor/assets/leaflet/leaflet.js
vendored
|
|
@ -7,7 +7,7 @@
|
||||||
var oldL = window.L,
|
var oldL = window.L,
|
||||||
L = {};
|
L = {};
|
||||||
|
|
||||||
L.version = '0.7.5';
|
L.version = '0.7.7';
|
||||||
|
|
||||||
// define Leaflet for Node module pattern loaders, including Browserify
|
// define Leaflet for Node module pattern loaders, including Browserify
|
||||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||||
|
|
@ -520,7 +520,7 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
|
||||||
|
|
||||||
mobile = typeof orientation !== undefined + '',
|
mobile = typeof orientation !== undefined + '',
|
||||||
msPointer = !window.PointerEvent && window.MSPointerEvent,
|
msPointer = !window.PointerEvent && window.MSPointerEvent,
|
||||||
pointer = (window.PointerEvent && window.navigator.pointerEnabled && window.navigator.maxTouchPoints) ||
|
pointer = (window.PointerEvent && window.navigator.pointerEnabled) ||
|
||||||
msPointer,
|
msPointer,
|
||||||
retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
|
retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
|
||||||
('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
|
('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
|
||||||
|
|
@ -4389,7 +4389,9 @@ L.FeatureGroup = L.LayerGroup.extend({
|
||||||
layer = this._layers[layer];
|
layer = this._layers[layer];
|
||||||
}
|
}
|
||||||
|
|
||||||
layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
|
if ('off' in layer) {
|
||||||
|
layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
|
||||||
|
}
|
||||||
|
|
||||||
L.LayerGroup.prototype.removeLayer.call(this, layer);
|
L.LayerGroup.prototype.removeLayer.call(this, layer);
|
||||||
|
|
||||||
|
|
@ -4709,7 +4711,7 @@ L.Path = L.Path.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
_fireMouseEvent: function (e) {
|
_fireMouseEvent: function (e) {
|
||||||
if (!this.hasEventListeners(e.type)) { return; }
|
if (!this._map || !this.hasEventListeners(e.type)) { return; }
|
||||||
|
|
||||||
var map = this._map,
|
var map = this._map,
|
||||||
containerPoint = map.mouseEventToContainerPoint(e),
|
containerPoint = map.mouseEventToContainerPoint(e),
|
||||||
|
|
@ -7167,8 +7169,9 @@ L.extend(L.DomEvent, {
|
||||||
pointers = this._pointers;
|
pointers = this._pointers;
|
||||||
|
|
||||||
var cb = function (e) {
|
var cb = function (e) {
|
||||||
|
if (e.pointerType !== 'mouse' && e.pointerType !== e.MSPOINTER_TYPE_MOUSE) {
|
||||||
L.DomEvent.preventDefault(e);
|
L.DomEvent.preventDefault(e);
|
||||||
|
}
|
||||||
|
|
||||||
var alreadyInArray = false;
|
var alreadyInArray = false;
|
||||||
for (var i = 0; i < pointers.length; i++) {
|
for (var i = 0; i < pointers.length; i++) {
|
||||||
|
|
@ -8939,11 +8942,13 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
|
||||||
|
|
||||||
L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim');
|
L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim');
|
||||||
|
|
||||||
this._resetView(this._animateToCenter, this._animateToZoom, true, true);
|
L.Util.requestAnimFrame(function () {
|
||||||
|
this._resetView(this._animateToCenter, this._animateToZoom, true, true);
|
||||||
|
|
||||||
if (L.Draggable) {
|
if (L.Draggable) {
|
||||||
L.Draggable._disabled = false;
|
L.Draggable._disabled = false;
|
||||||
}
|
}
|
||||||
|
}, this);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue