diff --git a/css/app.css b/css/app.css
index 1da04f481..0ba223a99 100644
--- a/css/app.css
+++ b/css/app.css
@@ -283,11 +283,11 @@ button.minor {
width: 20px;
border: 0;
box-shadow: none;
- background-color: transparent;
+ background: rgba(0,0,0,.5);
}
button.minor:hover {
- background: white;
+ background: #222;
}
button.centered {
@@ -319,6 +319,8 @@ button.centered {
border-radius:0 4px 4px 0;
}
+button.Browse .label { display: none;}
+
button.action {
background: #7092ff;
}
@@ -431,13 +433,13 @@ button[disabled] .label {
.icon.inspect { background-position: -220px 0px;}
.icon.zoom-in { background-position: -240px 0px;}
.icon.zoom-out { background-position: -260px 0px;}
+.icon.plus { background-position: -240px 0px;}
.icon.geocode { background-position: -280px 0px;}
.icon.layers { background-position: -300px 0px;}
.icon.avatar { background-position: -320px 0px;}
.icon.nearby { background-position: -340px 0px;}
.icon.geolocate { background-position: -360px 0px;}
.icon.warning { background-position: -380px 0px;}
-.icon.plus { background-position: -400px 0px;}
.icon.close-modal { background-position: -200px -40px;}
@@ -613,16 +615,20 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
}
.inspector-inner .add-tag {
- width: 40%;
+ width: 20%;
height: 30px;
- border: 1px solid #ccc;
border-top: 0;
- background: white;
+ background: rgba(0,0,0,.5);
border-radius: 0 0 4px 4px;
- }
- .inspector-inner .add-tag:hover {
- background: #ececec;
- }
+}
+.inspector-inner .add-tag:hover {
+ background: rgba(0,0,0,.8);
+}
+
+.inspector-inner .add-tag .label {
+ display: none;
+}
+
/* Map Controls */
.map-control {
@@ -632,12 +638,13 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
.map-control button {
width: 40px;
- background: rgba(0,0,0,.8);
- border-radius: 0 4px 4px 0;
+ background: rgba(0,0,0,.5);
+ border-radius: 0;
+ border-bottom: 1px solid rgba(0, 0, 0, 1);
}
.map-control button:hover {
- background: rgba(0, 0, 0, .9);
+ background: rgba(0, 0, 0, .8);
}
.map-control button.active:hover {
@@ -662,18 +669,16 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
.zoombuttons button.zoom-in {
border-radius:0 4px 0 0;
- border-bottom: 1px solid rgba(0, 0, 0, .5);
}
.zoombuttons button.zoom-out {
border-top:0;
- border-radius:0 0 4px 0;
}
/* Layer Switcher */
.layerswitcher-control {
- top:210px;
+ top:190px;
}
.layerswitcher-control .adjustments button {
@@ -744,7 +749,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
/* Geocoder */
.geocode-control {
- top:160px;
+ top:150px;
}
.geocode-control input {
@@ -753,8 +758,15 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
margin: 4px;
}
+/* Geolocator */
+
.geolocate-control {
- top:260px;
+ top:230px;
+}
+
+.geolocate-control button {
+ border-radius: 0 0 4px 0;
+ border-bottom: 0;
}
/* Map
@@ -1214,5 +1226,5 @@ a.success-action {
span.label {display: none;}
/* override hide for save button */
.icon.icon-pre-text { margin-right: 0px;}
- .save .label { display: block;}
+ .save .label, .apply .label { display: block;}
}
diff --git a/img/source/sprite.svg b/img/source/sprite.svg
index 4d9d877ea..4cc5abb47 100644
--- a/img/source/sprite.svg
+++ b/img/source/sprite.svg
@@ -38,9 +38,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="257.08321"
- inkscape:cy="180.29859"
+ inkscape:zoom="4"
+ inkscape:cx="230.7911"
+ inkscape:cy="190.13176"
inkscape:document-units="px"
inkscape:current-layer="layer12"
showgrid="false"
@@ -53,7 +53,7 @@
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
- showguides="false"
+ showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-bbox="true"
inkscape:snap-nodes="true">
@@ -279,6 +279,11 @@
id="layer12"
inkscape:label="sprite"
transform="translate(-25,3.0625001e-6)">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/img/sprite.png b/img/sprite.png
index 3c4a93b63..b0f45f2cd 100644
Binary files a/img/sprite.png and b/img/sprite.png differ
diff --git a/js/id/ui/commit.js b/js/id/ui/commit.js
index 29cf64b2f..d883b1748 100644
--- a/js/id/ui/commit.js
+++ b/js/id/ui/commit.js
@@ -86,7 +86,6 @@ iD.ui.commit = function(map) {
.on('click.cancel', function() {
event.cancel();
});
- cancelbutton.append('span').attr('class','icon close icon-pre-text');
cancelbutton.append('span').attr('class','label').text('Cancel');
var warnings = body.selectAll('div.warning-section')
diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 11d9f837f..9612cadd9 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -35,7 +35,7 @@ iD.ui.inspector = function() {
});
newTag.append('span').attr('class', 'icon icon-pre-text plus');
- newTag.append('span').text('New tag')
+ newTag.append('span').attr('class','label').text('New tag')
drawTags(entity.tags);
@@ -63,7 +63,7 @@ iD.ui.inspector = function() {
.attr('class', 'apply action')
.on('click', apply);
- inspectorButton.append('span').attr('class','icon apply');
+ inspectorButton.append('span').attr('class','label').text('Okay');
var minorButtons = selection.append('div').attr('class','minor-buttons fl');
@@ -117,7 +117,7 @@ iD.ui.inspector = function() {
.on('click', removeTag);
removeBtn.append('span')
- .attr('class', 'icon remove');
+ .attr('class', 'icon delete');
var helpBtn = row.append('button')
.attr('tabindex', -1)