CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-19 23:14:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into labels

Browse Source 
Conflicts:
	js/id/renderer/map.js
	js/id/svg/lines.js
This commit is contained in:
Ansis Brammanis
2013-01-18 17:19:12 -05:00
parent d70b5c3891 faecda854e
commit efd829e396
52 changed files with 974 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/map.css
+35 -7
View File
@@ -142,29 +142,41 @@ path.stroke.tag-railway-subway {
stroke-dasharray: 8,8;
}
path.area {
path.area,
path.multipolygon {
stroke-width:2;
stroke:#fff;
fill:#fff;
fill-opacity:0.3;
}
path.multipolygon {
fill-rule: evenodd;
}
path.area.member-type-multipolygon {
fill: none;
}
path.area.selected {
stroke-width:4 !important;
}
path.area.tag-natural {
path.area.tag-natural,
path.multipolygon.tag-natural {
stroke: #ADD6A5;
fill: #ADD6A5;
stroke-width:1;
}
path.area.tag-natural-water {
path.area.tag-natural-water,
path.multipolygon.tag-natural-water {
stroke: #6382FF;
fill: #ADBEFF;
}
path.area.tag-building {
path.area.tag-building,
path.multipolygon.tag-building {
stroke: #9E176A;
stroke-width: 1;
fill: #ff6ec7;
@@ -173,11 +185,24 @@ path.area.tag-building {
path.area.tag-landuse,
path.area.tag-natural-wood,
path.area.tag-natural-tree,
path.area.tag-natural-grassland {
path.area.tag-natural-grassland,
path.area.tag-leisure-park,
path.multipolygon.tag-landuse,
path.multipolygon.tag-natural-wood,
path.multipolygon.tag-natural-tree,
path.multipolygon.tag-natural-grassland,
path.multipolygon.tag-leisure-park {
stroke: #006B34;
stroke-width: 1;
fill: #189E59;
fill-opacity:0.2;
fill-opacity: 0.2;
}
path.area.tag-amenity-parking,
path.multipolygon.tag-amenity-parking {
stroke: #beb267;
stroke-width: 1;
fill: #edecc0;
}
/* highways */
@@ -321,7 +346,9 @@ text.textpath-label, text.text-label {
}
.mode-select .area,
.mode-browse .area {
.mode-browse .area,
.mode-select .multipolygon,
.mode-browse .multipolygon {
cursor: url(../img/cursor-select-area.png), pointer;
}
@@ -334,6 +361,7 @@ text.textpath-label, text.text-label {
.vertex:active,
.line:active,
.area:active,
.multipolygon:active,
.midpoint:active,
.mode-select .selected {
cursor: url(../img/cursor-select-acting.png), pointer;