From 35b02aa1d33b23a7a396da23de4f5f189eff21fc Mon Sep 17 00:00:00 2001
From: Saman Bemel-Benrud <samanpwbb@gmail.com>
Date: Mon, 29 Jul 2013 15:45:32 -0400
Subject: [PATCH] cleanup form styles and tooltips.

---
 css/app.css            | 29 ++++++++++++++++++-----------
 js/id/ui/background.js |  6 +++---
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/css/app.css b/css/app.css
index b3bd11552..3aa3fa9c4 100644
--- a/css/app.css
+++ b/css/app.css
@@ -183,11 +183,11 @@ input:focus {
 
 input[type="checkbox"],
 input[type="radio"] {
-    width: 20px;
-    margin-right: 5px;
-    margin-bottom: 3px;
-    vertical-align: bottom;
+    float: left;
+    width: 14px;
     height: 14px;
+    margin-right: 5px;
+    margin-top: 3px;
 }
 
 /* remove bottom border radius when combobox is open */
@@ -246,18 +246,14 @@ ul li { list-style: none;}
     position: relative;
     padding: 5px 10px;
     display:block;
-    width: 100%;
+    height: 30px;
     border-bottom: 1px solid #ccc;
     background-color: white;
-    height: 30px;
     color: #7092FF;
     cursor: pointer;
        -moz-transition: all 100ms;
          -o-transition: all 100ms;
             transition: all 100ms;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
 }
 
 .toggle-list > label:hover {
@@ -277,9 +273,19 @@ ul li { list-style: none;}
     border-radius: 3px;
 }
 
-.toggle-list > label.remove span {
+.toggle-list label > span { 
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.toggle-list > label.remove span.icon {
+    display: block;
+    width: 14px;
+    float: left;
     margin-right: 5px;
-    background-position: -201px 0;
+    background-position: -204px 0;
 }
 
 .toggle-list > label.active {
@@ -1950,6 +1956,7 @@ img.wiki-image {
 
 .background-control .layer-toggle-gpx .layer-extent {
     border-left: 1px solid #CCC;
+    border-radius: 0 4px 4px 0;
 }
 
 .background-control .layer-toggle-gpx.selected .layer-extent {
diff --git a/js/id/ui/background.js b/js/id/ui/background.js
index 2f3830fa1..545743d80 100644
--- a/js/id/ui/background.js
+++ b/js/id/ui/background.js
@@ -76,7 +76,7 @@ iD.ui.Background = function(context) {
                 .filter(function(d) { return d.data.description; })
                 .call(bootstrap.tooltip()
                     .title(function(d) { return d.data.description; })
-                    .placement('right')
+                    .placement('left')
                 );
 
             layerInner.append('input')
@@ -232,7 +232,7 @@ iD.ui.Background = function(context) {
 
         gpxLayerItem.call(bootstrap.tooltip()
             .title(t('gpx.drag_drop'))
-            .placement('right'));
+            .placement('left'));
 
         gpxLayerItem.append('input')
             .attr('type', 'checkbox')
@@ -292,7 +292,7 @@ iD.ui.Background = function(context) {
 
         resetButton.call(bootstrap.tooltip()
             .title(t('background.reset'))
-            .placement('right'));
+            .placement('bottom'));
 
         context.map()
             .on('move.background-update', _.debounce(update, 1000));