CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-07 03:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the rest of the icons (leave walkthrough graphics alone for now)

Browse Source
This commit is contained in:
Bryan Housel
2015-11-02 17:20:26 -05:00
parent 7a9acd84ee
commit 3853c0d993
31 changed files with 186 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
css/app.css
View File

@@ -481,26 +481,38 @@ button.save.has-count .count::before {
/* Icons */
.icon {
vertical-align: top;
width: 20px;
height: 20px;
vertical-align: top;
width: 20px;
height: 20px;
}
.icon-out-link {
vertical-align: text-top;
width: 14px;
height: 14px;
margin: 0px 3px;
.icon.inline {
vertical-align: text-top;
width: 14px;
height: 14px;
margin: 0px 3px;
}
.icon-pre-text {
.icon.pre-text {
margin-right: 3px;
}
.icon-light {
.icon.light {
color: #fff;
}
.icon.created {
color: #00ca07;
}
.icon.modified {
color: #666;
}
.icon.deleted {
color: #ea0000;
}
.user-icon {
max-height: 20px;
max-width: 20px;
@@ -509,36 +521,6 @@ button.save.has-count .count::before {
border-radius: 3px;
}
/* Definitions for every icon */
.icon.point,
.icon.add-point { background-position: -20px 0;}
.icon.line,
.icon.add-line { background-position: -40px 0;}
.icon.area,
.icon.add-area { background-position: -60px 0;}
.icon.apply { background-position: -120px 0;}
.icon.save { background-position: -140px 0;}
.icon.close { background-position: -160px 0;}
.icon.inspect { background-position: -220px 0;}
.icon.zoom-in,
.icon.plus { background-position: -240px 0;}
.icon.zoom-out,
.icon.minus { background-position: -260px 0;}
.icon.delete { background-position: 0 -140px; }
/*
.icon.point.deleted { background-position: -480px -80px;}
.icon.line.deleted { background-position: -500px -80px;}
.icon.area.deleted { background-position: -520px -80px;}
.icon.point.created { background-position: -480px -100px;}
.icon.line.created { background-position: -500px -100px;}
.icon.area.created { background-position: -520px -100px;}
.icon.point.modified { background-position: -22px 0; }
.icon.modified { opacity: .5; }
*/
/* ToolBar / Persistent UI Elements
------------------------------------------------------- */
@@ -2427,7 +2409,7 @@ div.full-screen > button:hover {
}
.modal-actions button:before,
.save-success a.button:before,
.save-success a.button.osm:before,
.walkthrough a:before {
display: block;
content: '';
@@ -2436,7 +2418,7 @@ div.full-screen > button:hover {
max-width: 100px;
margin: auto;
margin-bottom: 10px;
background:transparent url(img/iD-sprite.svg) no-repeat 0 -220px;
background:transparent url(img/iD-sprite.svg) no-repeat -200px -460px;
}
.modal-actions :first-child {
@@ -2451,11 +2433,11 @@ div.full-screen > button:hover {
------------------------------------------------------- */
.modal-actions .restore:before {
background-position: -600px -220px;
background-position: -500px -460px;
}
.modal-actions .reset:before {
background-position: -700px -220px;
background-position: -600px -460px;
}
/* Success Modal
@@ -2469,28 +2451,18 @@ div.full-screen > button:hover {
padding-top: 15px;
}
.save-success .button.social {
height: 80px;
.save-success a.button.social {
height: auto;
}
.save-success .button.social:before {
height: 50px;
.save-success .icon.social {
height: 80px;
width: 80px;
color: #7092FF;
}
.save-success .button.osm:before {
background-position: 0px -220px;
}
.save-success .button.twitter:before {
background-position: -100px -245px;
}
.save-success .button.facebook:before {
background-position: -200px -245px;
}
.save-success .button.google:before {
background-position: -300px -245px;
background-position: -200px -460px;
}
/* Splash Modal
@@ -2498,11 +2470,11 @@ div.full-screen > button:hover {
.modal-actions .walkthrough:before,
.walkthrough a:before {
background-position: -400px -220px;
background-position: -300px -460px;
}
.modal-actions .start:before {
background-position: -500px -220px;
background-position: -400px -460px;
}
/* Commit Modal
@@ -2909,7 +2881,6 @@ div.full-screen > button:hover {
------------------------------------------------------- */
@media only screen and (max-width: 840px) {
#bar .icon.icon-pre-text { margin-right: 0;}
/* override hide for save button */
#bar .save .label { display: block;}
}
@@ -3051,6 +3022,6 @@ div.full-screen > button:hover {
.huge-modal-button .illustration {
height: 100px;
width: 100px;
background: rgba(0, 0, 0, 0) url(img/iD-sprite.svg) no-repeat -400px -220px;
background: rgba(0, 0, 0, 0) url(img/iD-sprite.svg) no-repeat -300px -460px;
margin: auto;
}

80
dist/img/iD-sprite.svg vendored
View File

@@ -29,7 +29,7 @@
<path d="M349.5,4 C352.543,4 355,6.457 355,9.5 C355,12.543 352.543,15 349.5,15 C346.457,15 344,12.543 344,9.5 C344,6.457 346.457,4 349.5,4 z"/>
</clipPath>
</defs>
<symbol id="feature-images" viewBox="0 480 200 80">
<g id="feature-images">
<path d="M0,480 L200,480 L200,560 L0,560 z" fill="#FFFFFF" id="rect8477"/>
<g id="img-waterway-river">
<path d="M140,530 L180,530 L180,533 L140,533 z" fill="#60D4DE" id="rect24309"/>
@@ -67,8 +67,8 @@
<path d="M61,532.5 C61,533.328 60.328,534 59.5,534 C58.672,534 58,533.328 58,532.5 C58,531.672 58.672,531 59.5,531 C60.328,531 61,531.672 61,532.5 z" fill="#FFFFFF" id="path7169"/>
</g>
</g>
</symbol>
<symbol id="landuse-images" viewBox="0 400 200 80">
</g>
<g id="landuse-images">
<path d="M0,400 L200,400 L200,480 L0,480 z" fill="#FFFFFF" id="rect9903"/>
<path d="M128.955,427.415 C126.526,433.621 112.429,437.423 97.471,435.906 C82.513,434.39 72.36,428.129 74.795,421.924 C77.229,415.721 91.324,411.921 106.278,413.437 C121.231,414.953 131.384,421.211 128.955,427.415 z" fill="#7092FF" id="path10275"/>
<path d="M53,436 L18,446 L18,440 L53,430 z" fill="#A9A9A9" id="path9990"/>
@@ -87,8 +87,8 @@
<path d="M107,417 C107,417 109.636,420.529 112.438,420.969 C107.96,420.816 107,419 107,419 C107,419 106.04,420.816 101.562,420.969 C104.364,420.529 107,417 107,417 z" fill="#FFFFFF" id="path10271"/>
<path d="M93,419 C93,419 95.636,422.529 98.438,422.969 C93.96,422.816 93,421 93,421 C93,421 92.04,422.816 87.562,422.969 C90.364,422.529 93,419 93,419 z" fill="#FFFFFF" id="path10269"/>
<path d="M103,424 C103,424 105.636,427.529 108.438,427.969 C103.96,427.816 103,426 103,426 C103,426 102.04,427.816 97.562,427.969 C100.364,427.529 103,424 103,424 z" fill="#FFFFFF" id="path10253"/>
</symbol>
<symbol id="poi-images" viewBox="0 320 200 80">
</g>
<g id="poi-images">
<path d="M0,320 L200,320 L200,400 L0,400 z" fill="#FFFFFF"/>
<path d="M170,351 C161.716,351 155,357.716 155,366 C155,374.284 170,387 170,387 C170,387 185,374.284 185,366 C185,357.716 178.284,351 170,351 z" fill="#7092FF"/>
<path d="M100,351 C91.716,351 85,357.716 85,366 C85,374.284 100,387 100,387 C100,387 115,374.284 115,366 C115,357.716 108.284,351 100,351 z" fill="#7092FF"/>
@@ -100,25 +100,25 @@
<path d="M24,356 C23.446,356 23,356.446 23,357 L23,373 C23,373.5 23.5,374 24,374 L33,374 C33.5,374 34,373.5 34,373 L34,368 L34.5,368 C35,368 35,368.5 35,368.5 L35,370.5 C35,371.5 35.5,372 36.5,372 C37.5,372 38,371.5 38,370.5 C38,369.333 38,366 38,365 C38,364 36,363 36,362 L36,359 L35,359 L34,358 L34,357 C34,356.446 33.554,356 33,356 z M25,358 L32,358 L32,362 L25,362 z M34,361 L35,361 C35,361 35,361.833 35,362.5 C35,363.5 37,364.5 37,365.5 L37,370.5 C37,371 36.5,371 36.5,371 C36.5,371 36,371 36,370.5 C36,370.5 36,368.5 36,368 C36,367.5 35.5,367 35,367 C34.667,367 34,367 34,367 z" fill="#FFFFFF"/>
<path d="M134,338 C133.446,338 133,338.446 133,339 L133,343 L129,343 C128.446,343 128,343.446 128,344 L128,347 C128,347.554 128.446,348 129,348 L133,348 L133,352 C133,352.554 133.446,353 134,353 L137,353 C137.554,353 138,352.554 138,352 L138,348 L142,348 C142.554,348 143,347.554 143,347 L143,344 C143,343.446 142.554,343 142,343 L138,343 L138,339 C138,338.446 137.554,338 137,338 z" fill="#FFFFFF"/>
<path d="M59,338 C58.446,338 58,338.446 58,339 L58,348 C58,348.554 58.446,349 59,349 L70,349 C70.554,349 71,348.554 71,348 L71,347 L71.5,347 C72,347 72,346.5 72,346.5 L72,346 L73,346 C74,346 75,345 75,344 L75,343 L75,341 C75,340.5 74.5,340 74,340 L71,340 L71,339 C71,338.446 70.554,338 70,338 z M71,341 L73.5,341 C74,341 74,341.5 74,341.5 L74,344 C74,344.5 73.5,345 73,345 L72,345 L71,345 z M56,350 L57,351 L58,352 L71,352 L72,351 L73,350 z" fill="#FFFFFF"/>
</symbol>
</g>
<g id="logos">
<symbol id="logo-reset" viewBox="580 480 80 80">
<path d="M590,487 L587,490 L587,495 L612,520 L587,545 L587,550 L590,553 L595,553 L620,528 L645,553 L650,553 L653,550 L653,545 L628,520 L653,495 L653,490 L650,487 L645,487 L620,512 L595,487 L590,487 z" fill="currentColor" id="logo-reset-shape"/>
</symbol>
<symbol id="logo-restore" viewBox="500 480 80 80">
<path d="M540,481 L538,483 L538,488.062 C519.66,489.114 505,504.406 505,523 C505,542.271 520.729,558 540,558 C559.271,558 575,542.271 575,523 C575,511.334 569.233,500.963 560.406,494.594 L553.219,501.781 C560.301,506.179 565,513.999 565,523 C565,536.866 553.866,548 540,548 C526.134,548 515,536.866 515,523 C515,509.81 525.083,499.108 538,498.094 L538,503 L540,505 L543,505 L555,493 L543,481 L540,481 z" fill="currentColor" id="logo-restore-shape"/>
</symbol>
<symbol id="logo-features" viewBox="400 460 100 100">
<g id="logo-reset">
<path d="M620,477 L617,480 L617,485 L642,510 L617,535 L617,540 L620,543 L625,543 L650,518 L675,543 L680,543 L683,540 L683,535 L658,510 L683,485 L683,480 L680,477 L675,477 L650,502 L625,477 L620,477 z" fill="#E06D5F" id="logo-reset-shape"/>
</g>
<g id="logo-restore">
<path d="M550,471 L548,473 L548,478.062 C529.66,479.114 515,494.406 515,513 C515,532.271 530.729,548 550,548 C569.271,548 585,532.271 585,513 C585,501.334 579.233,490.963 570.406,484.594 L563.219,491.781 C570.301,496.179 575,503.999 575,513 C575,526.866 563.866,538 550,538 C536.134,538 525,526.866 525,513 C525,499.81 535.083,489.108 548,488.094 L548,493 L550,495 L553,495 L565,483 L553,471 L550,471 z" fill="#7092FF" id="logo-restore-shape"/>
</g>
<g id="logo-features">
<path d="M467.531,471 C459.247,471 452.531,477.716 452.531,486 C452.531,494.284 467.531,507 467.531,507 C467.531,507 482.531,494.284 482.531,486 C482.531,477.716 475.816,471 467.531,471 z M468,480 C471.314,480 474,482.686 474,486 C474,489.314 471.314,492 468,492 C464.687,492 462,489.314 462,486 C462,482.686 464.687,480 468,480 z" fill="#7092FF" id="logo-features-shape3"/>
<path d="M483.5,508 C479.358,508 476,511.358 476,515.5 C476,516.256 476.136,516.969 476.344,517.656 L457.656,536.344 C456.968,536.136 456.256,536 455.5,536 C451.358,536 448,539.358 448,543.5 C448,547.642 451.358,551 455.5,551 C459.642,551 463,547.642 463,543.5 C463,542.744 462.864,542.031 462.656,541.344 L481.344,522.656 C482.032,522.864 482.744,523 483.5,523 C487.642,523 491,519.642 491,515.5 C491,511.358 487.642,508 483.5,508 z M483.5,512.5 C485.157,512.5 486.5,513.843 486.5,515.5 C486.5,517.157 485.157,518.5 483.5,518.5 C481.843,518.5 480.5,517.157 480.5,515.5 C480.5,513.843 481.843,512.5 483.5,512.5 z M455.5,540.5 C457.157,540.5 458.5,541.843 458.5,543.5 C458.5,545.157 457.157,546.5 455.5,546.5 C453.843,546.5 452.5,545.157 452.5,543.5 C452.5,541.843 453.843,540.5 455.5,540.5 z" fill="#7092FF" id="logo-features-shape2"/>
<path d="M416.5,493 C412.358,493 409,496.358 409,500.5 C409,503.373 410.628,505.865 413,507.125 L413,520.875 C410.628,522.135 409,524.627 409,527.5 C409,531.642 412.358,535 416.5,535 C419.373,535 421.865,533.372 423.125,531 L436.875,531 C438.135,533.372 440.627,535 443.5,535 C447.642,535 451,531.642 451,527.5 C451,524.627 449.372,522.135 447,520.875 L447,507.125 C449.372,505.865 451,503.373 451,500.5 C451,496.358 447.642,493 443.5,493 C440.592,493 438.088,494.675 436.844,497.094 L436.656,497 L423.125,497 C421.865,494.628 419.373,493 416.5,493 z M416.5,497.5 C418.157,497.5 419.5,498.843 419.5,500.5 C419.5,502.157 418.157,503.5 416.5,503.5 C414.843,503.5 413.5,502.157 413.5,500.5 C413.5,498.843 414.843,497.5 416.5,497.5 z M443.5,497.5 C445.157,497.5 446.5,498.843 446.5,500.5 C446.5,502.157 445.157,503.5 443.5,503.5 C441.843,503.5 440.5,502.157 440.5,500.5 C440.5,498.843 441.843,497.5 443.5,497.5 z M423.125,504 L436.875,504 C437.578,505.323 438.677,506.422 440,507.125 L440,520.875 C438.677,521.578 437.578,522.677 436.875,524 L423.125,524 C422.422,522.677 421.323,521.578 420,520.875 L420,507.125 C421.323,506.422 422.422,505.323 423.125,504 z M416.5,524.5 C418.157,524.5 419.5,525.843 419.5,527.5 C419.5,529.157 418.157,530.5 416.5,530.5 C414.843,530.5 413.5,529.157 413.5,527.5 C413.5,525.843 414.843,524.5 416.5,524.5 z M443.5,524.5 C445.157,524.5 446.5,525.843 446.5,527.5 C446.5,529.157 445.157,530.5 443.5,530.5 C441.843,530.5 440.5,529.157 440.5,527.5 C440.5,525.843 441.843,524.5 443.5,524.5 z" fill="#7092FF" id="logo-features-shape1"/>
</symbol>
<symbol id="logo-walkthrough" viewBox="300 460 100 100">
<path d="M305,468 C305,492.885 305,517.771 305,542.656 C312.5,546.104 320,549.552 327.5,553 C335,549.667 342.5,546.333 350,543 C357.5,546.333 365,549.667 372.5,553 C380,549.552 387.5,546.104 395,542.656 C395,517.771 395,492.885 395,468 C387.5,471.333 380,474.667 372.5,478 C365,474.667 357.5,471.333 350,468 C342.5,471.333 335,474.667 327.5,478 C320,474.667 312.5,471.333 305,468 z M362.406,491.594 L368,497.188 L373.594,491.594 L376.056,494.756 L370.812,500 L376.406,505.594 L373.244,508.056 L368,502.812 L362.406,508.406 L359.319,505.431 L365.188,500 L359.594,494.406 z M337.219,503.906 C340.248,504.171 343.258,505.231 345.594,507.219 L342.688,510 C340.99,508.733 338.912,508.062 336.813,507.875 C336.948,506.552 337.084,505.229 337.219,503.906 z M332.375,504.281 C332.609,505.537 333.708,507.147 333.656,508.094 C331.677,509.095 330.374,511.09 329.25,512.844 L326.101,510.327 C327.697,507.9 329.611,505.435 332.375,504.281 z M365.844,510.562 L369.531,512.156 C368.676,514.791 367.472,517.356 365.656,519.469 L362.875,516.562 C364.255,514.787 365.19,512.705 365.844,510.562 z M348.625,510.656 C350.155,512.869 351.085,515.419 352.469,517.719 L348.875,519.5 C347.613,517.332 346.722,514.942 345.281,512.875 C346.396,512.135 347.511,511.396 348.625,510.656 z M323.875,514.469 L327.312,516.5 C326.366,518.654 325.484,520.883 324.781,523.094 L321.113,521.432 C321.904,519.065 322.803,516.724 323.875,514.469 z M360.125,519.094 L361.725,522.775 C359.006,524.297 355.468,524.858 352.594,523.438 L354.762,520.026 C356.531,520.57 358.608,520.033 360.125,519.094 z" fill="currentColor" id="logo-walkthrough-shape"/>
</symbol>
<symbol id="logo-osm" viewBox="200 460 100 100">
<path d="M204,465 L211.812,485.5 L204,506 L211.812,526.531 L204,547.031 L208.812,548.875 L234.844,522.812 L239.531,523.531 L245.219,517.844 C241.87,513.964 239.339,509.332 237.969,504.219 L240.656,502.062 C240.199,499.939 239.938,497.726 239.938,495.469 C239.938,484.191 245.95,474.277 254.938,468.781 L245.031,465 L224.5,472.812 L204,465 z M271.094,469.312 C256.734,469.312 245.094,480.953 245.094,495.312 C245.094,509.672 256.734,521.312 271.094,521.312 C285.453,521.312 297.094,509.672 297.094,495.312 C297.094,480.953 285.453,469.312 271.094,469.312 z M291.156,519.469 C285.735,523.987 278.776,526.719 271.188,526.719 C268.93,526.719 266.717,526.458 264.594,526 L262.438,528.656 C257.582,527.355 253.131,525.067 249.375,521.969 L243.5,527.844 L244.219,532.188 L222.406,554.031 L224.5,554.844 L245.031,547.031 L265.531,554.844 L286.031,547.031 L293.844,526.531 L291.156,519.469 z" fill="currentColor" id="logo-osm-shape"/>
</symbol>
</g>
<g id="logo-walkthrough">
<path d="M305,468 C305,492.885 305,517.771 305,542.656 C312.5,546.104 320,549.552 327.5,553 C335,549.667 342.5,546.333 350,543 C357.5,546.333 365,549.667 372.5,553 C380,549.552 387.5,546.104 395,542.656 C395,517.771 395,492.885 395,468 C387.5,471.333 380,474.667 372.5,478 C365,474.667 357.5,471.333 350,468 C342.5,471.333 335,474.667 327.5,478 C320,474.667 312.5,471.333 305,468 z M362.406,491.594 L368,497.188 L373.594,491.594 L376.056,494.756 L370.812,500 L376.406,505.594 L373.244,508.056 L368,502.812 L362.406,508.406 L359.319,505.431 L365.188,500 L359.594,494.406 z M337.219,503.906 C340.248,504.171 343.258,505.231 345.594,507.219 L342.688,510 C340.99,508.733 338.912,508.062 336.813,507.875 C336.948,506.552 337.084,505.229 337.219,503.906 z M332.375,504.281 C332.609,505.537 333.708,507.147 333.656,508.094 C331.677,509.095 330.374,511.09 329.25,512.844 L326.101,510.327 C327.697,507.9 329.611,505.435 332.375,504.281 z M365.844,510.562 L369.531,512.156 C368.676,514.791 367.472,517.356 365.656,519.469 L362.875,516.562 C364.255,514.787 365.19,512.705 365.844,510.562 z M348.625,510.656 C350.155,512.869 351.085,515.419 352.469,517.719 L348.875,519.5 C347.613,517.332 346.722,514.942 345.281,512.875 C346.396,512.135 347.511,511.396 348.625,510.656 z M323.875,514.469 L327.312,516.5 C326.366,518.654 325.484,520.883 324.781,523.094 L321.113,521.432 C321.904,519.065 322.803,516.724 323.875,514.469 z M360.125,519.094 L361.725,522.775 C359.006,524.297 355.468,524.858 352.594,523.438 L354.762,520.026 C356.531,520.57 358.608,520.033 360.125,519.094 z" fill="#7092FF" id="logo-walkthrough-shape"/>
</g>
<g id="logo-osm">
<path d="M204,465 L211.812,485.5 L204,506 L211.812,526.531 L204,547.031 L208.812,548.875 L234.844,522.812 L239.531,523.531 L245.219,517.844 C241.87,513.964 239.339,509.332 237.969,504.219 L240.656,502.062 C240.199,499.939 239.938,497.726 239.938,495.469 C239.938,484.191 245.95,474.277 254.938,468.781 L245.031,465 L224.5,472.812 L204,465 z M271.094,469.312 C256.734,469.312 245.094,480.953 245.094,495.312 C245.094,509.672 256.734,521.312 271.094,521.312 C285.453,521.312 297.094,509.672 297.094,495.312 C297.094,480.953 285.453,469.312 271.094,469.312 z M291.156,519.469 C285.735,523.987 278.776,526.719 271.188,526.719 C268.93,526.719 266.717,526.458 264.594,526 L262.438,528.656 C257.582,527.355 253.131,525.067 249.375,521.969 L243.5,527.844 L244.219,532.188 L222.406,554.031 L224.5,554.844 L245.031,547.031 L265.531,554.844 L286.031,547.031 L293.844,526.531 L291.156,519.469 z" fill="#7092FF" id="logo-osm-shape"/>
</g>
<symbol id="logo-google" viewBox="320 400 60 60">
<path d="M333.5,411 C332.115,411 331,412.115 331,413.5 L331,451 C331,452.385 332.115,453.5 333.5,453.5 L368.5,453.5 C369.885,453.5 371,452.385 371,451 L371,413.5 C371,412.115 369.885,411 368.5,411 L333.5,411 z M345.922,419.953 L353.656,419.953 L351.922,421.219 L349.469,421.219 C351.095,421.844 351.953,423.727 351.953,425.672 C351.953,427.306 351.06,428.72 349.781,429.719 C348.534,430.693 348.297,431.093 348.297,431.922 C348.297,432.629 349.629,433.833 350.328,434.328 C352.371,435.773 353.031,437.12 353.031,439.359 C353.031,442.152 350.333,444.922 345.438,444.922 C341.144,444.922 337.516,443.183 337.516,440.391 C337.516,437.555 340.816,434.812 345.109,434.812 L346.453,434.812 C345.866,434.241 345.406,433.536 345.406,432.672 C345.406,432.159 345.568,431.657 345.797,431.219 C345.564,431.236 345.324,431.25 345.078,431.25 C341.551,431.25 339.188,428.734 339.188,425.625 C339.188,422.583 342.455,419.953 345.922,419.953 z M360.5,420.5 L362,420.5 L362,425 L366.5,425 L366.5,426.5 L362,426.5 L362,431 L360.5,431 L360.5,426.5 L356,426.5 L356,425 L360.5,425 L360.5,420.5 z M344.594,421.062 C342.807,421.243 341.647,423.156 341.969,425.609 C342.312,428.225 344.211,430.394 346.203,430.453 C346.231,430.454 346.253,430.453 346.281,430.453 C348.226,430.453 349.526,428.408 349.187,425.828 C348.843,423.212 346.945,421.122 344.953,421.062 C344.829,421.059 344.713,421.051 344.594,421.062 z M345.938,435.531 C342.97,435.499 340.312,437.351 340.312,439.562 C340.312,441.819 342.454,443.688 345.422,443.688 C349.594,443.688 351.047,441.929 351.047,439.672 C351.047,439.4 351.014,439.134 350.953,438.875 C350.627,437.598 349.471,436.964 347.859,435.844 C347.273,435.654 346.63,435.538 345.938,435.531 z" fill="currentColor" id="logo-google-shape"/>
</symbol>
@@ -130,9 +130,13 @@
</symbol>
</g>
<g id="operations">
<symbol id="operation-continue" viewBox="420 380 20 20" x="-10" y="-10">
<path d="M434.005,384 C430.691,384 428.005,386.686 428.005,390 C428.005,393.314 430.691,396 434.005,396 C437.319,396 440.005,393.314 440.005,390 C440.005,386.686 437.319,384 434.005,384 z M433.005,386 L435.005,386 L435.005,389 L438.005,389 L438.005,391 L435.005,391 L435.005,394 L433.005,394 L433.005,391 L430.005,391 L430.005,389 L433.005,389 L433.005,386 z M425.005,389 L425.005,391 L427.005,391 L427.005,389 L425.005,389 z" fill="currentColor" id="operation-continue-shape2"/>
<path d="M422.005,388 C420.9,388 420.005,388.895 420.005,390 C420.005,391.105 420.9,392 422.005,392 C423.109,392 424.005,391.105 424.005,390 C424.005,388.895 423.109,388 422.005,388 z" fill="inherit" id="operation-continue-shape"/>
<symbol id="operation-continue" viewBox="440 380 20 20" x="-10" y="-10">
<path d="M454,384 C450.686,384 448,386.686 448,390 C448,393.314 450.686,396 454,396 C457.314,396 460,393.314 460,390 C460,386.686 457.314,384 454,384 z M453,386 L455,386 L455,389 L458,389 L458,391 L455,391 L455,394 L453,394 L453,391 L450,391 L450,389 L453,389 L453,386 z M445,389 L445,391 L447,391 L447,389 L445,389 z" fill="currentColor" id="operation-continue-shape2"/>
<path d="M442,388 C440.895,388 440,388.895 440,390 C440,391.105 440.895,392 442,392 C443.105,392 444,391.105 444,390 C444,388.895 443.105,388 442,388 z" fill="inherit" id="operation-continue-shape"/>
</symbol>
<symbol id="operation-smooth" viewBox="420 380 20 20" x="-10" y="-10">
<path d="M429,385 L429,388 L428,388 L427,389 L430,392 L433,389 L432,388 L431,388 L431,385 C431,385 429,385 429,385 z" fill="currentColor" id="operation-smooth-shape2"/>
<path d="M432,398 C433.333,398 434.219,397.219 434.719,396.719 C435.219,396.219 435.333,396 436,396 L437,396 L437,394 L436,394 C434.667,394 433.781,394.781 433.281,395.281 C432.781,395.781 432.667,396 432,396 C431.833,396 431.794,395.991 431.594,395.75 C431.393,395.509 431.156,395.062 430.906,394.562 C430.656,394.062 430.393,393.509 429.969,393 C429.544,392.491 428.833,392 428,392 C426.667,392 425.781,392.781 425.281,393.281 C424.781,393.781 424.667,394 424,394 L423,394 L423,396 L424,396 C425.333,396 426.219,395.219 426.719,394.719 C427.219,394.219 427.333,394 428,394 C428.167,394 428.206,394.009 428.406,394.25 C428.607,394.491 428.844,394.938 429.094,395.438 C429.344,395.938 429.607,396.491 430.031,397 C430.456,397.509 431.167,398 432,398 z M437,384 L423,384 L423,382 L437,382 L437,384 z" fill="inherit" id="operation-smooth-shape"/>
</symbol>
<symbol id="operation-simplify" viewBox="400 380 20 20" x="-10" y="-10">
<path d="M409.005,387.5 L409.005,391 L408.005,391 L407.005,392 L410.005,395 L413.005,392 L412.005,391 L411.005,391 L411.005,389.5 C409.305,388.65 409.005,387.5 409.005,387.5 z" fill="currentColor" id="operation-simplify-shape2"/>
@@ -1264,23 +1268,29 @@
<symbol id="icon-inspect" viewBox="220 0 20 20">
<path d="M229.969,4.003 Q230.532,4.003 230.932,4.403 Q231.332,4.803 231.332,5.374 Q231.332,5.937 230.932,6.336 Q230.532,6.736 229.96,6.736 Q229.398,6.736 228.998,6.336 Q228.598,5.937 228.598,5.374 Q228.598,4.803 228.998,4.403 Q229.398,4.003 229.969,4.003 z M227.517,16.747 L227.517,16.018 Q228.51,15.982 228.664,15.895 Q228.818,15.807 228.862,15.402 Q228.932,14.849 228.932,12.959 Q228.932,12.142 228.906,11.447 L228.879,10.419 Q228.879,9.909 228.77,9.791 Q228.66,9.672 228.176,9.654 L227.517,9.628 L227.517,8.951 Q229.635,8.793 231.006,8.204 L231.226,8.38 Q231.103,10.059 231.103,13.267 Q231.103,15.121 231.165,15.508 Q231.208,15.78 231.327,15.859 Q231.446,15.938 232.483,16.018 L232.483,16.747 Q230.892,16.694 230.022,16.694 Q229.556,16.694 227.517,16.747 z" fill="currentColor" id="icon-inspect-shape"/>
</symbol>
<symbol id="icon-out-link" viewBox="200 0 20 20">
<path d="M210.326,3.582 L210.236,4.159 C210.228,4.214 210.221,4.262 210.206,4.37 L210.204,4.381 C210.198,4.421 210.195,4.472 210.195,4.534 L210.195,5.233 C210.195,5.311 210.206,5.398 210.229,5.496 L210.375,6.112 L205.128,6.112 C205.015,6.112 204.927,6.148 204.846,6.229 C204.761,6.314 204.726,6.4 204.726,6.516 L204.726,13.824 C204.726,13.94 204.761,14.026 204.844,14.108 C204.928,14.192 205.015,14.228 205.128,14.228 L213.65,14.228 C213.766,14.228 213.854,14.192 213.942,14.105 C214.026,14.023 214.062,13.937 214.062,13.824 L214.062,10.124 L214.864,10.73 C215.041,10.864 215.235,10.97 215.445,11.048 C215.661,11.126 215.88,11.169 216.107,11.175 L216.592,11.189 L216.592,13.824 C216.592,14.226 216.511,14.61 216.349,14.972 C216.191,15.318 215.979,15.626 215.715,15.89 C215.452,16.154 215.145,16.364 214.796,16.522 C214.44,16.679 214.057,16.758 213.65,16.758 L205.128,16.758 C204.729,16.758 204.345,16.68 203.982,16.522 C203.625,16.366 203.313,16.153 203.052,15.886 C202.795,15.623 202.589,15.317 202.432,14.965 C202.275,14.607 202.196,14.224 202.196,13.824 L202.196,6.516 C202.196,6.116 202.274,5.734 202.431,5.369 C202.587,5.012 202.794,4.704 203.056,4.442 C203.317,4.181 203.628,3.973 203.982,3.82 C204.342,3.661 204.727,3.582 205.128,3.582 L210.326,3.582 z M216.852,3.582 L212.287,3.582 C212.032,3.582 211.8,3.677 211.614,3.853 C211.409,4.054 211.311,4.307 211.337,4.582 L211.335,5.216 C211.335,5.476 211.425,5.712 211.604,5.894 C211.782,6.079 212.022,6.175 212.287,6.175 L213.214,6.175 L207.961,11.443 C207.78,11.611 207.681,11.856 207.684,12.127 C207.691,12.388 207.783,12.617 207.958,12.795 L208.585,13.43 C208.782,13.616 209.016,13.705 209.271,13.705 C209.53,13.705 209.765,13.613 209.945,13.433 L215.211,8.181 L215.211,9.101 C215.211,9.358 215.307,9.593 215.489,9.775 C215.671,9.957 215.908,10.051 216.17,10.051 L216.852,10.051 C217.069,10.075 217.317,9.982 217.512,9.793 C217.704,9.605 217.804,9.367 217.804,9.101 L217.804,4.534 C217.804,4.284 217.705,4.054 217.525,3.871 C217.346,3.685 217.111,3.582 216.852,3.582 z" fill="currentColor" id="icon-out-link-shape"/>
<symbol id="icon-out-link" viewBox="380 0 20 20">
<path d="M390.13,3.582 L390.041,4.159 C390.032,4.214 390.025,4.262 390.01,4.37 L390.009,4.381 C390.002,4.421 389.999,4.472 389.999,4.534 L389.999,5.233 C389.999,5.311 390.01,5.398 390.033,5.496 L390.179,6.112 L384.932,6.112 C384.819,6.112 384.731,6.148 384.65,6.229 C384.565,6.314 384.53,6.4 384.53,6.516 L384.53,13.824 C384.53,13.94 384.565,14.026 384.648,14.108 C384.732,14.192 384.819,14.228 384.932,14.228 L393.454,14.228 C393.57,14.228 393.658,14.192 393.746,14.105 C393.83,14.023 393.867,13.937 393.866,13.824 L393.866,10.124 L394.668,10.73 C394.845,10.864 395.039,10.97 395.249,11.048 C395.465,11.126 395.684,11.169 395.911,11.175 L396.396,11.189 L396.396,13.824 C396.396,14.226 396.315,14.61 396.153,14.972 C395.995,15.318 395.784,15.626 395.52,15.89 C395.256,16.154 394.949,16.364 394.6,16.522 C394.244,16.679 393.861,16.758 393.454,16.758 L384.932,16.758 C384.533,16.758 384.149,16.68 383.786,16.522 C383.429,16.366 383.118,16.153 382.856,15.886 C382.6,15.623 382.393,15.317 382.236,14.965 C382.079,14.607 382,14.224 382,13.824 L382,6.516 C382,6.116 382.078,5.734 382.235,5.369 C382.391,5.012 382.599,4.704 382.86,4.442 C383.121,4.181 383.432,3.973 383.786,3.82 C384.147,3.661 384.531,3.582 384.932,3.582 L390.13,3.582 z M396.656,3.582 L392.091,3.582 C391.836,3.582 391.604,3.677 391.418,3.853 C391.214,4.054 391.116,4.307 391.142,4.582 L391.139,5.216 C391.14,5.476 391.23,5.712 391.408,5.894 C391.586,6.079 391.826,6.175 392.091,6.175 L393.018,6.175 L387.765,11.443 C387.584,11.611 387.485,11.856 387.489,12.127 C387.495,12.388 387.587,12.617 387.762,12.795 L388.389,13.43 C388.586,13.616 388.82,13.705 389.075,13.705 C389.334,13.705 389.569,13.613 389.749,13.433 L395.015,8.181 L395.015,9.101 C395.016,9.358 395.111,9.593 395.293,9.775 C395.475,9.957 395.712,10.051 395.974,10.051 L396.656,10.051 C396.873,10.075 397.121,9.982 397.316,9.793 C397.509,9.605 397.608,9.367 397.608,9.101 L397.608,4.534 C397.608,4.284 397.509,4.054 397.329,3.871 C397.15,3.685 396.915,3.582 396.656,3.582 z" fill="currentColor" id="icon-out-link-shape"/>
</symbol>
<symbol id="icon-close" viewBox="160 0 20 20">
<path d="M174.462,4.323 L174.981,4.615 C175.608,5.157 175.676,6.105 175.135,6.731 L171.983,10.375 L175.135,14.019 C175.676,14.645 175.608,15.593 174.981,16.135 C174.355,16.676 173.407,16.608 172.865,15.981 L170,12.668 L167.135,15.981 C166.593,16.608 165.645,16.676 165.019,16.135 C164.392,15.593 164.324,14.645 164.865,14.019 L168.017,10.375 L164.865,6.731 C164.324,6.105 164.392,5.157 165.019,4.615 C165.645,4.074 166.593,4.142 167.135,4.769 L170,8.082 L172.865,4.769 C173.634,4.174 173.138,4.419 174.462,4.323 z" fill="currentColor" id="icon-close-shape"/>
<symbol id="icon-close" viewBox="200 0 20 20">
<path d="M214.462,4.323 L214.981,4.615 C215.608,5.157 215.676,6.105 215.134,6.731 L211.983,10.375 L215.134,14.019 C215.676,14.645 215.608,15.593 214.981,16.135 C214.355,16.676 213.407,16.608 212.865,15.981 L210,12.668 L207.134,15.981 C206.593,16.608 205.645,16.676 205.019,16.135 C204.392,15.593 204.324,14.645 204.865,14.019 L208.017,10.375 L204.865,6.731 C204.324,6.105 204.392,5.157 205.019,4.615 C205.645,4.074 206.593,4.142 207.134,4.769 L210,8.082 L212.865,4.769 C213.634,4.174 213.138,4.419 214.462,4.323 z" fill="currentColor" id="icon-close-shape"/>
</symbol>
<symbol id="icon-save" viewBox="140 0 20 20">
<path d="M150.02,6.5 C150.849,6.5 151.521,7.172 151.52,8 L151.52,15 C151.521,15.828 150.849,16.5 150.02,16.5 C149.192,16.5 148.521,15.828 148.52,15 L148.52,8 C148.521,7.172 149.192,6.5 150.02,6.5 z M145,8 L150.026,3 L155,8 z" fill="currentColor" id="icon-save-shape"/>
<symbol id="icon-save" viewBox="180 0 20 20">
<path d="M190.02,6.5 C190.849,6.5 191.521,7.172 191.52,8 L191.52,15 C191.521,15.828 190.849,16.5 190.02,16.5 C189.192,16.5 188.521,15.828 188.52,15 L188.52,8 C188.521,7.172 189.192,6.5 190.02,6.5 z M185,8 L190.026,3 L195,8 z" fill="currentColor" id="icon-save-shape"/>
</symbol>
<symbol id="icon-apply" viewBox="120 0 20 20">
<path d="M136.283,3.527 L136.834,3.753 C137.522,4.213 137.707,5.145 137.247,5.834 L130.561,15.834 C130.095,16.531 129.147,16.711 128.458,16.232 C127.918,15.857 127.918,15.857 126.301,14.731 C124.683,13.607 124.683,13.607 124.143,13.231 C123.463,12.759 123.295,11.824 123.768,11.144 C124.241,10.463 125.176,10.296 125.856,10.768 C126.396,11.143 126.396,11.143 128.013,12.268 C128.671,12.726 128.37,12.516 128.916,12.896 L134.753,4.166 C135.442,3.481 134.981,3.785 136.283,3.527 z" fill="currentColor" id="icon-apply-shape"/>
<symbol id="icon-apply" viewBox="160 0 20 20">
<path d="M176.283,3.526 L176.834,3.753 C177.522,4.213 177.707,5.145 177.247,5.834 L170.561,15.834 C170.095,16.531 169.147,16.711 168.458,16.232 C167.918,15.857 167.918,15.857 166.301,14.731 C164.683,13.607 164.683,13.607 164.143,13.231 C163.463,12.759 163.295,11.824 163.768,11.144 C164.241,10.463 165.176,10.296 165.856,10.768 C166.396,11.143 166.396,11.143 168.013,12.268 C168.671,12.726 168.37,12.516 168.916,12.896 L174.753,4.166 C175.442,3.481 174.981,3.785 176.283,3.526 z" fill="currentColor" id="icon-apply-shape"/>
</symbol>
<symbol id="icon-redo" viewBox="100 0 20 20">
<path d="M111.792,3 L111.792,5.209 L111.567,5.157 C107.247,5.045 103.021,7.848 104.201,12.074 C105.18,15.581 108.588,16.707 112.964,16.439 C113.791,16.389 114.42,15.677 114.37,14.851 C114.319,14.024 113.608,13.394 112.781,13.445 C109.672,13.635 107.556,12.936 107.09,11.267 C106.62,9.584 108.876,8.088 111.489,8.156 L111.792,8.103 L111.792,10 L116.531,6.5 L111.792,3 z" fill="currentColor" id="icon-redo-shape"/>
<symbol id="icon-redo" viewBox="140 0 20 20">
<path d="M151.792,3 L151.792,5.209 L151.567,5.157 C147.247,5.045 143.021,7.848 144.201,12.074 C145.18,15.581 148.588,16.707 152.964,16.439 C153.791,16.389 154.42,15.677 154.37,14.851 C154.319,14.024 153.608,13.394 152.781,13.445 C149.672,13.635 147.556,12.936 147.09,11.267 C146.62,9.584 148.876,8.088 151.489,8.156 L151.792,8.103 L151.792,10 L156.531,6.5 L151.792,3 z" fill="currentColor" id="icon-redo-shape"/>
</symbol>
<symbol id="icon-undo" viewBox="80 0 20 20">
<path d="M88.738,3 L88.738,5.209 L88.964,5.157 C93.284,5.045 97.51,7.848 96.33,12.074 C95.351,15.581 91.943,16.707 87.567,16.439 C86.74,16.389 86.11,15.677 86.161,14.851 C86.211,14.024 86.923,13.394 87.749,13.445 C90.858,13.635 92.975,12.936 93.44,11.267 C93.91,9.584 91.655,8.088 89.041,8.156 L88.738,8.103 L88.738,10 L84,6.5 L88.738,3 z" fill="currentColor" id="icon-undo-shape"/>
<symbol id="icon-undo" viewBox="120 0 20 20">
<path d="M128.738,3 L128.738,5.209 L128.964,5.157 C133.284,5.045 137.51,7.848 136.33,12.074 C135.351,15.581 131.943,16.707 127.567,16.439 C126.74,16.389 126.11,15.677 126.161,14.851 C126.211,14.024 126.923,13.394 127.749,13.445 C130.858,13.635 132.975,12.936 133.44,11.267 C133.91,9.584 131.655,8.088 129.041,8.156 L128.738,8.103 L128.738,10 L124,6.5 L128.738,3 z" fill="currentColor" id="icon-undo-shape"/>
</symbol>
<symbol id="icon-vertex" viewBox="100 0 20 20">
<path d="M110,7 C111.657,7 113,8.343 113,10 C113,11.657 111.657,13 110,13 C108.343,13 107,11.657 107,10 C107,8.343 108.343,7 110,7 z M110,8.8 C109.337,8.8 108.8,9.337 108.8,10 C108.8,10.663 109.337,11.2 110,11.2 C110.663,11.2 111.2,10.663 111.2,10 C111.2,9.337 110.663,8.8 110,8.8 z" fill="currentColor" id="icon-vertex-shape"/>
</symbol>
<symbol id="icon-relation" viewBox="80 0 20 20">
<path d="M94.5,3 C95.881,3 97,4.119 97,5.5 C97,6.881 95.881,8 94.5,8 C93.489,7.97 92.651,7.429 92.26,6.5 L88.029,6.5 L92.027,10.248 C92.652,9.985 92.327,10.068 93,10 C94.381,10 95.5,11.119 95.5,12.5 C95.5,13.881 94.381,15 93,15 C91.619,15 90.5,13.881 90.5,12.5 C90.561,11.895 90.485,12.152 90.669,11.716 L86.5,7.808 L86.5,12.259 C87.49,12.593 87.903,13.534 88,14.5 C88,15.881 86.881,17 85.5,17 C84.119,17 83,15.881 83,14.5 C83.03,13.489 83.571,12.651 84.5,12.26 L84.5,7.74 C83.51,7.407 83.097,6.465 83,5.5 C83,4.119 84.119,3 85.5,3 C86.511,3.03 87.35,3.571 87.74,4.5 L92.26,4.5 C92.593,3.51 93.535,3.097 94.5,3 z M85.5,13.5 C84.948,13.5 84.5,13.948 84.5,14.5 C84.5,15.052 84.948,15.5 85.5,15.5 C86.052,15.5 86.5,15.052 86.5,14.5 C86.5,13.948 86.052,13.5 85.5,13.5 z M93,11.5 C92.448,11.5 92,11.948 92,12.5 C92,13.052 92.448,13.5 93,13.5 C93.552,13.5 94,13.052 94,12.5 C94,11.948 93.552,11.5 93,11.5 z M85.5,4.5 C84.948,4.5 84.5,4.948 84.5,5.5 C84.5,6.052 84.948,6.5 85.5,6.5 C86.052,6.5 86.5,6.052 86.5,5.5 C86.5,4.948 86.052,4.5 85.5,4.5 z M94.5,4.5 C93.948,4.5 93.5,4.948 93.5,5.5 C93.5,6.052 93.948,6.5 94.5,6.5 C95.052,6.5 95.5,6.052 95.5,5.5 C95.5,4.948 95.052,4.5 94.5,4.5 z" fill="currentColor" id="icon-relation-shape"/>
</symbol>
<symbol id="icon-area" viewBox="60 0 20 20">
<path d="M65.5,3 C64.119,3 63,4.119 63,5.5 C63,6.458 63.543,7.288 64.333,7.708 L64.333,12.292 C63.543,12.712 63,13.542 63,14.5 C63,15.881 64.119,17 65.5,17 C66.458,17 67.288,16.457 67.708,15.667 L72.292,15.667 C72.712,16.457 73.542,17 74.5,17 C75.881,17 77,15.881 77,14.5 C77,13.542 76.457,12.712 75.667,12.292 L75.667,7.708 C76.457,7.288 77,6.458 77,5.5 C77,4.119 75.881,3 74.5,3 C73.531,3 72.696,3.558 72.281,4.365 L72.219,4.333 L67.708,4.333 C67.288,3.543 66.458,3 65.5,3 z M65.5,4.5 C66.052,4.5 66.5,4.948 66.5,5.5 C66.5,6.052 66.052,6.5 65.5,6.5 C64.948,6.5 64.5,6.052 64.5,5.5 C64.5,4.948 64.948,4.5 65.5,4.5 z M74.5,4.5 C75.052,4.5 75.5,4.948 75.5,5.5 C75.5,6.052 75.052,6.5 74.5,6.5 C73.948,6.5 73.5,6.052 73.5,5.5 C73.5,4.948 73.948,4.5 74.5,4.5 z M67.708,6.667 L72.292,6.667 C72.526,7.108 72.892,7.474 73.333,7.708 L73.333,12.292 C72.892,12.526 72.526,12.892 72.292,13.333 L67.708,13.333 C67.474,12.892 67.108,12.526 66.667,12.292 L66.667,7.708 C67.108,7.474 67.474,7.108 67.708,6.667 z M65.5,13.5 C66.052,13.5 66.5,13.948 66.5,14.5 C66.5,15.052 66.052,15.5 65.5,15.5 C64.948,15.5 64.5,15.052 64.5,14.5 C64.5,13.948 64.948,13.5 65.5,13.5 z M74.5,13.5 C75.052,13.5 75.5,13.948 75.5,14.5 C75.5,15.052 75.052,15.5 74.5,15.5 C73.948,15.5 73.5,15.052 73.5,14.5 C73.5,13.948 73.948,13.5 74.5,13.5 z" fill="currentColor" id="icon-area-shape"/>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 KiB

After

Width:  |  Height:  |  Size: 221 KiB

2
js/id/renderer/mapillary_layer.js
View File

@@ -78,7 +78,7 @@ iD.MapillaryLayer = function (context) {
.append('a')
.attr('class', 'link')
.attr('target', '_blank')
.call(iD.svg.Icon('#icon-out-link', null, 'icon-out-link'))
.call(iD.svg.Icon('#icon-out-link', 'inline'))
.append('span')
.text(t('mapillary.view_on_mapillary'));

4
js/id/svg/icon.js
View File

@@ -1,10 +1,10 @@
iD.svg.Icon = function(name, useklass, svgklass) {
iD.svg.Icon = function(name, svgklass, useklass) {
return function (selection) {
selection.selectAll('svg')
.data([0])
.enter()
.append('svg')
.attr('class', (svgklass || 'icon'))
.attr('class', 'icon ' + svgklass)
.append('use')
.attr('xlink:href', name)
.attr('class', useklass);

4
js/id/ui.js
View File

@@ -132,7 +132,7 @@ iD.ui = function(context) {
.attr('target', '_blank')
.attr('tabindex', -1)
.attr('href', 'https://github.com/openstreetmap/iD/issues')
.call(iD.svg.Icon('#icon-bug', 'icon-light'))
.call(iD.svg.Icon('#icon-bug', 'light'))
.call(bootstrap.tooltip()
.title(t('report_a_bug'))
.placement('top')
@@ -142,7 +142,7 @@ iD.ui = function(context) {
.attr('target', '_blank')
.attr('tabindex', -1)
.attr('href', 'https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating')
.call(iD.svg.Icon('#icon-translate', 'icon-light'))
.call(iD.svg.Icon('#icon-translate', 'light'))
.call(bootstrap.tooltip()
.title(t('help_translate'))
.placement('top')

4
js/id/ui/account.js
View File

@@ -28,11 +28,11 @@ iD.ui.Account = function(context) {
// Add thumbnail or dont
if (details.image_url) {
userLink.append('img')
.attr('class', 'icon icon-pre-text user-icon')
.attr('class', 'icon pre-text user-icon')
.attr('src', details.image_url);
} else {
userLink
.call(iD.svg.Icon('#icon-avatar', 'icon-light icon-pre-text'));
.call(iD.svg.Icon('#icon-avatar', 'pre-text light'));
}
// Add user name

2
js/id/ui/background.js
View File

@@ -186,7 +186,7 @@ iD.ui.Background = function(context) {
button = selection.append('button')
.attr('tabindex', -1)
.on('click', toggle)
.call(iD.svg.Icon('#icon-layers', 'icon-light'))
.call(iD.svg.Icon('#icon-layers', 'light'))
.call(tooltip),
shown = false;

12
js/id/ui/commit.js
View File

@@ -73,7 +73,7 @@ iD.ui.Commit = function(context) {
.on('click', warningClick);
warningLi
.call(iD.svg.Icon('#icon-alert', 'icon-pre-text'));
.call(iD.svg.Icon('#icon-alert', 'pre-text'));
warningLi
.append('strong').text(function(d) {
@@ -103,7 +103,7 @@ iD.ui.Commit = function(context) {
if (user.image_url) {
userLink.append('img')
.attr('src', user.image_url)
.attr('class', 'icon icon-pre-text user-icon');
.attr('class', 'icon pre-text user-icon');
}
userLink.append('a')
@@ -166,10 +166,10 @@ iD.ui.Commit = function(context) {
.on('mouseout', mouseout)
.on('click', zoomToEntity);
li.append('span')
.attr('class', function(d) {
return d.entity.geometry(d.graph) + ' ' + d.changeType + ' icon icon-pre-text';
});
li.each(function(d) {
d3.select(this)
.call(iD.svg.Icon('#icon-' + d.entity.geometry(d.graph), 'pre-text ' + d.changeType));
});
li.append('span')
.attr('class', 'change-type')

3
js/id/ui/conflicts.js
View File

@@ -11,8 +11,7 @@ iD.ui.Conflicts = function(context) {
.append('button')
.attr('class', 'fr')
.on('click', function() { dispatch.cancel(); })
.append('span')
.attr('class', 'icon close');
.call(iD.svg.Icon('#icon-close'));
header
.append('h3')

2
js/id/ui/contributors.js
View File

@@ -12,7 +12,7 @@ iD.ui.Contributors = function(context) {
subset = u.slice(0, u.length > limit ? limit - 1 : limit);
selection.html('')
.call(iD.svg.Icon('#icon-nearby', 'icon-light icon-pre-text'));
.call(iD.svg.Icon('#icon-nearby', 'pre-text light'));
var userList = d3.select(document.createElement('span'));

3
js/id/ui/entity_editor.js
View File

@@ -24,8 +24,7 @@ iD.ui.EntityEditor = function(context) {
$enter.append('button')
.attr('class', 'fr preset-close')
.append('span')
.attr('class', 'icon close');
.call(iD.svg.Icon('#icon-close'));
$enter.append('h3');

16
js/id/ui/feature_list.js
View File

@@ -31,7 +31,7 @@ iD.ui.FeatureList = function(context) {
.on('input', inputevent);
searchWrap
.call(iD.svg.Icon('#icon-search', 'icon-pre-text'));
.call(iD.svg.Icon('#icon-search', 'pre-text'));
var listWrap = selection.append('div')
.attr('class', 'inspector-body');
@@ -139,7 +139,7 @@ iD.ui.FeatureList = function(context) {
.enter().append('button')
.property('disabled', true)
.attr('class', 'no-results-item')
.call(iD.svg.Icon('#icon-alert', 'icon-pre-text'));
.call(iD.svg.Icon('#icon-alert', 'pre-text'));
resultsIndicator.append('span')
.attr('class', 'entity-name');
@@ -171,17 +171,21 @@ iD.ui.FeatureList = function(context) {
var items = list.selectAll('.feature-list-item')
.data(results, function(d) { return d.id; });
var enter = items.enter().insert('button', '.geocode-item')
var enter = items.enter()
.insert('button', '.geocode-item')
.attr('class', 'feature-list-item')
.on('mouseover', mouseover)
.on('mouseout', mouseout)
.on('click', click);
var label = enter.append('div')
var label = enter
.append('div')
.attr('class', 'label');
label.append('span')
.attr('class', function(d) { return d.geometry + ' icon icon-pre-text'; });
label.each(function(d) {
d3.select(this)
.call(iD.svg.Icon('#icon-' + d.geometry, 'pre-text'));
});
label.append('span')
.attr('class', 'entity-type')

2
js/id/ui/geolocate.js
View File

@@ -20,7 +20,7 @@ iD.ui.Geolocate = function(map) {
.attr('tabindex', -1)
.attr('title', t('geolocate.title'))
.on('click', click)
.call(iD.svg.Icon('#icon-geolocate', 'icon-light'))
.call(iD.svg.Icon('#icon-geolocate', 'light'))
.call(bootstrap.tooltip()
.placement('left'));
};

2
js/id/ui/help.js
View File

@@ -104,7 +104,7 @@ iD.ui.Help = function(context) {
button = selection.append('button')
.attr('tabindex', -1)
.on('click', toggle)
.call(iD.svg.Icon('#icon-help', 'icon-light'))
.call(iD.svg.Icon('#icon-help', 'light'))
.call(tooltip),
shown = false;

24
js/id/ui/intro.js
View File

@@ -73,20 +73,24 @@ iD.ui.intro = function(context) {
.attr('class', 'joined')
.selectAll('button.step');
var entered = buttonwrap.data(steps)
.enter().append('button')
.attr('class', 'step')
.on('click', enter);
var entered = buttonwrap
.data(steps)
.enter()
.append('button')
.attr('class', 'step')
.on('click', enter);
entered
.call(iD.svg.Icon('#icon-apply', 'pre-text'));
entered
.append('label')
.text(function(d) { return t(d.title); });
entered.append('div').attr('class','icon icon-pre-text apply');
entered.append('label').text(function(d) { return t(d.title); });
enter(steps[0]);
function enter (newStep) {
if (step) {
step.exit();
}
if (step) { step.exit(); }
context.enter(iD.modes.Browse(context));

2
js/id/ui/map_data.js
View File

@@ -168,7 +168,7 @@ iD.ui.MapData = function(context) {
button = selection.append('button')
.attr('tabindex', -1)
.on('click', togglePanel)
.call(iD.svg.Icon('#icon-data', 'icon-light'))
.call(iD.svg.Icon('#icon-data', 'light'))
.call(tooltip),
shown = false;

2
js/id/ui/modes.js
View File

@@ -37,7 +37,7 @@ iD.ui.Modes = function(context) {
buttons.each(function(d) {
d3.select(this)
.call(iD.svg.Icon('#icon-' + d.button, 'icon-pre-text'));
.call(iD.svg.Icon('#icon-' + d.button, 'pre-text'));
});
buttons.append('span')

2
js/id/ui/notice.js
View File

@@ -8,7 +8,7 @@ iD.ui.Notice = function(context) {
.on('click', function() { context.map().zoom(context.minEditableZoom()); });
button
.call(iD.svg.Icon('#icon-plus', 'icon-pre-text'))
.call(iD.svg.Icon('#icon-plus', 'pre-text'))
.append('span')
.attr('class', 'label')
.text(t('zoom_in_edit'));

2
js/id/ui/preset/wikipedia.js
View File

@@ -64,7 +64,7 @@ iD.ui.preset.wikipedia = function(field, context) {
link.enter().append('a')
.attr('class', 'wiki-link button-input-action minor')
.attr('target', '_blank')
.call(iD.svg.Icon('#icon-out-link', null, 'icon-out-link'));
.call(iD.svg.Icon('#icon-out-link', 'inline'));
}
function language() {

2
js/id/ui/preset_list.js
View File

@@ -86,7 +86,7 @@ iD.ui.PresetList = function(context) {
.on('input', inputevent);
searchWrap
.call(iD.svg.Icon('#icon-search', 'icon-pre-text'));
.call(iD.svg.Icon('#icon-search', 'pre-text'));
if (autofocus) {
search.node().focus();

2
js/id/ui/raw_membership_editor.js
View File

@@ -189,7 +189,7 @@ iD.ui.RawMembershipEditor = function(context) {
$add.enter()
.append('button')
.attr('class', 'add-relation')
.call(iD.svg.Icon('#icon-plus', 'icon-light'));
.call(iD.svg.Icon('#icon-plus', 'light'));
$wrap.selectAll('.add-relation')
.on('click', function() {

2
js/id/ui/raw_tag_editor.js
View File

@@ -43,7 +43,7 @@ iD.ui.RawTagEditor = function(context) {
$newTag.enter()
.append('button')
.attr('class', 'add-tag')
.call(iD.svg.Icon('#icon-plus', 'icon-light'));
.call(iD.svg.Icon('#icon-plus', 'light'));
$newTag.on('click', addTag);

16
js/id/ui/selection_list.js
View File

@@ -36,12 +36,9 @@ iD.ui.SelectionList = function(context, selectedIDs) {
.on('click', selectEntity);
// Enter
var label = enter.append('div')
.attr('class', 'label');
label.append('span')
.attr('class', 'icon icon-pre-text');
.attr('class', 'label')
.call(iD.svg.Icon('', 'pre-text'));
label.append('span')
.attr('class', 'entity-type');
@@ -50,9 +47,11 @@ iD.ui.SelectionList = function(context, selectedIDs) {
.attr('class', 'entity-name');
// Update
items.selectAll('.icon')
.attr('class', function(entity) { return context.geometry(entity.id) + ' icon icon-pre-text'; });
items.selectAll('use')
.attr('href', function() {
var entity = this.parentElement.parentElement.__data__;
return '#icon-' + context.geometry(entity.id);
});
items.selectAll('.entity-type')
.text(function(entity) { return context.presets().match(entity, context.graph()).name(); });
@@ -61,7 +60,6 @@ iD.ui.SelectionList = function(context, selectedIDs) {
.text(function(entity) { return iD.util.displayName(entity); });
// Exit
items.exit()
.remove();
}

11
js/id/ui/success.js
View File

@@ -12,8 +12,7 @@ iD.ui.Success = function(context) {
header.append('button')
.attr('class', 'fr')
.on('click', function() { dispatch.cancel(); })
.append('span')
.attr('class', 'icon close');
.call(iD.svg.Icon('#icon-close'));
header.append('h3')
.text(t('success.just_edited'));
@@ -40,13 +39,15 @@ iD.ui.Success = function(context) {
body.selectAll('.button.social')
.data(d3.entries(sharing))
.enter().append('a')
.attr('class', function(d) { return 'button social col4 ' + d.key; })
.enter()
.append('a')
.attr('class', 'button social col4')
.attr('target', '_blank')
.attr('href', function(d) { return d.value; })
.call(bootstrap.tooltip()
.title(function(d) { return t('success.' + d.key); })
.placement('bottom'));
.placement('bottom'))
.each(function(d) { d3.select(this).call(iD.svg.Icon('#logo-' + d.key, 'social')); });
}
success.changeset = function(_) {

2
js/id/ui/tag_reference.js
View File

@@ -67,7 +67,7 @@ iD.ui.TagReference = function(tag, context) {
.append('a')
.attr('target', '_blank')
.attr('href', 'http://wiki.openstreetmap.org/wiki/' + docs.title)
.call(iD.svg.Icon('#icon-out-link', null, 'icon-out-link'))
.call(iD.svg.Icon('#icon-out-link', 'inline'))
.append('span')
.text(t('inspector.reference'));

2
js/id/ui/view_on_osm.js
View File

@@ -13,7 +13,7 @@ iD.ui.ViewOnOSM = function(context) {
.append('a')
.attr('class', 'view-on-osm')
.attr('target', '_blank')
.call(iD.svg.Icon('#icon-out-link', null, 'icon-out-link'))
.call(iD.svg.Icon('#icon-out-link', 'inline'))
.append('span')
.text(t('inspector.view_on_osm'));

2
js/id/ui/zoom.js
View File

@@ -50,7 +50,7 @@ iD.ui.Zoom = function(context) {
button.each(function(d) {
d3.select(this)
.call(iD.svg.Icon('#icon-' + d.icon, 'icon-light'));
.call(iD.svg.Icon('#icon-' + d.icon, 'light'));
});
var keybinding = d3.keybinding('zoom');

BIN
svg/iD-sprite.idraw
View File

Binary file not shown.

37
svg/iD-sprite.json
View File

@@ -3,12 +3,13 @@
"icon-point": { "viewBox": "20 0 20 20" },
"icon-line": { "viewBox": "40 0 20 20" },
"icon-area": { "viewBox": "60 0 20 20" },
"icon-undo": { "viewBox": "80 0 20 20" },
"icon-redo": { "viewBox": "100 0 20 20" },
"icon-apply": { "viewBox": "120 0 20 20" },
"icon-save": { "viewBox": "140 0 20 20" },
"icon-close": { "viewBox": "160 0 20 20" },
"icon-out-link": { "viewBox": "200 0 20 20" },
"icon-relation": { "viewBox": "80 0 20 20" },
"icon-vertex": { "viewBox": "100 0 20 20" },
"icon-undo": { "viewBox": "120 0 20 20" },
"icon-redo": { "viewBox": "140 0 20 20" },
"icon-apply": { "viewBox": "160 0 20 20" },
"icon-save": { "viewBox": "180 0 20 20" },
"icon-close": { "viewBox": "200 0 20 20" },
"icon-inspect": { "viewBox": "220 0 20 20" },
"icon-plus": { "viewBox": "240 0 20 20" },
"icon-minus": { "viewBox": "260 0 20 20" },
@@ -17,6 +18,7 @@
"icon-avatar": { "viewBox": "320 0 20 20" },
"icon-nearby": { "viewBox": "340 0 20 20" },
"icon-geolocate": { "viewBox": "360 0 20 20" },
"icon-out-link": { "viewBox": "380 0 20 20" },
"icon-bug": { "viewBox": "400 0 20 20" },
"icon-translate": { "viewBox": "420 0 20 20" },
"icon-help": { "viewBox": "460 0 20 20" },
@@ -28,6 +30,8 @@
"icon-point-shape": { "fill": "currentColor" },
"icon-line-shape": { "fill": "currentColor" },
"icon-area-shape": { "fill": "currentColor" },
"icon-relation-shape": { "fill": "currentColor" },
"icon-vertex-shape": { "fill": "currentColor" },
"icon-undo-shape": { "fill": "currentColor" },
"icon-redo-shape": { "fill": "currentColor" },
"icon-apply-shape": { "fill": "currentColor" },
@@ -141,7 +145,8 @@
"operation-orthogonalize": { "viewBox": "360 380 20 20", "x": "-10", "y": "-10" },
"operation-rotate": { "viewBox": "380 380 20 20", "x": "-10", "y": "-10" },
"operation-simplify": { "viewBox": "400 380 20 20", "x": "-10", "y": "-10" },
"operation-continue": { "viewBox": "420 380 20 20", "x": "-10", "y": "-10" },
"operation-smooth": { "viewBox": "420 380 20 20", "x": "-10", "y": "-10" },
"operation-continue": { "viewBox": "440 380 20 20", "x": "-10", "y": "-10" },
"operation-delete-shape": { "fill": "inherit" },
"operation-circularize-shape": { "fill": "inherit" },
@@ -161,28 +166,16 @@
"operation-rotate-shape2": { "fill": "currentColor" },
"operation-simplify-shape": { "fill": "inherit" },
"operation-simplify-shape2": { "fill": "currentColor" },
"operation-smooth-shape": { "fill": "inherit" },
"operation-smooth-shape2": { "fill": "currentColor" },
"operation-continue-shape": { "fill": "inherit" },
"operation-continue-shape2": { "fill": "currentColor" },
"logo-twitter": { "viewBox": "200 400 60 60" },
"logo-facebook": { "viewBox": "260 400 60 60" },
"logo-google": { "viewBox": "320 400 60 60" },
"logo-osm": { "viewBox": "200 460 100 100" },
"logo-walkthrough": { "viewBox": "300 460 100 100" },
"logo-features": { "viewBox": "400 460 100 100" },
"logo-restore": { "viewBox": "500 480 80 80" },
"logo-reset": { "viewBox": "580 480 80 80" },
"logo-twitter-shape": { "fill": "currentColor" },
"logo-facebook-shape": { "fill": "currentColor" },
"logo-google-shape": { "fill": "currentColor" },
"logo-osm-shape": { "fill": "currentColor" },
"logo-walkthrough-shape": { "fill": "currentColor" },
"logo-features-shape": { "fill": "currentColor" },
"logo-restore-shape": { "fill": "currentColor" },
"logo-reset-shape": { "fill": "currentColor" },
"poi-images": { "viewBox": "0 320 200 80" },
"landuse-images": { "viewBox": "0 400 200 80" },
"feature-images": { "viewBox": "0 480 200 80" }
"logo-google-shape": { "fill": "currentColor" }
}

30
svg/iD-sprite.svg
View File

@@ -103,10 +103,10 @@
</g>
<g id="logos">
<g id="logo-reset">
<path d="M590,487 L587,490 L587,495 L612,520 L587,545 L587,550 L590,553 L595,553 L620,528 L645,553 L650,553 L653,550 L653,545 L628,520 L653,495 L653,490 L650,487 L645,487 L620,512 L595,487 L590,487 z" fill="#E06D5F" id="logo-reset-shape"/>
<path d="M620,477 L617,480 L617,485 L642,510 L617,535 L617,540 L620,543 L625,543 L650,518 L675,543 L680,543 L683,540 L683,535 L658,510 L683,485 L683,480 L680,477 L675,477 L650,502 L625,477 L620,477 z" fill="#E06D5F" id="logo-reset-shape"/>
</g>
<g id="logo-restore">
<path d="M540,481 L538,483 L538,488.062 C519.66,489.114 505,504.406 505,523 C505,542.271 520.729,558 540,558 C559.271,558 575,542.271 575,523 C575,511.334 569.233,500.963 560.406,494.594 L553.219,501.781 C560.301,506.179 565,513.999 565,523 C565,536.866 553.866,548 540,548 C526.134,548 515,536.866 515,523 C515,509.81 525.083,499.108 538,498.094 L538,503 L540,505 L543,505 L555,493 L543,481 L540,481 z" fill="#7092FF" id="logo-restore-shape"/>
<path d="M550,471 L548,473 L548,478.062 C529.66,479.114 515,494.406 515,513 C515,532.271 530.729,548 550,548 C569.271,548 585,532.271 585,513 C585,501.334 579.233,490.963 570.406,484.594 L563.219,491.781 C570.301,496.179 575,503.999 575,513 C575,526.866 563.866,538 550,538 C536.134,538 525,526.866 525,513 C525,499.81 535.083,489.108 548,488.094 L548,493 L550,495 L553,495 L565,483 L553,471 L550,471 z" fill="#7092FF" id="logo-restore-shape"/>
</g>
<g id="logo-features">
<path d="M467.531,471 C459.247,471 452.531,477.716 452.531,486 C452.531,494.284 467.531,507 467.531,507 C467.531,507 482.531,494.284 482.531,486 C482.531,477.716 475.816,471 467.531,471 z M468,480 C471.314,480 474,482.686 474,486 C474,489.314 471.314,492 468,492 C464.687,492 462,489.314 462,486 C462,482.686 464.687,480 468,480 z" fill="#7092FF" id="logo-features-shape3"/>
@@ -131,8 +131,12 @@
</g>
<g id="operations">
<g id="operation-continue">
<path d="M434.005,384 C430.691,384 428.005,386.686 428.005,390 C428.005,393.314 430.691,396 434.005,396 C437.319,396 440.005,393.314 440.005,390 C440.005,386.686 437.319,384 434.005,384 z M433.005,386 L435.005,386 L435.005,389 L438.005,389 L438.005,391 L435.005,391 L435.005,394 L433.005,394 L433.005,391 L430.005,391 L430.005,389 L433.005,389 L433.005,386 z M425.005,389 L425.005,391 L427.005,391 L427.005,389 L425.005,389 z" fill="#7092FF" id="operation-continue-shape2"/>
<path d="M422.005,388 C420.9,388 420.005,388.895 420.005,390 C420.005,391.105 420.9,392 422.005,392 C423.109,392 424.005,391.105 424.005,390 C424.005,388.895 423.109,388 422.005,388 z" fill="#000000" id="operation-continue-shape"/>
<path d="M454,384 C450.686,384 448,386.686 448,390 C448,393.314 450.686,396 454,396 C457.314,396 460,393.314 460,390 C460,386.686 457.314,384 454,384 z M453,386 L455,386 L455,389 L458,389 L458,391 L455,391 L455,394 L453,394 L453,391 L450,391 L450,389 L453,389 L453,386 z M445,389 L445,391 L447,391 L447,389 L445,389 z" fill="#7092FF" id="operation-continue-shape2"/>
<path d="M442,388 C440.895,388 440,388.895 440,390 C440,391.105 440.895,392 442,392 C443.105,392 444,391.105 444,390 C444,388.895 443.105,388 442,388 z" fill="#000000" id="operation-continue-shape"/>
</g>
<g id="operation-smooth">
<path d="M429,385 L429,388 L428,388 L427,389 L430,392 L433,389 L432,388 L431,388 L431,385 C431,385 429,385 429,385 z" fill="#7092FF" id="operation-smooth-shape2"/>
<path d="M432,398 C433.333,398 434.219,397.219 434.719,396.719 C435.219,396.219 435.333,396 436,396 L437,396 L437,394 L436,394 C434.667,394 433.781,394.781 433.281,395.281 C432.781,395.781 432.667,396 432,396 C431.833,396 431.794,395.991 431.594,395.75 C431.393,395.509 431.156,395.062 430.906,394.562 C430.656,394.062 430.393,393.509 429.969,393 C429.544,392.491 428.833,392 428,392 C426.667,392 425.781,392.781 425.281,393.281 C424.781,393.781 424.667,394 424,394 L423,394 L423,396 L424,396 C425.333,396 426.219,395.219 426.719,394.719 C427.219,394.219 427.333,394 428,394 C428.167,394 428.206,394.009 428.406,394.25 C428.607,394.491 428.844,394.938 429.094,395.438 C429.344,395.938 429.607,396.491 430.031,397 C430.456,397.509 431.167,398 432,398 z M437,384 L423,384 L423,382 L437,382 L437,384 z" fill="#000000" id="operation-smooth-shape"/>
</g>
<g id="operation-simplify">
<path d="M409.005,387.5 L409.005,391 L408.005,391 L407.005,392 L410.005,395 L413.005,392 L412.005,391 L411.005,391 L411.005,389.5 C409.305,388.65 409.005,387.5 409.005,387.5 z" fill="#7092FF" id="operation-simplify-shape2"/>
@@ -1265,22 +1269,28 @@
<path d="M229.969,4.003 Q230.532,4.003 230.932,4.403 Q231.332,4.803 231.332,5.374 Q231.332,5.937 230.932,6.336 Q230.532,6.736 229.96,6.736 Q229.398,6.736 228.998,6.336 Q228.598,5.937 228.598,5.374 Q228.598,4.803 228.998,4.403 Q229.398,4.003 229.969,4.003 z M227.517,16.747 L227.517,16.018 Q228.51,15.982 228.664,15.895 Q228.818,15.807 228.862,15.402 Q228.932,14.849 228.932,12.959 Q228.932,12.142 228.906,11.447 L228.879,10.419 Q228.879,9.909 228.77,9.791 Q228.66,9.672 228.176,9.654 L227.517,9.628 L227.517,8.951 Q229.635,8.793 231.006,8.204 L231.226,8.38 Q231.103,10.059 231.103,13.267 Q231.103,15.121 231.165,15.508 Q231.208,15.78 231.327,15.859 Q231.446,15.938 232.483,16.018 L232.483,16.747 Q230.892,16.694 230.022,16.694 Q229.556,16.694 227.517,16.747 z" fill="#000000" id="icon-inspect-shape"/>
</g>
<g id="icon-out-link">
<path d="M210.326,3.582 L210.236,4.159 C210.228,4.214 210.221,4.262 210.206,4.37 L210.204,4.381 C210.198,4.421 210.195,4.472 210.195,4.534 L210.195,5.233 C210.195,5.311 210.206,5.398 210.229,5.496 L210.375,6.112 L205.128,6.112 C205.015,6.112 204.927,6.148 204.846,6.229 C204.761,6.314 204.726,6.4 204.726,6.516 L204.726,13.824 C204.726,13.94 204.761,14.026 204.844,14.108 C204.928,14.192 205.015,14.228 205.128,14.228 L213.65,14.228 C213.766,14.228 213.854,14.192 213.942,14.105 C214.026,14.023 214.062,13.937 214.062,13.824 L214.062,10.124 L214.864,10.73 C215.041,10.864 215.235,10.97 215.445,11.048 C215.661,11.126 215.88,11.169 216.107,11.175 L216.592,11.189 L216.592,13.824 C216.592,14.226 216.511,14.61 216.349,14.972 C216.191,15.318 215.979,15.626 215.715,15.89 C215.452,16.154 215.145,16.364 214.796,16.522 C214.44,16.679 214.057,16.758 213.65,16.758 L205.128,16.758 C204.729,16.758 204.345,16.68 203.982,16.522 C203.625,16.366 203.313,16.153 203.052,15.886 C202.795,15.623 202.589,15.317 202.432,14.965 C202.275,14.607 202.196,14.224 202.196,13.824 L202.196,6.516 C202.196,6.116 202.274,5.734 202.431,5.369 C202.587,5.012 202.794,4.704 203.056,4.442 C203.317,4.181 203.628,3.973 203.982,3.82 C204.342,3.661 204.727,3.582 205.128,3.582 L210.326,3.582 z M216.852,3.582 L212.287,3.582 C212.032,3.582 211.8,3.677 211.614,3.853 C211.409,4.054 211.311,4.307 211.337,4.582 L211.335,5.216 C211.335,5.476 211.425,5.712 211.604,5.894 C211.782,6.079 212.022,6.175 212.287,6.175 L213.214,6.175 L207.961,11.443 C207.78,11.611 207.681,11.856 207.684,12.127 C207.691,12.388 207.783,12.617 207.958,12.795 L208.585,13.43 C208.782,13.616 209.016,13.705 209.271,13.705 C209.53,13.705 209.765,13.613 209.945,13.433 L215.211,8.181 L215.211,9.101 C215.211,9.358 215.307,9.593 215.489,9.775 C215.671,9.957 215.908,10.051 216.17,10.051 L216.852,10.051 C217.069,10.075 217.317,9.982 217.512,9.793 C217.704,9.605 217.804,9.367 217.804,9.101 L217.804,4.534 C217.804,4.284 217.705,4.054 217.525,3.871 C217.346,3.685 217.111,3.582 216.852,3.582 z" fill="#000000" id="icon-out-link-shape"/>
<path d="M390.13,3.582 L390.041,4.159 C390.032,4.214 390.025,4.262 390.01,4.37 L390.009,4.381 C390.002,4.421 389.999,4.472 389.999,4.534 L389.999,5.233 C389.999,5.311 390.01,5.398 390.033,5.496 L390.179,6.112 L384.932,6.112 C384.819,6.112 384.731,6.148 384.65,6.229 C384.565,6.314 384.53,6.4 384.53,6.516 L384.53,13.824 C384.53,13.94 384.565,14.026 384.648,14.108 C384.732,14.192 384.819,14.228 384.932,14.228 L393.454,14.228 C393.57,14.228 393.658,14.192 393.746,14.105 C393.83,14.023 393.867,13.937 393.866,13.824 L393.866,10.124 L394.668,10.73 C394.845,10.864 395.039,10.97 395.249,11.048 C395.465,11.126 395.684,11.169 395.911,11.175 L396.396,11.189 L396.396,13.824 C396.396,14.226 396.315,14.61 396.153,14.972 C395.995,15.318 395.784,15.626 395.52,15.89 C395.256,16.154 394.949,16.364 394.6,16.522 C394.244,16.679 393.861,16.758 393.454,16.758 L384.932,16.758 C384.533,16.758 384.149,16.68 383.786,16.522 C383.429,16.366 383.118,16.153 382.856,15.886 C382.6,15.623 382.393,15.317 382.236,14.965 C382.079,14.607 382,14.224 382,13.824 L382,6.516 C382,6.116 382.078,5.734 382.235,5.369 C382.391,5.012 382.599,4.704 382.86,4.442 C383.121,4.181 383.432,3.973 383.786,3.82 C384.147,3.661 384.531,3.582 384.932,3.582 L390.13,3.582 z M396.656,3.582 L392.091,3.582 C391.836,3.582 391.604,3.677 391.418,3.853 C391.214,4.054 391.116,4.307 391.142,4.582 L391.139,5.216 C391.14,5.476 391.23,5.712 391.408,5.894 C391.586,6.079 391.826,6.175 392.091,6.175 L393.018,6.175 L387.765,11.443 C387.584,11.611 387.485,11.856 387.489,12.127 C387.495,12.388 387.587,12.617 387.762,12.795 L388.389,13.43 C388.586,13.616 388.82,13.705 389.075,13.705 C389.334,13.705 389.569,13.613 389.749,13.433 L395.015,8.181 L395.015,9.101 C395.016,9.358 395.111,9.593 395.293,9.775 C395.475,9.957 395.712,10.051 395.974,10.051 L396.656,10.051 C396.873,10.075 397.121,9.982 397.316,9.793 C397.509,9.605 397.608,9.367 397.608,9.101 L397.608,4.534 C397.608,4.284 397.509,4.054 397.329,3.871 C397.15,3.685 396.915,3.582 396.656,3.582 z" fill="#000000" id="icon-out-link-shape"/>
</g>
<g id="icon-close">
<path d="M174.462,4.323 L174.981,4.615 C175.608,5.157 175.676,6.105 175.135,6.731 L171.983,10.375 L175.135,14.019 C175.676,14.645 175.608,15.593 174.981,16.135 C174.355,16.676 173.407,16.608 172.865,15.981 L170,12.668 L167.135,15.981 C166.593,16.608 165.645,16.676 165.019,16.135 C164.392,15.593 164.324,14.645 164.865,14.019 L168.017,10.375 L164.865,6.731 C164.324,6.105 164.392,5.157 165.019,4.615 C165.645,4.074 166.593,4.142 167.135,4.769 L170,8.082 L172.865,4.769 C173.634,4.174 173.138,4.419 174.462,4.323 z" fill="#000000" id="icon-close-shape"/>
<path d="M214.462,4.323 L214.981,4.615 C215.608,5.157 215.676,6.105 215.134,6.731 L211.983,10.375 L215.134,14.019 C215.676,14.645 215.608,15.593 214.981,16.135 C214.355,16.676 213.407,16.608 212.865,15.981 L210,12.668 L207.134,15.981 C206.593,16.608 205.645,16.676 205.019,16.135 C204.392,15.593 204.324,14.645 204.865,14.019 L208.017,10.375 L204.865,6.731 C204.324,6.105 204.392,5.157 205.019,4.615 C205.645,4.074 206.593,4.142 207.134,4.769 L210,8.082 L212.865,4.769 C213.634,4.174 213.138,4.419 214.462,4.323 z" fill="#000000" id="icon-close-shape"/>
</g>
<g id="icon-save">
<path d="M150.02,6.5 C150.849,6.5 151.521,7.172 151.52,8 L151.52,15 C151.521,15.828 150.849,16.5 150.02,16.5 C149.192,16.5 148.521,15.828 148.52,15 L148.52,8 C148.521,7.172 149.192,6.5 150.02,6.5 z M145,8 L150.026,3 L155,8 z" fill="#000000" id="icon-save-shape"/>
<path d="M190.02,6.5 C190.849,6.5 191.521,7.172 191.52,8 L191.52,15 C191.521,15.828 190.849,16.5 190.02,16.5 C189.192,16.5 188.521,15.828 188.52,15 L188.52,8 C188.521,7.172 189.192,6.5 190.02,6.5 z M185,8 L190.026,3 L195,8 z" fill="#000000" id="icon-save-shape"/>
</g>
<g id="icon-apply">
<path d="M136.283,3.527 L136.834,3.753 C137.522,4.213 137.707,5.145 137.247,5.834 L130.561,15.834 C130.095,16.531 129.147,16.711 128.458,16.232 C127.918,15.857 127.918,15.857 126.301,14.731 C124.683,13.607 124.683,13.607 124.143,13.231 C123.463,12.759 123.295,11.824 123.768,11.144 C124.241,10.463 125.176,10.296 125.856,10.768 C126.396,11.143 126.396,11.143 128.013,12.268 C128.671,12.726 128.37,12.516 128.916,12.896 L134.753,4.166 C135.442,3.481 134.981,3.785 136.283,3.527 z" fill="#000000" id="icon-apply-shape"/>
<path d="M176.283,3.526 L176.834,3.753 C177.522,4.213 177.707,5.145 177.247,5.834 L170.561,15.834 C170.095,16.531 169.147,16.711 168.458,16.232 C167.918,15.857 167.918,15.857 166.301,14.731 C164.683,13.607 164.683,13.607 164.143,13.231 C163.463,12.759 163.295,11.824 163.768,11.144 C164.241,10.463 165.176,10.296 165.856,10.768 C166.396,11.143 166.396,11.143 168.013,12.268 C168.671,12.726 168.37,12.516 168.916,12.896 L174.753,4.166 C175.442,3.481 174.981,3.785 176.283,3.526 z" fill="#000000" id="icon-apply-shape"/>
</g>
<g id="icon-redo">
<path d="M111.792,3 L111.792,5.209 L111.567,5.157 C107.247,5.045 103.021,7.848 104.201,12.074 C105.18,15.581 108.588,16.707 112.964,16.439 C113.791,16.389 114.42,15.677 114.37,14.851 C114.319,14.024 113.608,13.394 112.781,13.445 C109.672,13.635 107.556,12.936 107.09,11.267 C106.62,9.584 108.876,8.088 111.489,8.156 L111.792,8.103 L111.792,10 L116.531,6.5 L111.792,3 z" fill="#000000" id="icon-redo-shape"/>
<path d="M151.792,3 L151.792,5.209 L151.567,5.157 C147.247,5.045 143.021,7.848 144.201,12.074 C145.18,15.581 148.588,16.707 152.964,16.439 C153.791,16.389 154.42,15.677 154.37,14.851 C154.319,14.024 153.608,13.394 152.781,13.445 C149.672,13.635 147.556,12.936 147.09,11.267 C146.62,9.584 148.876,8.088 151.489,8.156 L151.792,8.103 L151.792,10 L156.531,6.5 L151.792,3 z" fill="#000000" id="icon-redo-shape"/>
</g>
<g id="icon-undo">
<path d="M88.738,3 L88.738,5.209 L88.964,5.157 C93.284,5.045 97.51,7.848 96.33,12.074 C95.351,15.581 91.943,16.707 87.567,16.439 C86.74,16.389 86.11,15.677 86.161,14.851 C86.211,14.024 86.923,13.394 87.749,13.445 C90.858,13.635 92.975,12.936 93.44,11.267 C93.91,9.584 91.655,8.088 89.041,8.156 L88.738,8.103 L88.738,10 L84,6.5 L88.738,3 z" fill="#000000" id="icon-undo-shape"/>
<path d="M128.738,3 L128.738,5.209 L128.964,5.157 C133.284,5.045 137.51,7.848 136.33,12.074 C135.351,15.581 131.943,16.707 127.567,16.439 C126.74,16.389 126.11,15.677 126.161,14.851 C126.211,14.024 126.923,13.394 127.749,13.445 C130.858,13.635 132.975,12.936 133.44,11.267 C133.91,9.584 131.655,8.088 129.041,8.156 L128.738,8.103 L128.738,10 L124,6.5 L128.738,3 z" fill="#000000" id="icon-undo-shape"/>
</g>
<g id="icon-vertex">
<path d="M110,7 C111.657,7 113,8.343 113,10 C113,11.657 111.657,13 110,13 C108.343,13 107,11.657 107,10 C107,8.343 108.343,7 110,7 z M110,8.8 C109.337,8.8 108.8,9.337 108.8,10 C108.8,10.663 109.337,11.2 110,11.2 C110.663,11.2 111.2,10.663 111.2,10 C111.2,9.337 110.663,8.8 110,8.8 z" fill="#000000" id="icon-vertex-shape"/>
</g>
<g id="icon-relation">
<path d="M94.5,3 C95.881,3 97,4.119 97,5.5 C97,6.881 95.881,8 94.5,8 C93.489,7.97 92.651,7.429 92.26,6.5 L88.029,6.5 L92.027,10.248 C92.652,9.985 92.327,10.068 93,10 C94.381,10 95.5,11.119 95.5,12.5 C95.5,13.881 94.381,15 93,15 C91.619,15 90.5,13.881 90.5,12.5 C90.561,11.895 90.485,12.152 90.669,11.716 L86.5,7.808 L86.5,12.259 C87.49,12.593 87.903,13.534 88,14.5 C88,15.881 86.881,17 85.5,17 C84.119,17 83,15.881 83,14.5 C83.03,13.489 83.571,12.651 84.5,12.26 L84.5,7.74 C83.51,7.407 83.097,6.465 83,5.5 C83,4.119 84.119,3 85.5,3 C86.511,3.03 87.35,3.571 87.74,4.5 L92.26,4.5 C92.593,3.51 93.535,3.097 94.5,3 z M85.5,13.5 C84.948,13.5 84.5,13.948 84.5,14.5 C84.5,15.052 84.948,15.5 85.5,15.5 C86.052,15.5 86.5,15.052 86.5,14.5 C86.5,13.948 86.052,13.5 85.5,13.5 z M93,11.5 C92.448,11.5 92,11.948 92,12.5 C92,13.052 92.448,13.5 93,13.5 C93.552,13.5 94,13.052 94,12.5 C94,11.948 93.552,11.5 93,11.5 z M85.5,4.5 C84.948,4.5 84.5,4.948 84.5,5.5 C84.5,6.052 84.948,6.5 85.5,6.5 C86.052,6.5 86.5,6.052 86.5,5.5 C86.5,4.948 86.052,4.5 85.5,4.5 z M94.5,4.5 C93.948,4.5 93.5,4.948 93.5,5.5 C93.5,6.052 93.948,6.5 94.5,6.5 C95.052,6.5 95.5,6.052 95.5,5.5 C95.5,4.948 95.052,4.5 94.5,4.5 z" fill="#000000" id="icon-relation-shape"/>
</g>
<g id="icon-area">
<path d="M65.5,3 C64.119,3 63,4.119 63,5.5 C63,6.458 63.543,7.288 64.333,7.708 L64.333,12.292 C63.543,12.712 63,13.542 63,14.5 C63,15.881 64.119,17 65.5,17 C66.458,17 67.288,16.457 67.708,15.667 L72.292,15.667 C72.712,16.457 73.542,17 74.5,17 C75.881,17 77,15.881 77,14.5 C77,13.542 76.457,12.712 75.667,12.292 L75.667,7.708 C76.457,7.288 77,6.458 77,5.5 C77,4.119 75.881,3 74.5,3 C73.531,3 72.696,3.558 72.281,4.365 L72.219,4.333 L67.708,4.333 C67.288,3.543 66.458,3 65.5,3 z M65.5,4.5 C66.052,4.5 66.5,4.948 66.5,5.5 C66.5,6.052 66.052,6.5 65.5,6.5 C64.948,6.5 64.5,6.052 64.5,5.5 C64.5,4.948 64.948,4.5 65.5,4.5 z M74.5,4.5 C75.052,4.5 75.5,4.948 75.5,5.5 C75.5,6.052 75.052,6.5 74.5,6.5 C73.948,6.5 73.5,6.052 73.5,5.5 C73.5,4.948 73.948,4.5 74.5,4.5 z M67.708,6.667 L72.292,6.667 C72.526,7.108 72.892,7.474 73.333,7.708 L73.333,12.292 C72.892,12.526 72.526,12.892 72.292,13.333 L67.708,13.333 C67.474,12.892 67.108,12.526 66.667,12.292 L66.667,7.708 C67.108,7.474 67.474,7.108 67.708,6.667 z M65.5,13.5 C66.052,13.5 66.5,13.948 66.5,14.5 C66.5,15.052 66.052,15.5 65.5,15.5 C64.948,15.5 64.5,15.052 64.5,14.5 C64.5,13.948 64.948,13.5 65.5,13.5 z M74.5,13.5 C75.052,13.5 75.5,13.948 75.5,14.5 C75.5,15.052 75.052,15.5 74.5,15.5 C73.948,15.5 73.5,15.052 73.5,14.5 C73.5,13.948 73.948,13.5 74.5,13.5 z" fill="#000000" id="icon-area-shape"/>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 KiB

After

Width:  |  Height:  |  Size: 217 KiB

10
test/spec/svg/icon.js
View File

@@ -11,11 +11,9 @@ describe("iD.svg.Icon", function () {
expect(selection.select('use').attr('xlink:href')).to.eql('#icon-bug');
});
it("creates a classed SVG icon", function () {
selection.call(iD.svg.Icon('#icon-bug', 'icon-light'));
expect(selection.select('svg')).to.be.classed('icon');
expect(selection.select('use').attr('xlink:href')).to.eql('#icon-bug');
expect(selection.select('use')).to.be.classed('icon-light');
it("classes the 'svg' and 'use' elements", function () {
selection.call(iD.svg.Icon('#icon-bug', 'svg-class', 'use-class'));
expect(selection.select('svg')).to.be.classed('icon svg-class');
expect(selection.select('use')).to.be.classed('use-class');
});
});