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

Merge branch 'master' of github.com:Leaflet/Leaflet

Browse Source
This commit is contained in:
Vladimir Agafonkin 2013-01-11 18:50:44 +02:00
commit eb518f33ac
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/leaflet.css vendored
View File

@ -219,13 +219,13 @@
.leaflet-control-zoom-in { .leaflet-control-zoom-in {
border-bottom: 1px solid #aaa; border-bottom: 1px solid #aaa;
font: bold 18px/24px Arial, Helvetica, sans-serif; font: bold 18px/24px Arial, Helvetica, sans-serif;
-webkit-border-radius: 5px 5px 0 0; -webkit-border-radius: 4px 4px 0 0;
border-radius: 5px 5px 0 0; border-radius: 4px 4px 0 0;
} }
.leaflet-control-zoom-out { .leaflet-control-zoom-out {
font: bold 23px/20px Tahoma, Verdana, sans-serif; font: bold 23px/20px Tahoma, Verdana, sans-serif;
-webkit-border-radius: 0 0 5px 5px; -webkit-border-radius: 0 0 4px 4px;
border-radius: 0 0 5px 5px; border-radius: 0 0 4px 4px;
} }
.leaflet-control-zoom a.leaflet-control-zoom-disabled { .leaflet-control-zoom a.leaflet-control-zoom-disabled {
cursor: default; cursor: default;

5
src/layer/vector/CircleMarker.js
View File

@ -16,6 +16,11 @@ L.CircleMarker = L.Circle.extend({
projectLatlngs: function () { projectLatlngs: function () {
this._point = this._map.latLngToLayerPoint(this._latlng); this._point = this._map.latLngToLayerPoint(this._latlng);
}, },
_updateStyle : function () {
L.Circle.prototype._updateStyle.call(this);
this.setRadius(this.options.radius);
},
setRadius: function (radius) { setRadius: function (radius) {
this._radius = radius; this._radius = radius;