From 5d4727bd95bd339cb2d1a8c3817986f0f487ff2b Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 27 May 2013 08:18:27 -0700
Subject: [PATCH] Transitions

---
 css/app.css               | 49 ++++++++++++++++++++++++++++-----------
 js/id/ui/entity_editor.js | 12 +++++-----
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/css/app.css b/css/app.css
index 22880a89e..0929cde35 100644
--- a/css/app.css
+++ b/css/app.css
@@ -160,10 +160,10 @@ input[type=email] {
     border-radius:4px;
     text-overflow: ellipsis;
     overflow: hidden;
-    -webkit-transition: all 100ms;
-       -moz-transition: all 100ms;
-         -o-transition: all 100ms;
-            transition: all 100ms;
+    -webkit-transition: all 200ms;
+       -moz-transition: all 200ms;
+         -o-transition: all 200ms;
+            transition: all 200ms;
 }
 
 textarea:focus,
@@ -610,26 +610,28 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 .header h3 {
     text-align: center;
-    margin-right: 40px;
     margin-bottom: 0;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
 }
 
-.modal > button,
-.header button {
-    height: 100%;
+.header button,
+.modal > button {
     border-radius: 0;
     width: 40px;
     text-align: center;
     overflow: hidden;
-    position: absolute;
-    right: 0;
-    top: 0;
+}
+
+.header button {
+    height: 100%;
 }
 
 .modal > button {
+    position: absolute;
+    right: 0;
+    top: 0;
     height: 59px;
     z-index: 3;
 }
@@ -674,11 +676,25 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 }
 
 .inspector-wrap .header button.preset-reset {
-    position: relative;
+    float: left;
+}
+
+.inspector-wrap .header button.preset-close {
+    float: right;
+}
+
+.inspector-wrap .header button.preset-reset,
+.inspector-wrap .header button.preset-close {
+    -moz-transition: opacity 200ms;
+      -o-transition: opacity 200ms;
+         transition: opacity 200ms;
 }
 
 .inspector-hover .header button.preset-reset,
-.inspector-hover .header button.preset-close,
+.inspector-hover .header button.preset-close {
+    opacity: 0;
+}
+
 .inspector-hover .more-buttons,
 .inspector-hover .inspector-external-links {
     display: none;
@@ -913,6 +929,13 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     position: relative;
 }
 
+.inspector-wrap .inspector-preset {
+    background-color: white;
+    -moz-transition: background-color 200ms;
+      -o-transition: background-color 200ms;
+         transition: background-color 200ms;
+}
+
 .inspector-hover .inspector-preset {
     background-color: #F6F6F6;
 }
diff --git a/js/id/ui/entity_editor.js b/js/id/ui/entity_editor.js
index 1e044b609..70fcb1256 100644
--- a/js/id/ui/entity_editor.js
+++ b/js/id/ui/entity_editor.js
@@ -17,18 +17,18 @@ iD.ui.EntityEditor = function(context) {
             .attr('class', 'header fillL cf');
 
         $enter.append('button')
-            .attr('class', 'preset-reset fl ')
+            .attr('class', 'preset-reset')
             .append('span')
             .attr('class', 'icon back');
 
-        $enter.append('h3')
-            .attr('class', 'inspector-inner');
-
         $enter.append('button')
-            .attr('class', 'preset-close fr')
+            .attr('class', 'preset-close')
             .append('span')
             .attr('class', 'icon close');
 
+        $enter.append('h3')
+            .attr('class', 'inspector-inner');
+
         // Update
 
         $header.select('h3')
@@ -60,7 +60,7 @@ iD.ui.EntityEditor = function(context) {
             .attr('class', 'fillL');
 
         $enter.append('div')
-            .attr('class', 'inspector-preset cf fillL col12');
+            .attr('class', 'inspector-preset col12');
 
         $enter.append('div')
             .attr('class', 'raw-tag-editor inspector-inner col12');