Skip to content

Commit

Permalink
Merge branch 'master' into batch-to-celery
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinfilliau
martinfilliau committed May 2, 2012
2 parents 8f5a489 + 0d2b4b1 commit 181f816
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 151 deletions.
Binary file added molly/maps/static/leaflet/images/layers.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
118 changes: 84 additions & 34 deletions molly/maps/static/leaflet/leaflet.css
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,47 +2,49 @@


.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-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 { /* TODO optimize classes */ .leaflet-image-layer { /* TODO optimize classes */
position: absolute; position: absolute;
} }
.leaflet-container { .leaflet-container {
overflow: hidden; overflow: hidden;
} }
.leaflet-tile-pane { .leaflet-tile-pane, .leaflet-container {
-webkit-transform: translate3d(0,0,0); -webkit-transform: translate3d(0,0,0);
} }
.leaflet-tile, .leaflet-tile,
.leaflet-marker-icon, .leaflet-marker-icon,
.leaflet-marker-shadow { .leaflet-marker-shadow {
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
user-select: none; user-select: none;
} }
.leaflet-marker-icon, .leaflet-marker-icon,
.leaflet-marker-shadow { .leaflet-marker-shadow {
display: block; display: block;
} }
.leaflet-clickable { .leaflet-clickable {
cursor: pointer; cursor: pointer;
} }
.leaflet-container img { .leaflet-container img {
max-width: auto; max-width: none !important;
} }


.leaflet-tile-pane { z-index: 2; } .leaflet-tile-pane { z-index: 2; }
.leaflet-overlay-pane { z-index: 3; }
.leaflet-shadow-pane { z-index: 4; } .leaflet-objects-pane { z-index: 3; }
.leaflet-marker-pane { z-index: 5; } .leaflet-overlay-pane { z-index: 4; }
.leaflet-popup-pane { z-index: 6; } .leaflet-shadow-pane { z-index: 5; }
.leaflet-marker-pane { z-index: 6; }
.leaflet-popup-pane { z-index: 7; }


.leaflet-zoom-box { .leaflet-zoom-box {
width: 0; width: 0;
Expand Down Expand Up @@ -79,7 +81,7 @@ a.leaflet-active {
} }
.leaflet-bottom { .leaflet-bottom {
bottom: 0; bottom: 0;
} }
.leaflet-left { .leaflet-left {
left: 0; left: 0;
} }
Expand All @@ -103,25 +105,29 @@ a.leaflet-active {
margin-right: 10px; margin-right: 10px;
} }


