From 2dab162fac853b23ef269ad7609fdc334ad81557 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Wed, 20 Feb 2013 18:43:44 -0500
Subject: [PATCH] Couple more merge fixes

---
 css/app.css           | 3 ++-
 js/id/ui/tageditor.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/css/app.css b/css/app.css
index 950d7a27b..7b49a7687 100644
--- a/css/app.css
+++ b/css/app.css
@@ -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;
 }
diff --git a/js/id/ui/tageditor.js b/js/id/ui/tageditor.js
index e877355d6..be8b9a729 100644
--- a/js/id/ui/tageditor.js
+++ b/js/id/ui/tageditor.js
@@ -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')