diff --git a/css/app.css b/css/app.css index 7e561dcac..2d9858251 100644 --- a/css/app.css +++ b/css/app.css @@ -2009,11 +2009,11 @@ img.wiki-image { ------------------------------------------------------- */ .modal-actions .restore:before { - background-position: -400px -220px; + background-position: -500px -220px; } .modal-actions .reset:before { - background-position: -500px -220px; + background-position: -600px -220px; } /* Success Modal @@ -2023,16 +2023,24 @@ img.wiki-image { background-position: -100px -220px; } +.modal-actions .facebook { + border-left: 1px solid #ccc; +} + +.modal-actions .facebook:before { + background-position: -200px -220px; +} + /* Splash Modal ------------------------------------------------------- */ .modal-actions .walkthrough:before, .walkthrough a:before { - background-position: -200px -220px; + background-position: -300px -220px; } .modal-actions .start:before { - background-position: -300px -220px; + background-position: -400px -220px; } /* Commit Modal diff --git a/dist/img/sprite.svg b/dist/img/sprite.svg index 28f71c23a..4b8340364 100644 --- a/dist/img/sprite.svg +++ b/dist/img/sprite.svg @@ -9,11 +9,11 @@ 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="600" + width="700" height="560" id="svg12393" version="1.1" - inkscape:version="0.48.1 r9760" + inkscape:version="0.48.2 r9819" sodipodi:docname="sprite.svg" inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite.png" inkscape:export-xdpi="90" @@ -38,9 +38,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="15.622585" - inkscape:cx="205.25795" - inkscape:cy="393.75775" + inkscape:zoom="18.189894" + inkscape:cx="263.82239" + inkscape:cy="300.42147" inkscape:document-units="px" inkscape:current-layer="layer12" showgrid="true" @@ -228,7 +228,7 @@ image/svg+xml - + @@ -239,14 +239,15 @@ transform="translate(-25,3.0624999e-6)" style="display:inline"> + id="path4677" + inkscape:connector-curvature="0" /> @@ -614,86 +615,106 @@ + id="path4824" + inkscape:connector-curvature="0" /> + id="path4822" + inkscape:connector-curvature="0" /> + id="path4820" + inkscape:connector-curvature="0" /> + id="path4818" + inkscape:connector-curvature="0" /> + id="path4816" + inkscape:connector-curvature="0" /> + id="path4814" + inkscape:connector-curvature="0" /> + id="path4812" + inkscape:connector-curvature="0" /> + id="path4810" + inkscape:connector-curvature="0" /> + id="path4808" + inkscape:connector-curvature="0" /> + id="path4806" + inkscape:connector-curvature="0" /> + id="path4861" + inkscape:connector-curvature="0" /> + id="path4859" + inkscape:connector-curvature="0" /> + id="path4857" + inkscape:connector-curvature="0" /> + id="path4855" + inkscape:connector-curvature="0" /> + id="path4804" + inkscape:connector-curvature="0" /> + id="path4802" + inkscape:connector-curvature="0" /> + id="path4800" + inkscape:connector-curvature="0" /> + id="path4798" + inkscape:connector-curvature="0" /> + id="path4796" + inkscape:connector-curvature="0" /> + id="path9830" + inkscape:connector-curvature="0" /> @@ -854,11 +875,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)" /> @@ -904,7 +925,7 @@ transform="translate(10.000004,-1.9999957)"> @@ -938,11 +959,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)" /> @@ -994,11 +1015,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)" /> @@ -1078,11 +1099,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)" /> @@ -1128,7 +1149,7 @@ transform="translate(10.000004,-1.9999957)"> @@ -1162,11 +1183,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)" /> @@ -1218,11 +1239,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)" /> @@ -1317,11 +1338,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)" /> @@ -1367,7 +1388,7 @@ transform="translate(10.000004,-1.9999957)"> @@ -1401,11 +1422,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)" /> + id="path6718" + inkscape:connector-curvature="0" /> + id="path10271" + inkscape:connector-curvature="0" /> + id="path10269" + inkscape:connector-curvature="0" /> + id="path10253" + inkscape:connector-curvature="0" /> + style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + id="path4863" + inkscape:connector-curvature="0" /> + + + diff --git a/js/id/ui/success.js b/js/id/ui/success.js index d78777e42..3ffc343e0 100644 --- a/js/id/ui/success.js +++ b/js/id/ui/success.js @@ -8,10 +8,8 @@ iD.ui.Success = function(connection) { header.append('h3').text(t('just_edited')); - var m = ''; - if (changeset.comment) { - m = changeset.comment.substring(0, 130); - } + var m = changeset.comment ? + changeset.comment.substring(0, 130) : ''; var message = (m || 'Edited OSM!') + ' ' + connection.changesetURL(changeset.id); @@ -19,7 +17,7 @@ iD.ui.Success = function(connection) { var links = body.append('div').attr('class','modal-actions cf'); links.append('a') - .attr('class','col6 osm') + .attr('class','col4 osm') .attr('target', '_blank') .attr('href', function() { return connection.changesetURL(changeset.id); @@ -27,7 +25,7 @@ iD.ui.Success = function(connection) { .text(t('view_on_osm')); links.append('a') - .attr('class','col6 twitter') + .attr('class','col4 twitter') .attr('target', '_blank') .attr('href', function() { return 'https://twitter.com/intent/tweet?source=webclient&text=' + @@ -35,6 +33,14 @@ iD.ui.Success = function(connection) { }) .text('Tweet'); + links.append('a') + .attr('class','col4 facebook') + .attr('target', '_blank') + .attr('href', function() { + return 'https://facebook.com/sharer/sharer.php?u=' + encodeURIComponent(message); + }) + .text('Share on Facebook'); + var section = body.append('div').attr('class','modal-section cf'); section.append('button')