CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-04 05:58:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into conflict-resolution-ui

Browse Source
This commit is contained in:
samanpwbb
2015-02-06 19:08:50 -05:00
parent 78e4271071 158dbab0b1
commit d141827c3e
79 changed files with 1856 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+6 -1
View File
@@ -2047,10 +2047,12 @@ img.wiki-image {
}
.map-data-control .map-overlay,
.background-control .map-overlay {
.background-control .map-overlay,
.help-control .map-overlay {
z-index: -1;
}
/* Geolocator */
.geolocate-control {
@@ -2668,6 +2670,7 @@ img.wiki-image {
.tooltip-inner {
display: inline-block;
border-radius: 3px;
max-width: 200px;
min-width: 80px;
padding: 10px;
@@ -2700,6 +2703,7 @@ img.wiki-image {
}
.tail div {
border-radius: 3px;
padding: 10px;
background: white;
position: absolute;
@@ -2767,6 +2771,7 @@ img.wiki-image {
background: #F6F6F6;
padding: 10px;
margin: 10px -10px -10px;
border-radius: 0 0 3px 3px;
}
.tooltip-inner .keyhint {
css/map.css
+3
View File
@@ -207,6 +207,7 @@ path.stroke.tag-natural-wood,
path.stroke.tag-natural-tree,
path.stroke.tag-natural-grassland,
path.stroke.tag-natural-grass,
path.stroke.tag-leisure-nature_reserve,
path.stroke.tag-leisure-pitch,
path.stroke.tag-leisure-park {
stroke: rgb(140, 208, 95);
@@ -216,6 +217,7 @@ path.fill.tag-natural-wood,
path.fill.tag-natural-tree,
path.fill.tag-natural-grassland,
path.fill.tag-natural-grass,
path.fill.tag-leisure-nature_reserve,
path.fill.tag-leisure-pitch,
path.fill.tag-leisure-park {
stroke: rgba(140, 208, 95, 0.3);
@@ -226,6 +228,7 @@ path.fill.tag-leisure-park {
.preset-icon-fill-area.tag-natural-tree,
.preset-icon-fill-area.tag-natural-grassland,
.preset-icon-fill-area.tag-natural-grass,
.preset-icon-fill-area.tag-leisure-nature_reserve,
.preset-icon-fill-area.tag-leisure-pitch,
.preset-icon-fill-area.tag-leisure-park {
border-color: rgb(140, 208, 95);