diff --git a/css/app.css b/css/app.css index 90042557e..a0bbd0e2e 100644 --- a/css/app.css +++ b/css/app.css @@ -404,6 +404,7 @@ button.active:not([disabled]) .icon.add-line { background-position: -40px -20p button.active:not([disabled]) .icon.add-area { background-position: -60px -20px;} button.active:not([disabled]) .icon.undo { background-position: -80px -20px;} button.active:not([disabled]) .icon.redo { background-position: -100px -20px;} + .icon.apply { background-position: -120px 0px;} .icon.save { background-position: -140px 0px;} .icon.close { background-position: -160px 0px;} @@ -416,6 +417,8 @@ button.active:not([disabled]) .icon.redo { background-position: -100px -20p .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.browse { background-position: 0px 0px;} .icon.add-point { background-position: -20px 0px;} @@ -424,15 +427,10 @@ button.active:not([disabled]) .icon.redo { background-position: -100px -20p .icon.undo { background-position: -80px 0px;} .icon.redo { background-position: -100px 0px;} -.close-modal.icon.remove { background-position: -200px -20px;} -.map-control .icon.inspect { background-position: -220px -20px;} -.map-control .icon.zoom-in { background-position: -240px -20px;} -.map-control .icon.zoom-out { background-position: -260px -20px;} -.map-control .icon.geocode { background-position: -280px -20px;} -.map-control .icon.layers { background-position: -300px -20px;} .fillD .icon.avatar { background-position: -320px -20px;} .fillD .icon.nearby { background-position: -340px -20px;} + button[disabled] .icon.browse { background-position: 0px -40px;} button[disabled] .icon.add-point { background-position: -20px -40px;} button[disabled] .icon.add-line { background-position: -40px -40px;} @@ -531,7 +529,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} .tag-row { width: 100%; - padding-right: 70px; + padding-right: 60px; position: relative; height: 30px; } @@ -572,7 +570,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} .tag-row button { position: absolute; - top: 0; + top: 5px; right: 0; } @@ -586,7 +584,11 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} .inspector-inner .add-tag-row { width: 100%; - padding-right: 70px; + padding-right: 60px; +} + +.inspector-inner .add-tag-row button { + border-radius: 0 0 4px 4px; } .inspector-inner .add-tag { @@ -606,8 +608,8 @@ 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, .8); } .map-control button:hover { diff --git a/img/source/sprite.svg b/img/source/sprite.svg index 3d2a96c84..0cc0bfb21 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="360" + width="380" height="200" id="svg12393" version="1.1" @@ -38,11 +38,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="348.93799" - inkscape:cy="154.49862" + inkscape:zoom="2.8284271" + inkscape:cx="173.1037" + inkscape:cy="80.703482" inkscape:document-units="px" - inkscape:current-layer="layer12" + inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1560" inkscape:window-height="922" @@ -56,7 +56,7 @@ showguides="false" inkscape:guide-bbox="true" inkscape:snap-bbox="true" - inkscape:snap-nodes="true"> + inkscape:snap-nodes="false"> + + @@ -175,6 +183,15 @@ id="layer1" transform="translate(-25,-62.362183)" style="display:inline"> + + + + + transform="translate(-25,3.0625e-6)"> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -507,9 +542,9 @@ + style="fill:#ffffff;fill-opacity:1;display:inline"> + style="fill:#ffffff;fill-opacity:1;display:inline"> @@ -626,200 +661,195 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="ccsccssccssccsccc" /> + id="g9693" + style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline" + transform="translate(505,-613.36218)"> + - + - - - - - - - - - - - - - - - - - - - - - - - + style="fill:#000000;fill-opacity:1" + id="g9701"> + + + + style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z" + id="path9709" /> + + - + + + + + + + + + + + + + style="fill:#000000;fill-opacity:1" + id="g47526" + transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)"> - - - - - - + transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)" + id="g47532" + style="fill:#000000;fill-opacity:1" /> + + + + + + + + + + + style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -923,23 +953,23 @@ + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="fill:#ffffff;fill-opacity:1;display:inline"> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> diff --git a/img/sprite.png b/img/sprite.png index 7aab066d7..2030bf5ad 100644 Binary files a/img/sprite.png and b/img/sprite.png differ diff --git a/js/id/ui/geolocate.js b/js/id/ui/geolocate.js index 2e5b48cca..803b0d49d 100644 --- a/js/id/ui/geolocate.js +++ b/js/id/ui/geolocate.js @@ -11,11 +11,12 @@ iD.ui.geolocate = function(map) { .attr('class', 'geolocate-control map-control') .append('button') .attr('title', 'Show My Location') - .text('G') .on('click', function() { navigator.geolocation.getCurrentPosition( success, error); - }); + }) + .append('span') + .attr('class','icon geolocate'); }; }; diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js index 82f85f82b..31b34da46 100644 --- a/js/id/ui/layerswitcher.js +++ b/js/id/ui/layerswitcher.js @@ -33,7 +33,7 @@ iD.ui.layerswitcher = function(map) { var button = selection .append('button') - .attr('class', 'narrow') + .attr('class', 'fillD') .attr('title', 'Layer Settings') .html("") .on('click.layerswitcher-toggle', toggle);