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

Couple more merge fixes

Browse Source
This commit is contained in:
Ansis Brammanis
2013-02-20 18:43:44 -05:00
parent a4502c2732
commit 2dab162fac
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+2 -1
View File
@@ -674,9 +674,10 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
.grid-entry .preset-icon-fill.area {
position: absolute;
opacity: 0.4;
left: 0; right: 0; top: 0; bottom: 0;
left: 0; right: 0; top: 20%;
border-radius: 4px;
margin: auto;
margin-top: -8px;
width: 40px;
height: 40px;
}
js/id/ui/tageditor.js
+1 -1
View File
@@ -59,7 +59,7 @@ iD.ui.TagEditor = function() {
namewrap.append('h4').text('Name');
var name = namewrap.append('input')
name = namewrap.append('input')
.attr('placeholder', 'unkown')
.attr('class', 'major')
.attr('type', 'text')