From c52758dc79f11e88757796562f8359870f175e0d Mon Sep 17 00:00:00 2001
From: Saman Bemel-Benrud <samanpwbb@gmail.com>
Date: Wed, 20 Feb 2013 20:08:34 -0500
Subject: [PATCH] layout adjustments.

---
 css/app.css               | 19 +++++++++----------
 js/id/ui/layerswitcher.js |  2 +-
 js/id/ui/presetgrid.js    |  2 +-
 js/id/ui/tageditor.js     |  8 ++++----
 js/id/ui/taglist.js       | 10 ++++++----
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/css/app.css b/css/app.css
index 7b49a7687..0949f8d62 100644
--- a/css/app.css
+++ b/css/app.css
@@ -544,8 +544,6 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     line-height: 40px;
 }
 
-.head label { display: block;}
-
 .inspector-toggle {
     color:#fff;
     width: 100%;
@@ -567,8 +565,13 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
 }
 
 .preset-input { padding-left: 10px;}
+
 /* tag editor */
 
+.tag-list {
+    margin-top: 10px;
+}
+
 .tag-row {
     width: 80%;
     padding-right: 0px;
@@ -639,7 +642,7 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     background: rgba(0,0,0,.8);
 }
 
-.inspector-inner .add-tag  .label {
+.inspector-inner .add-tag .label {
     display: none;
 }
 
@@ -701,9 +704,6 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     overflow: hidden;
 }
 
-.preset-grid-search-wrap {
-}
-
 .preset-grid-search {
   width: 100%;
   height: 20px;
@@ -804,13 +804,13 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     background:#ececec;
 }
 
-.layerswitcher-control .alignment-toggle {
+.hide-toggle {
     display: block;
     padding-left: 12px;
     position: relative;
 }
 
-.layerswitcher-control .alignment-toggle:before {
+.hide-toggle:before {
     content: '';
     display: block;
     position: absolute;
@@ -823,12 +823,11 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     border-left:  8px solid #7092ff;
 }
 
-.layerswitcher-control .alignment-toggle.expanded:before {
+.hide-toggle.expanded:before {
     border-top:  8px solid #7092ff;
     border-bottom: 0;
     border-right:  4px solid transparent;
     border-left:  4px solid transparent;
-
 }
 
 .layerswitcher-control .nudge {
diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js
index da800596f..e0c66d9fb 100644
--- a/js/id/ui/layerswitcher.js
+++ b/js/id/ui/layerswitcher.js
@@ -180,7 +180,7 @@ iD.ui.LayerSwitcher = function(context) {
         adjustments.append('a')
             .text(t('layerswitcher.fix_misalignment'))
             .attr('href', '#')
-            .classed('alignment-toggle', true)
+            .classed('hide-toggle', true)
             .classed('expanded', false)
             .on('click', function() {
                 var exp = d3.select(this).classed('expanded');
diff --git a/js/id/ui/presetgrid.js b/js/id/ui/presetgrid.js
index fbbd2bfd9..c79dddb9e 100644
--- a/js/id/ui/presetgrid.js
+++ b/js/id/ui/presetgrid.js
@@ -12,7 +12,7 @@ iD.ui.PresetGrid = function() {
         event.message('What kind of ' + entity.geometry(context.graph()) + ' are you adding?');
 
         var searchwrap = selection.append('div')
-            .attr('class', 'preset-grid-search-wrap pad2');
+            .attr('class', 'preset-grid-search-wrap inspector-inner');
 
         var grid = selection.append('div')
             .attr('class', 'preset-grid fillD inspector-body')
diff --git a/js/id/ui/tageditor.js b/js/id/ui/tageditor.js
index be8b9a729..b7175ed39 100644
--- a/js/id/ui/tageditor.js
+++ b/js/id/ui/tageditor.js
@@ -28,15 +28,15 @@ iD.ui.TagEditor = function() {
         var editorwrap = selection.append('div')
             .attr('class', 'tag-wrap inspector-body');
 
-        var headerwrap = editorwrap.append('div').attr('class','col12 head inspector-inner');
+        var headerwrap = editorwrap.append('div').attr('class','col12 head');
 
         typewrap = headerwrap.append('div')
-            .attr('class','col3');
+            .attr('class','col3 type inspector-inner');
 
         typewrap.append('h4').text('Type');
 
         typelabel = typewrap.append('button')
-            .attr('class','type col12')
+            .attr('class','col12')
             .on('click', function() {
                 event.choose();
             });
@@ -51,7 +51,7 @@ iD.ui.TagEditor = function() {
                 .attr('class', 'icon inspect');
 
          var namewrap = headerwrap.append('div')
-                 .attr('class', 'name col9');
+                 .attr('class', 'name col9 inspector-inner');
 
         typelabel.append('span')
         .attr('class','label')
diff --git a/js/id/ui/taglist.js b/js/id/ui/taglist.js
index 14417ab12..09cbe52e6 100644
--- a/js/id/ui/taglist.js
+++ b/js/id/ui/taglist.js
@@ -8,12 +8,14 @@ iD.ui.Taglist = function() {
     function taglist(selection, collapsed) {
 
         if (collapsed) {
-            selection.append('h4')
+            collapsebutton = selection.append('a')
+                .attr('href','#')
+                .attr('class','hide-toggle')
                 .text('Additional tags')
                 .on('click', function() {
                     wrap.call(iD.ui.Toggle(wrap.classed('hide')));
-                });
-        }
+                })
+        };
 
         var wrap = selection.append('div');
 
@@ -35,8 +37,8 @@ iD.ui.Taglist = function() {
             .attr('class', 'label')
             .text(t('inspector.new_tag'));
 
+        collapsebutton.classed('expanded', collapsed);
         wrap.classed('hide', collapsed);
-
     }
 
     function drawTags(tags) {