diff --git a/css/app.css b/css/app.css
index 3ee648b9d..4e0758097 100644
--- a/css/app.css
+++ b/css/app.css
@@ -440,7 +440,7 @@ button.save.has-count .count::before {
vertical-align:top;
width:20px;
height:20px;
- background:transparent url(../img/sprite.png) no-repeat 0 0;
+ background:transparent url(../img/sprite.svg) no-repeat 0 0;
text-indent:-9999px;
overflow:hidden;
}
@@ -841,16 +841,16 @@ a:hover .icon.out-link { background-position: -500px -14px;}
margin: auto;
position: absolute;
left: 0; right: 0; top: 19px;
- background:transparent url(../img/sprite.png) no-repeat -240px -80px;
+ background:transparent url(../img/sprite.svg) no-repeat -240px -80px;
}
.preset-icon-fill.tag-shop,
.preset-icon-fill.tag-building {
- background:transparent url(../img/sprite.png) no-repeat 0 -80px;
+ background:transparent url(../img/sprite.svg) no-repeat 0 -80px;
}
.preset-icon-fill.tag-natural-water {
- background:transparent url(../img/sprite.png) no-repeat -60px -80px;
+ background:transparent url(../img/sprite.svg) no-repeat -60px -80px;
}
.preset-icon-fill.tag-landuse,
@@ -858,11 +858,11 @@ a:hover .icon.out-link { background-position: -500px -14px;}
.preset-icon-fill.tag-natural-tree,
.preset-icon-fill.tag-natural-grassland,
.preset-icon-fill.tag-leisure-park {
- background:transparent url(../img/sprite.png) no-repeat -120px -80px;
+ background:transparent url(../img/sprite.svg) no-repeat -120px -80px;
}
.preset-icon-fill.tag-amenity-parking {
- background:transparent url(../img/sprite.png) no-repeat -180px -80px;
+ background:transparent url(../img/sprite.svg) no-repeat -180px -80px;
}
/* preset form basics */
@@ -1415,7 +1415,7 @@ img.wiki-image {
position: fixed;
left: 30px;
display: block;
- padding: 10px;
+ padding: 10px 10px 0 10px;
}
/* Zoomer */
@@ -1445,21 +1445,16 @@ img.wiki-image {
.nudge-container {
border-top: 1px solid #CCC;
- margin: 10px -10px -10px -10px;
+ margin: 0 -10px;
}
-.background-control .adjustments button {
- background: white;
- text-transform: uppercase;
- border-color: #CCC;
-}
-
-.background-control .adjustments button:hover {
- background:#ececec;
+.background-control .adjustments button:last-child {
+ border: 0;
}
.hide-toggle {
- padding-left: 12px;
+ display: block;
+ padding: 0 0 10px 12px;
position: relative;
}
@@ -1470,7 +1465,7 @@ img.wiki-image {
height: 0;
width: 0;
left: 0;
- top: 4px;
+ top: 5px;
border-top: 4px solid transparent;
border-bottom: 4px solid transparent;
border-left: 8px solid #7092ff;
@@ -1483,12 +1478,12 @@ img.wiki-image {
border-left: 4px solid transparent;
}
-.background-control .nudge {
- text-indent: -9999px;
- overflow: hidden;
- width:16.6666%;
+.background-control .nudge-container button {
+ float: left;
+ display: block;
+ width:20%;
border-radius: 0;
- border-right: 1px solid rgba(0, 0, 0, .5);
+ border-right: 1px solid #CCC;
position: relative;
}
@@ -1526,15 +1521,6 @@ img.wiki-image {
border-top: 5px solid #222;
}
-.background-control .nudge:first-child {
- border-radius: 4px 0 0 4px;
-}
-
-.background-control .reset {
- width: 33.3333%;
- border-radius: 0 4px 4px 0;
-}
-
.opacity-options {
background: url(../img/background-pattern-opacity.png) 0 0 repeat;
height:20px;
@@ -1566,6 +1552,7 @@ img.wiki-image {
background: rgba(89, 123, 231, .5);
opacity: .5;
}
+
.background-control li.selected:hover .select-box,
.background-control li.selected .select-box {
opacity: 1;
@@ -1913,7 +1900,7 @@ img.wiki-image {
width: 100px;
margin: auto;
margin-bottom: 10px;
- background:transparent url(../img/sprite.png) no-repeat 0 -220px;
+ background:transparent url(../img/sprite.svg) no-repeat 0 -220px;
}
.modal-actions :first-child {
@@ -2279,17 +2266,6 @@ img.wiki-image {
only screen and (-o-min-device-pixel-ratio: 3/2),
only screen and (min--moz-device-pixel-ratio: 1.5),
only screen and (min-device-pixel-ratio: 1.5) {
- .intro-points-add .tooltip-inner::before,
- .intro-areas-add .tooltip-inner::before,
- .intro-lines-add .tooltip-inner::before,
- .walkthrough a:before,
- .preset-icon-fill.icon-area,
- .modal-actions button:before,
- .map-control .icon,
- .button-wrap .icon {
- background-image: url(../img/sprite2x.png);
- background-size: 600px 560px;
- }
a,
button,
.checkselect label:hover,
@@ -2301,7 +2277,6 @@ img.wiki-image {
}
}
-
/* Scrollbars
----------------------------------------------------- */
@@ -2405,7 +2380,7 @@ img.wiki-image {
content: "";
height: 80px;
width: 200px;
- background:transparent url(../img/sprite.png) no-repeat 0 -320px;
+ background:transparent url(../img/sprite.svg) no-repeat 0 -320px;
}
.intro-areas-add .tooltip-inner::before {
@@ -2425,6 +2400,6 @@ img.wiki-image {
.huge-modal-button .illustration {
height: 100px;
width: 100px;
- background: rgba(0, 0, 0, 0) url(../img/sprite.png) no-repeat -301px -220px;
+ background: rgba(0, 0, 0, 0) url(../img/sprite.svg) no-repeat -301px -220px;
margin: auto;
}
diff --git a/img/cursor-draw-connect-line.png b/img/cursor-draw-connect-line.png
index 5d25489ed..122870729 100644
Binary files a/img/cursor-draw-connect-line.png and b/img/cursor-draw-connect-line.png differ
diff --git a/img/cursor-draw-connect-line2x.png b/img/cursor-draw-connect-line2x.png
index 371e4d7cb..9e45b4011 100644
Binary files a/img/cursor-draw-connect-line2x.png and b/img/cursor-draw-connect-line2x.png differ
diff --git a/img/sprite.png b/img/sprite.png
deleted file mode 100644
index ccda51669..000000000
Binary files a/img/sprite.png and /dev/null differ
diff --git a/img/sprite.svg b/img/sprite.svg
new file mode 100644
index 000000000..f13952a2c
--- /dev/null
+++ b/img/sprite.svg
@@ -0,0 +1,403 @@
+
+
+
diff --git a/img/sprite2x.png b/img/sprite2x.png
deleted file mode 100644
index 78df59ab7..000000000
Binary files a/img/sprite2x.png and /dev/null differ
diff --git a/js/id/svg/surface.js b/js/id/svg/surface.js
index c37f5d89b..5ffdbb835 100644
--- a/js/id/svg/surface.js
+++ b/js/id/svg/surface.js
@@ -102,7 +102,7 @@ iD.svg.Surface = function() {
defs.append('image')
.attr('id', 'sprite')
- .attr('xlink:href', 'img/sprite.png')
+ .attr('xlink:href', 'img/sprite.svg')
.call(autosize);
defs.selectAll()
diff --git a/js/id/ui/background.js b/js/id/ui/background.js
index 2bc6e2c69..7fceee789 100644
--- a/js/id/ui/background.js
+++ b/js/id/ui/background.js
@@ -292,23 +292,29 @@ iD.ui.Background = function(context) {
var nudge_container = adjustments
.append('div')
- .attr('class', 'nudge-container')
+ .attr('class', 'nudge-container cf')
.style('display', 'none');
nudge_container.selectAll('button')
.data(directions).enter()
.append('button')
.attr('class', function(d) { return d[0] + ' nudge'; })
- .text(function(d) { return d[0]; })
.on('mousedown', clickNudge);
- nudge_container.append('button')
- .text(t('background.reset'))
+ resetButton = nudge_container.append('button')
.attr('class', 'reset')
.on('click', function() {
context.background().offset([0, 0]);
context.redraw();
- });
+ })
+
+ resetButton.append('div')
+ .attr('class','icon undo');
+
+ resetButton.call(bootstrap.tooltip()
+ .title(t('background.reset'))
+ .placement('right'));
+
context.map()
.on('move.background-update', _.debounce(update, 1000));
diff --git a/svg/cursors.svg b/svg/cursors.svg
index c7c22d682..1c71eb967 100644
--- a/svg/cursors.svg
+++ b/svg/cursors.svg
@@ -52,16 +52,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="5.6568542"
- inkscape:cx="-499.08138"
- inkscape:cy="987.80023"
+ inkscape:zoom="1"
+ inkscape:cx="-405.07998"
+ inkscape:cy="990.65897"
inkscape:document-units="px"
- inkscape:current-layer="layer1"
+ inkscape:current-layer="cursor-draw-connect-line"
showgrid="false"
inkscape:window-width="1337"
inkscape:window-height="840"
- inkscape:window-x="337"
- inkscape:window-y="105"
+ inkscape:window-x="457"
+ inkscape:window-y="78"
inkscape:window-maximized="0"
inkscape:snap-bbox="true"
showguides="false"
@@ -89,7 +89,7 @@
image/svg+xml
-
+
@@ -97,6 +97,13 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
+
+ inkscape:export-ydpi="180"
+ transform="translate(20,0)">
+ inkscape:export-filename="/Users/saman/work_repos/iD/img/cursor-select-line2x.png"
+ transform="translate(-20,30)">
+ inkscape:export-ydpi="180"
+ transform="translate(-10,30)">
+ inkscape:export-ydpi="179.88307"
+ transform="translate(10,0)">
+
+ inkscape:export-filename="/Users/saman/work_repos/iD/img/cursor-select-point2x.png"
+ transform="translate(10,0)">
+ inkscape:export-ydpi="180"
+ transform="translate(30,0)">
+ inkscape:export-ydpi="180"
+ transform="translate(-20,0)">
@@ -926,7 +946,8 @@
inkscape:label="cursor-draw"
inkscape:export-filename="/Users/saman/work_repos/iD/img/cursor-draw2x.png"
inkscape:export-xdpi="179.9978"
- inkscape:export-ydpi="179.9978">
+ inkscape:export-ydpi="179.9978"
+ transform="translate(-10,0)">
+ inkscape:export-ydpi="180"
+ transform="translate(-10,0)">
diff --git a/svg/sprite.svg b/svg/sprite-unoptimized.svg
similarity index 68%
rename from svg/sprite.svg
rename to svg/sprite-unoptimized.svg
index 2dc957abb..891ef25a8 100644
--- a/svg/sprite.svg
+++ b/svg/sprite-unoptimized.svg
@@ -38,22 +38,22 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="16"
- inkscape:cx="505.57911"
- inkscape:cy="546.02445"
+ inkscape:zoom="32"
+ inkscape:cx="24.435186"
+ inkscape:cy="349.93302"
inkscape:document-units="px"
inkscape:current-layer="layer12"
- showgrid="true"
+ showgrid="false"
inkscape:window-width="1483"
inkscape:window-height="804"
- inkscape:window-x="293"
+ inkscape:window-x="35"
inkscape:window-y="0"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
- showguides="true"
+ showguides="false"
inkscape:guide-bbox="true"
inkscape:snap-bbox="true"
inkscape:snap-nodes="true"
@@ -232,26 +232,17 @@
-
-
-
+
-
-
-
-
+ d="M 89 2 L 84 6.5 L 89 11 L 89 8 L 92 8 L 93 9 L 93 12 L 92 13 L 87 13 L 86 14 L 86 15 L 87 16 L 92 16 L 94 15 L 95 14 L 96 12 L 96 9 L 95 7 L 94 6 L 92 5 L 89 5 L 89 2 z M 111 2 L 111 5 L 108 5 L 106 6 L 105 7 L 104 9 L 104 12 L 105 14 L 106 15 L 108 16 L 113 16 L 114 15 L 114 14 L 113 13 L 108 13 L 107 12 L 107 9 L 108 8 L 111 8 L 111 11 L 116 6.5 L 111 2 z M 10.84375 3 C 10.5625 3.046875 10 3.25 10 4 L 10 8 C 10 8 10 8.5 9.5 8.5 C 9 8.5 9.070717 8.22484 9 8 C 8.695312 7.03125 8.132813 5.63541 8 5 C 7.795405 4.02115 7.333333 4 7 4 C 6 4 6 5 6 5 L 7 9 L 7 12 L 5.5 10.5 C 4.945312 9.94531 4.257659 9.74299 3.8125 10 C 3.377049 10.25141 3.150942 10.89541 3.5 11.5 C 3.853553 12.11237 7 16 7 16 C 8 17 9 17 11 17 L 14 17 C 16 17 16.288488 14.13454 17 12 C 18 9 18.5 7 18.5 7 C 18.613427 6.57668 18.45711 6.154 18 6 C 17.119539 5.70338 16.63994 6.35278 16.5 7 C 16.25 8.15625 16 9 16 9 C 15.90625 9.31383 16.0013 9.5 15.5 9.5 C 14.99086 9.5 15 9 15 9 L 15 5 C 15 4 14 4 14 4 C 14 4 13 4 13 5 L 13 8 C 13 8 13.01305 8.5 12.5 8.5 C 11.998673 8.5 12 8 12 8 L 12 4 C 12 3 11 3 11 3 C 11 3 10.9375 2.984375 10.84375 3 z M 54 3 L 53 4 L 53 5.59375 L 46.59375 12 L 45 12 L 44 13 L 44 15 L 45 16 L 47 16 L 48 15 L 48 13.40625 L 54.40625 7 L 56 7 L 57 6 L 57 4 L 56 3 L 54 3 z M 150 3 L 144 9 L 145 10 L 148 10 L 148 16 L 149 17 L 151 17 L 152 16 L 152 10 L 155 10 L 156 9 L 150 3 z M 32 4 C 29.23858 4 27 6.23858 27 9 C 27 11.76143 32 16 32 16 C 32 16 37 11.76143 37 9 C 37 6.23858 34.76142 4 32 4 z M 55 4 C 55.55228 4 56 4.44772 56 5 C 56 5.55229 55.55228 6 55 6 C 54.74848 6 54.51948 5.9033 54.34375 5.75 C 54.30935 5.71998 54.28 5.69066 54.25 5.65625 C 54.09665 5.480519 54 5.251521 54 5 C 54 4.44772 54.44772 4 55 4 z M 65 4 L 64 5 L 64 7 L 65 8 L 65 12 L 64 13 L 64 15 L 65 16 L 67 16 L 68 15 L 72 15 L 73 16 L 75 16 L 76 15 L 76 13 L 75 12 L 75 8 L 76 7 L 76 5 L 75 4 L 73 4 L 72 5 L 68 5 L 67 4 L 65 4 z M 134.5 4 L 129.5625 12.5625 L 126 9 L 125 9 L 124 10 L 124 11 L 129 16 L 130 16 L 131 16 L 137 6 L 137 5 L 136 4 L 134.5 4 z M 165 4 L 164 5 L 164 6 L 168 10 L 164 14 L 164 15 L 165 16 L 166 16 L 170 12 L 174 16 L 175 16 L 176 15 L 176 14 L 172 10 L 176 6 L 176 5 L 175 4 L 174 4 L 170 8 L 166 4 L 165 4 z M 186 4 L 185 5 L 185 6 L 186 7 L 194 7 L 195 6 L 195 5 L 194 4 L 186 4 z M 226.125 4 L 225 5 L 225 15 L 226.125 16 L 229.5 13.125 L 232.875 16 L 234 15 L 234 5 L 232.875 4 L 226.125 4 z M 66 5 C 66.55228 5 67 5.447715 67 6 C 67 6.552285 66.55228 7 66 7 C 65.44772 7 65 6.552285 65 6 C 65 5.447715 65.44772 5 66 5 z M 74 5 C 74.55228 5 75 5.447715 75 6 C 75 6.552285 74.55228 7 74 7 C 73.44772 7 73 6.552285 73 6 C 73 5.447715 73.44772 5 74 5 z M 206 5 L 205 6 L 205 7 L 208 10 L 205 13 L 205 14 L 206 15 L 207 15 L 210 12 L 213 15 L 214 15 L 215 14 L 215 13 L 212 10 L 215 7 L 215 6 L 214 5 L 213 5 L 210 8 L 207 5 L 206 5 z M 32.15625 7 C 33.26082 7 34.15625 7.89543 34.15625 9 C 34.15625 10.10457 33.26082 11 32.15625 11 C 31.051681 11 30.15625 10.10457 30.15625 9 C 30.15625 7.89543 31.051681 7 32.15625 7 z M 68 7 L 72 7 L 73 8 L 73 12 L 72 13 L 68 13 L 67 12 L 67 8 L 68 7 z M 186 8 L 186 15 L 187 16 L 193 16 L 194 15 L 194 8 L 186 8 z M 188 10 L 189 10 L 189 14 L 188 14 L 188 13 L 188 10 z M 191 10 L 192 10 L 192 13 L 192 14 L 191 14 L 191 10 z M 46 13 C 46.25152 13 46.48052 13.0967 46.65625 13.25 L 46.75 13.34375 C 46.90335 13.519481 47 13.748484 47 14 C 47 14.55229 46.55228 15 46 15 C 45.44772 15 45 14.55229 45 14 C 45 13.44772 45.44772 13 46 13 z M 66 13 C 66.55228 13 67 13.447715 67 14 C 67 14.552285 66.55228 15 66 15 C 65.44772 15 65 14.552285 65 14 C 65 13.447715 65.44772 13 66 13 z M 74 13 C 74.55228 13 75 13.447715 75 14 C 75 14.552285 74.55228 15 74 15 C 73.44772 15 73 14.552285 73 14 C 73 13.447715 73.44772 13 74 13 z "
+ transform="translate(25,-3.0624999e-6)"
+ id="path2997" />
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="path33341"
+ d="m 416.5,23.999996 c -2.48528,0 -4.5,2.01472 -4.5,4.499999 0,0.723491 0.19662,1.394364 0.50001,2.000006 L 409,33.999996 l 0,1.999999 2.00001,0 3.49999,-3.499997 c 0.60565,0.303377 1.27651,0.499995 2,0.499995 2.48528,0 4.5,-2.014712 4.5,-4.499998 0,-2.485279 -2.01472,-4.499999 -4.5,-4.499999 z m 0,1.999999 c 1.38071,0 2.5,1.119291 2.5,2.5 0,1.380716 -1.11929,2.500001 -2.5,2.500001 -1.38071,0 -2.5,-1.119285 -2.5,-2.500001 0,-1.380709 1.11929,-2.5 2.5,-2.5 z"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ sodipodi:nodetypes="sscccccsssscccccssccccsccccccccccsc" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
-
-
-
+ sodipodi:nodetypes="cccccccccssc" />
+ sodipodi:nodetypes="cccccccccccccccc" />
-
-
-
@@ -1859,11 +1497,10 @@
id="g4494"
transform="translate(-781,47)">
+ style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 3.90625 224.6875 L 11.71875 245.1875 L 3.90625 265.6875 L 11.71875 286.21875 L 3.90625 306.71875 L 8.71875 308.5625 L 34.75 282.5 L 39.4375 283.21875 L 45.125 277.53125 C 41.775781 273.65113 39.245 269.01908 37.875 263.90625 L 40.5625 261.75 C 40.104961 259.6267 39.84375 257.41382 39.84375 255.15625 C 39.84375 243.87823 45.856641 233.96472 54.84375 228.46875 L 44.9375 224.6875 L 24.40625 232.5 L 3.90625 224.6875 z M 71 229 C 56.640596 229 45 240.6406 45 255 C 45 269.3594 56.640596 281 71 281 C 85.359404 281 97 269.3594 97 255 C 97 240.6406 85.359404 229 71 229 z M 91.0625 279.15625 C 85.64168 283.67486 78.681875 286.40625 71.09375 286.40625 C 68.836172 286.40625 66.62332 286.14503 64.5 285.6875 L 62.34375 288.34375 C 57.488438 287.04279 53.037578 284.7548 49.28125 281.65625 L 43.40625 287.53125 L 44.125 291.875 L 22.3125 313.71875 L 24.40625 314.53125 L 44.9375 306.71875 L 65.4375 314.53125 L 85.9375 306.71875 L 93.75 286.21875 L 91.0625 279.15625 z "
+ transform="matrix(2.56,0,0,2.56,-1375,-657.83782)"
+ id="path6718" />
-
-
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+