.leaflet-control-zoom { .leaflet-control-zoom, .leaflet-control-layers {
padding: 5px;
background: rgba(0, 0, 0, 0.25);

-moz-border-radius: 7px; -moz-border-radius: 7px;
-webkit-border-radius: 7px; -webkit-border-radius: 7px;
border-radius: 7px; border-radius: 7px;
} }
.leaflet-control-zoom {
padding: 5px;
background: rgba(0, 0, 0, 0.25);
}
.leaflet-control-zoom a { .leaflet-control-zoom a {
display: block; background-color: rgba(255, 255, 255, 0.75);
width: 19px; }
height: 19px; .leaflet-control-zoom a, .leaflet-control-layers a {
background-position: 50% 50%; background-position: 50% 50%;
background-repeat: no-repeat; background-repeat: no-repeat;
background-color: rgba(255, 255, 255, 0.75); display: block;

}
.leaflet-control-zoom a {
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
width: 19px;
height: 19px;
} }
.leaflet-control-zoom a:hover { .leaflet-control-zoom a:hover {
background-color: #fff; background-color: #fff;
Expand All @@ -137,16 +143,60 @@ a.leaflet-active {
.leaflet-control-zoom-out { .leaflet-control-zoom-out {
background-image: url(images/zoom-out.png); background-image: url(images/zoom-out.png);
} }


.leaflet-control-layers {
-moz-box-shadow: 0 0 7px #999;
-webkit-box-shadow: 0 0 7px #999;
box-shadow: 0 0 7px #999;

background: #f8f8f9;
}
.leaflet-control-layers a {
background-image: url(images/layers.png);
width: 36px;
height: 36px;
}
.leaflet-big-buttons .leaflet-control-layers a {
width: 44px;
height: 44px;
}
.leaflet-control-layers .leaflet-control-layers-list,
.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
display: none;
}
.leaflet-control-layers-expanded .leaflet-control-layers-list {
display: block;
position: relative;
}
.leaflet-control-layers-expanded {
padding: 6px 10px 6px 6px;
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
color: #333;
background: #fff;
}
.leaflet-control-layers input {
margin-top: 2px;
position: relative;
top: 1px;
}
.leaflet-control-layers label {
display: block;
}
.leaflet-control-layers-separator {
height: 0;
border-top: 1px solid #ddd;
margin: 5px -10px 5px -6px;
}

.leaflet-container .leaflet-control-attribution { .leaflet-container .leaflet-control-attribution {
margin: 0; margin: 0;
padding: 0 5px; padding: 0 5px;

font: 11px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; font: 11px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
color: #333; color: #333;

background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.7);

-moz-box-shadow: 0 0 7px #ccc; -moz-box-shadow: 0 0 7px #ccc;
-webkit-box-shadow: 0 0 7px #ccc; -webkit-box-shadow: 0 0 7px #ccc;
box-shadow: 0 0 7px #ccc; box-shadow: 0 0 7px #ccc;
Expand All @@ -157,7 +207,7 @@ a.leaflet-active {


.leaflet-fade-anim .leaflet-tile { .leaflet-fade-anim .leaflet-tile {
opacity: 0; opacity: 0;

-webkit-transition: opacity 0.2s linear; -webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear; -moz-transition: opacity 0.2s linear;
-o-transition: opacity 0.2s linear; -o-transition: opacity 0.2s linear;
Expand Down Expand Up @@ -216,9 +266,9 @@ a.leaflet-active {
width: 15px; width: 15px;
height: 15px; height: 15px;
padding: 1px; padding: 1px;

margin: -8px auto 0; margin: -8px auto 0;

-moz-transform: rotate(45deg); -moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
-ms-transform: rotate(45deg); -ms-transform: rotate(45deg);
Expand All @@ -229,10 +279,10 @@ a.leaflet-active {
position: absolute; position: absolute;
top: 9px; top: 9px;
right: 9px; right: 9px;

width: 10px; width: 10px;
height: 10px; height: 10px;

overflow: hidden; overflow: hidden;
} }
.leaflet-popup-content p { .leaflet-popup-content p {
Expand All @@ -255,13 +305,13 @@ a.leaflet-active {
} }
.leaflet-popup-content-wrapper, .leaflet-popup-tip { .leaflet-popup-content-wrapper, .leaflet-popup-tip {
background: white; background: white;

box-shadow: 0 1px 10px #888; box-shadow: 0 1px 10px #888;
-moz-box-shadow: 0 1px 10px #888; -moz-box-shadow: 0 1px 10px #888;
-webkit-box-shadow: 0 1px 14px #999; -webkit-box-shadow: 0 1px 14px #999;
} }
.leaflet-popup-content-wrapper { .leaflet-popup-content-wrapper {
-moz-border-radius: 20px; -moz-border-radius: 20px;
-webkit-border-radius: 20px; -webkit-border-radius: 20px;
border-radius: 20px; border-radius: 20px;
} }
Expand All @@ -270,4 +320,4 @@ a.leaflet-active {
} }
.leaflet-popup-close-button { .leaflet-popup-close-button {
background: white url(images/popup-close.png); background: white url(images/popup-close.png);
} }
6 changes: 4 additions & 2 deletions molly/maps/static/leaflet/leaflet.ie.css
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
.leaflet-control-zoom a:hover { .leaflet-control-zoom a:hover {
background-color: #fff; background-color: #fff;
} }
.leaflet-control-attribution { .leaflet-control-layers-toggle {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2FFFFFF,endColorstr=#B2FFFFFF); }
.leaflet-control-attribution, .leaflet-control-layers {
background: white;
} }
Loading

0 comments on commit 181f816

Please sign in to comment.