Skip to content
Browse files

updated to leaflet version 0.6.4

  • Loading branch information...
1 parent 8a3d0f5 commit 2f949441ce1ac3b01df2b6bf59e6f1d648d28139 @HaNdTriX HaNdTriX committed Sep 10, 2013
View
BIN images/layers-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/layers.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/marker-icon-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/marker-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/marker-shadow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/zoom-in.png
Deleted file not rendered
View
BIN images/zoom-out.png
Deleted file not rendered
View
3,558 lib/leaflet.js
2,215 additions, 1,343 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
4 package.js
@@ -5,9 +5,9 @@ Package.describe({
Package.on_use(function (api, where) {
api.add_files('lib/leaflet.js', 'client');
api.add_files('styles/leaflet.css', 'client');
+ api.add_files('images/layers-2x.png', 'client');
api.add_files('images/layers.png', 'client');
+ api.add_files('images/marker-icon-2x.png', 'client');
api.add_files('images/marker-icon.png', 'client');
api.add_files('images/marker-shadow.png', 'client');
- api.add_files('images/zoom-in.png', 'client');
- api.add_files('images/zoom-out.png', 'client');
});
View
2 readme.md
@@ -26,7 +26,7 @@ If you want to add Leaflet plugins to your project - include them in your client
I suggest the free web service - [Orge Web Service](http://ogre.adc4gis.com/)
## Demo
-Meteor Leafet Demo | [GitHub](http://leaflet.meteor.com) | [Demo](https://github.com/bevanhunt/meteor-leaflet-demo)
+Meteor Leafet Demo | [GitHub](https://github.com/bevanhunt/meteor-leaflet-demo) | [Demo](http://leaflet.meteor.com)
## License
MIT/X11
View
2 smart.json
@@ -3,6 +3,6 @@
"description": "Leaflet.js, mobile-friendly interactive maps. http://leafletjs.com",
"homepage": "https://github.com/bevanhunt/meteor-leaflet",
"author": "Bevan Hunt <me@bevanhunt.com> (http://www.bevanhunt.com)",
- "version": "0.1.8",
+ "version": "0.1.9",
"git": "https://github.com/bevanhunt/meteor-leaflet.git"
}
View
133 styles/leaflet.css
@@ -5,6 +5,7 @@
.leaflet-marker-icon,
.leaflet-marker-shadow,
.leaflet-tile-pane,
+.leaflet-tile-container,
.leaflet-overlay-pane,
.leaflet-shadow-pane,
.leaflet-marker-pane,
@@ -15,6 +16,7 @@
.leaflet-layer {
position: absolute;
left: 0;
+ top: 0;
}
.leaflet-container {
overflow: hidden;
@@ -26,6 +28,7 @@
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
+ -webkit-user-drag: none;
}
.leaflet-marker-icon,
.leaflet-marker-shadow {
@@ -50,6 +53,10 @@
width: 0;
height: 0;
}
+/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
+.leaflet-overlay-pane svg {
+ -moz-user-select: none;
+ }
.leaflet-tile-pane { z-index: 2; }
.leaflet-objects-pane { z-index: 3; }
@@ -184,85 +191,114 @@
/* general typography */
.leaflet-container {
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-}
+ }
-/* zoom control */
+/* general toolbar styles */
-.leaflet-container .leaflet-control-zoom {
- margin-left: 13px;
- margin-top: 12px;
- box-shadow: 0 0 8px rgba(0,0,0,0.4);
- border: 1px solid #888;
- -webkit-border-radius: 5px;
- border-radius: 5px;
+.leaflet-bar {
+ box-shadow: 0 1px 7px rgba(0,0,0,0.65);
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
}
-.leaflet-control-zoom a {
- width: 22px;
- height: 22px;
- background-color: rgba(255, 255, 255, 0.8);
+.leaflet-bar a, .leaflet-bar a:hover {
+ background-color: #fff;
+ border-bottom: 1px solid #ccc;
+ width: 26px;
+ height: 26px;
+ line-height: 26px;
+ display: block;
text-align: center;
text-decoration: none;
color: black;
}
-.leaflet-control-zoom a,
+.leaflet-bar a,
.leaflet-control-layers-toggle {
background-position: 50% 50%;
background-repeat: no-repeat;
display: block;
}
-.leaflet-control-zoom a:hover {
- background-color: #fff;
- color: #777;
+.leaflet-bar a:hover {
+ background-color: #f4f4f4;
}
-.leaflet-control-zoom-in {
- border-bottom: 1px solid #aaa;
- font: bold 18px/24px Arial, Helvetica, sans-serif;
- -webkit-border-radius: 5px 5px 0 0;
- border-radius: 5px 5px 0 0;
+.leaflet-bar a:first-child {
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
}
-.leaflet-control-zoom-out {
- font: bold 23px/20px Tahoma, Verdana, sans-serif;
- -webkit-border-radius: 0 0 5px 5px;
- border-radius: 0 0 5px 5px;
+.leaflet-bar a:last-child {
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-bottom: none;
}
-.leaflet-control-zoom a.leaflet-control-zoom-disabled {
+.leaflet-bar a.leaflet-disabled {
cursor: default;
- background-color: rgba(255, 255, 255, 0.8);
+ background-color: #f4f4f4;
color: #bbb;
}
-.leaflet-touch .leaflet-control-zoom {
- border-radius: 10px;
+.leaflet-touch .leaflet-bar {
+ -webkit-border-radius: 10px;
+ border-radius: 10px;
}
-.leaflet-touch .leaflet-control-zoom a {
+.leaflet-touch .leaflet-bar a {
width: 30px;
height: 30px;
}
+.leaflet-touch .leaflet-bar a:first-child {
+ -webkit-border-top-left-radius: 7px;
+ border-top-left-radius: 7px;
+ -webkit-border-top-right-radius: 7px;
+ border-top-right-radius: 7px;
+ }
+.leaflet-touch .leaflet-bar a:last-child {
+ -webkit-border-bottom-left-radius: 7px;
+ border-bottom-left-radius: 7px;
+ -webkit-border-bottom-right-radius: 7px;
+ border-bottom-right-radius: 7px;
+ border-bottom: none;
+ }
+
+
+/* zoom control */
+
+.leaflet-control-zoom-in {
+ font: bold 18px 'Lucida Console', Monaco, monospace;
+ }
+.leaflet-control-zoom-out {
+ font: bold 22px 'Lucida Console', Monaco, monospace;
+ }
+
.leaflet-touch .leaflet-control-zoom-in {
- font-size: 24px;
- line-height: 29px;
- border-bottom: 4px solid rgba(0,0,0,0.3);
- border-radius: 7px 7px 0 0;
+ font-size: 22px;
+ line-height: 30px;
}
.leaflet-touch .leaflet-control-zoom-out {
font-size: 28px;
- line-height: 24px;
+ line-height: 30px;
}
+
/* layers control */
.leaflet-control-layers {
box-shadow: 0 1px 7px rgba(0,0,0,0.4);
background: #f8f8f9;
- -webkit-border-radius: 8px;
- border-radius: 8px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
}
.leaflet-control-layers-toggle {
background-image: url(images/layers.png);
width: 36px;
height: 36px;
}
+.leaflet-retina .leaflet-control-layers-toggle {
+ background-image: url(images/layers-2x.png);
+ background-size: 26px 26px;
+ }
.leaflet-touch .leaflet-control-layers-toggle {
width: 44px;
height: 44px;
@@ -342,11 +378,11 @@
.leaflet-touch .leaflet-control-attribution,
.leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-control-zoom {
+.leaflet-touch .leaflet-bar {
box-shadow: none;
}
.leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-control-zoom {
+.leaflet-touch .leaflet-bar {
border: 4px solid rgba(0,0,0,0.3);
}
@@ -360,11 +396,11 @@
.leaflet-popup-content-wrapper {
padding: 1px;
text-align: left;
- -webkit-border-radius: 20px;
- border-radius: 20px;
+ -webkit-border-radius: 12px;
+ border-radius: 12px;
}
.leaflet-popup-content {
- margin: 14px 20px;
+ margin: 13px 19px;
line-height: 1.4;
}
.leaflet-popup-content p {
@@ -378,11 +414,11 @@
overflow: hidden;
}
.leaflet-popup-tip {
- width: 15px;
- height: 15px;
+ width: 17px;
+ height: 17px;
padding: 1px;
- margin: -8px auto 0;
+ margin: -10px auto 0;
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
@@ -399,14 +435,15 @@
position: absolute;
top: 0;
right: 0;
- padding: 4px 5px 0 0;
+ padding: 4px 4px 0 0;
text-align: center;
width: 18px;
height: 14px;
font: 16px/14px Tahoma, Verdana, sans-serif;
color: #c3c3c3;
text-decoration: none;
font-weight: bold;
+ background: transparent;
}
.leaflet-container a.leaflet-popup-close-button:hover {
color: #999;
@@ -427,4 +464,4 @@
.leaflet-editing-icon {
-webkit-border-radius: 2px;
border-radius: 2px;
- }
+ }
View
8 styles/leaflet.ie.css
@@ -35,12 +35,6 @@
.leaflet-control-layers {
border: 3px solid #999;
}
-.leaflet-control-zoom a {
- background-color: #eee;
- }
-.leaflet-control-zoom a:hover {
- background-color: #fff;
- }
.leaflet-control-layers-toggle {
}
.leaflet-control-attribution,
@@ -54,4 +48,4 @@
.leaflet-control-attribution {
border-top: 1px solid #bbb;
border-left: 1px solid #bbb;
- }
+ }

0 comments on commit 2f94944

Please sign in to comment.
Something went wrong with that request. Please try again.