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

resolving conflict.

Browse Source
This commit is contained in:
Saman Bemel-Benrud
2013-02-12 20:21:09 -05:00
parent 5ee554be0d 211431bdb8
commit 17f2d3a326
36 changed files with 277 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+2 -2
View File
@@ -322,7 +322,7 @@ button.centered {
border-radius:0 4px 4px 0;
}
button.Browse .label { display: none;}
button.browse .label { display: none;}
button.action {
background: #7092ff;
@@ -848,7 +848,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
overflow-y: auto;
}
.geocode-control div span {
.geocode-control div.content span {
display: inline-block;
border-bottom: 1px solid #333;
padding: 5px 10px;