CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 08:17:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflict

Browse Source
This commit is contained in:
saman bb
2013-03-12 20:51:13 -04:00
parent 3228e1fcda c0e1245623
commit 983f69e461
156 changed files with 423 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+8 -1
View File
@@ -672,7 +672,8 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
}
.preset-section h4 + input,
h4 + .input-wrap-position input {
h4 + .input-wrap-position input,
h4 + .preset-input input:first-child {
padding-top: 35px;
height: 60px;
}
@@ -691,6 +692,12 @@ input[type=number] {
right: 50%;
}
button.preset-add-form {
width: 40px;
height: 40px;
margin-right: 10px;
}
.preset-fav button.fav {
height: 30px;
margin: 5px;
css/map.css
+4
View File
@@ -331,6 +331,7 @@ path.fill.tag-natural-beach,
path.fill.tag-natural-scrub,
path.fill.tag-landuse-cemetery,
path.fill.tag-landuse-meadow,
path.fill.tag-landuse-farm,
path.fill.tag-landuse-farmland,
path.fill.tag-landuse-construction,
path.fill.tag-landuse-orchard {
@@ -343,6 +344,7 @@ path.fill.tag-landuse-orchard {
.pattern-color-meadow,
.pattern-color-wetland,
.pattern-color-cemetery,
.pattern-color-farm,
.pattern-color-farmland,
.pattern-color-construction,
.pattern-color-orchard {
@@ -362,10 +364,12 @@ path.fill.tag-landuse-residential {
fill: #e06e5f;
}
path.fill.tag-landuse-farm,
path.fill.tag-landuse-farmland {
fill: url(#pattern-farmland) #8cd05f;
}
.pattern-color-farm,
.pattern-color-farmland {
fill: url(#pattern-farmland) #8cd05f;
}