cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update layers icon, add retina version, cleaner popup styles, close #1739

Browse Source
This commit is contained in:
Vladimir Agafonkin 2013-06-11 15:44:21 +03:00
parent ae10f4d1fc
commit 66d6403ddd
5 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debug/map/controls.html
View File

@ -25,11 +25,11 @@
cloudmade = new L.TileLayer(getCloudMadeUrl(997), {attribution: cloudmadeAttribution}),
cloudmade2 = new L.TileLayer(getCloudMadeUrl(998), {attribution: 'Hello world'});
var map = new L.Map('map').addLayer(cloudmade).setView(new L.LatLng(50.5, 30.51), 15);
var map = new L.Map('map').addLayer(cloudmade).setView(new L.LatLng(50.5, 30.512), 15);
var marker = new L.CircleMarker(new L.LatLng(50.5, 30.505), {color: 'red'});
var marker = new L.Marker(new L.LatLng(50.5, 30.505), {color: 'red'});
map.addLayer(marker);
marker.bindPopup("Hello World").openPopup();
marker.bindPopup("Leaflet is designed with simplicity, performance and usability in mind. It works efficiently across all major desktop and mobile platforms out of the box, taking advantage of HTML5 and CSS3 on modern browsers while still being accessible on older ones.").openPopup();
var marker2 = new L.Marker(new L.LatLng(50.502, 30.515));
map.addLayer(marker2);

BIN
dist/images/layers-2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
dist/images/layers.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 973 B

After

Width:  |  Height:  |  Size: 1.5 KiB

22
dist/leaflet.css vendored
View File

@ -283,14 +283,18 @@
.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;
@ -388,11 +392,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 {
@ -406,11 +410,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);
@ -427,7 +431,7 @@
position: absolute;
top: 0;
right: 0;
padding: 4px 5px 0 0;
padding: 4px 4px 0 0;
text-align: center;
width: 18px;
height: 14px;

13
src/map/Map.js
View File

@ -483,15 +483,10 @@ L.Map = L.Class.extend({
_initLayout: function () {
var container = this._container;
L.DomUtil.addClass(container, 'leaflet-container');
if (L.Browser.touch) {
L.DomUtil.addClass(container, 'leaflet-touch');
}
if (this.options.fadeAnimation) {
L.DomUtil.addClass(container, 'leaflet-fade-anim');
}
L.DomUtil.addClass(container, 'leaflet-container' +
(L.Browser.touch ? ' leaflet-touch' : '') +
(L.Browser.retina ? ' leaflet-retina' : '') +
(this.options.fadeAnimation ? ' leaflet-fade-anim' : ''));
var position = L.DomUtil.getStyle(container, 'position');