From 4e1560be2306e272fcd5ae24cdcd56bce7f3d069 Mon Sep 17 00:00:00 2001
From: Saman Bemel-Benrud <samanpwbb@gmail.com>
Date: Thu, 21 Mar 2013 19:57:49 -0400
Subject: [PATCH] styling zoom to extent button for custom gpx work.

---
 css/app.css             | 14 +++++++-------
 data/imagery.json       |  2 +-
 data/imagery_convert.js |  2 +-
 js/id/ui/background.js  |  4 ++--
 js/id/ui/geocoder.js    |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/css/app.css b/css/app.css
index 18316769b..1f9593af8 100644
--- a/css/app.css
+++ b/css/app.css
@@ -232,11 +232,6 @@ ul.toggle-list li a {
 ul.toggle-list li a:focus,
 ul.toggle-list li a:hover { background-color: #ececec;}
 
-ul.toggle-list .icon {
-    float: left;
-    margin-right: 5px;
-}
-
 ul.link-list li {
     display: inline-block;
     float: right;
@@ -499,7 +494,7 @@ button[disabled] .label {
 .icon.zoom-out   { background-position: -260px 0px;}
 .icon.plus       { background-position: -240px 0px;}
 .icon.search     { background-position: -280px 0px;}
-.icon.geocode    { background-position: -280px -20px;}
+.icon.geocode    { background-position: -280px 0px;}
 .icon.layers     { background-position: -300px 0px;}
 .icon.avatar     { background-position: -320px 0px;}
 .icon.nearby     { background-position: -340px 0px;}
@@ -508,6 +503,8 @@ button[disabled] .label {
 .icon.back       { background-position: -420px 0px;}
 .icon.forward    { background-position: -440px 0px;}
 
+.icon.geocode.light    { background-position: -280px -20px;}
+
 .fillD .icon.avatar           { background-position: -320px -20px;}
 .fillD .icon.nearby           { background-position: -340px -20px;}
 
@@ -1460,10 +1457,13 @@ div.combobox {
     height:18px;
 }
 
+
 .background-control .layer-toggle-gpx .layer-extent {
-    display:none;
+    float: right;
+    border: 0;
 }
 
+
 .background-control .layer-toggle-gpx.selected .layer-extent {
     display:inline-block;
 }
diff --git a/data/imagery.json b/data/imagery.json
index 9cf657886..415bca0bb 100644
--- a/data/imagery.json
+++ b/data/imagery.json
@@ -22,7 +22,7 @@
     {
         "name": "MapBox Satellite",
         "template": "http://{t}.tiles.mapbox.com/v3/openstreetmap.map-4wvf9l0l/{z}/{x}/{y}.png",
-        "description": "Satellite and aerial imagery",
+        "description": "Satellite and aerial imagery.",
         "scaleExtent": [
             0,
             16
diff --git a/data/imagery_convert.js b/data/imagery_convert.js
index 6b297322a..375146e09 100644
--- a/data/imagery_convert.js
+++ b/data/imagery_convert.js
@@ -19,7 +19,7 @@ var replace = {
 };
 
 var description = {
-    'MapBox Satellite': 'Satellite and aerial imagery',
+    'MapBox Satellite': 'Satellite and aerial imagery.',
     'OpenStreetMap': 'The default OpenStreetMap layer.',
     'OSM US TIGER 2012 Roads Overlay': 'Public domain road data from the US Government.',
     'Bing aerial imagery': 'Satellite imagery.',
diff --git a/js/id/ui/background.js b/js/id/ui/background.js
index b97ff1274..7e23e94e5 100644
--- a/js/id/ui/background.js
+++ b/js/id/ui/background.js
@@ -123,7 +123,7 @@ iD.ui.Background = function(context) {
                 );
 
             layerInner.insert('span')
-                .attr('class', 'icon toggle');
+                .attr('class', 'icon toggle icon-pre-text');
 
             layerInner.insert('span').text(function(d) {
                 return d.data.name;
@@ -226,7 +226,7 @@ iD.ui.Background = function(context) {
 
         gpxLayerItem
             .append('span')
-            .attr('class', 'icon toggle');
+            .attr('class', 'icon toggle icon-pre-text');
 
         gpxLayerItem.append('span')
             .text(t('gpx.local_layer'));
diff --git a/js/id/ui/geocoder.js b/js/id/ui/geocoder.js
index 773815e53..d41228ca2 100644
--- a/js/id/ui/geocoder.js
+++ b/js/id/ui/geocoder.js
@@ -107,7 +107,7 @@ iD.ui.Geocoder = function(context) {
             .call(tooltip);
 
         button.append('span')
-            .attr('class', 'icon geocode');
+            .attr('class', 'icon geocode light');
 
         var gcForm = selection.append('form');