From e72c21f256b5ebb223fea434295e317c88a11587 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Thu, 20 Dec 2012 18:49:21 -0500 Subject: [PATCH] progress on modals. --- css/app.css | 28 ++++++---- img/source/design.svg | 110 +++++++++++++++++++++++++++++++++++--- img/source/loader.psd | Bin 258738 -> 261446 bytes img/source/sprite.svg | 17 +++--- img/sprite.png | Bin 15342 -> 15767 bytes js/id/ui/commit.js | 48 ++++++++--------- js/id/ui/confirm.js | 4 +- js/id/ui/loading.js | 2 +- js/id/ui/tag_reference.js | 13 ++--- 9 files changed, 165 insertions(+), 57 deletions(-) diff --git a/css/app.css b/css/app.css index 188328736..45a5bc4da 100644 --- a/css/app.css +++ b/css/app.css @@ -29,6 +29,10 @@ h2 { margin-bottom: 10px; } +h3:last-child, +h2:last-child, +h4:last-child { margin-bottom: 0;} + h3 { font-size: 18px; line-height: 1.3333; @@ -409,9 +413,11 @@ button[disabled] .icon.layers { background-position: -300px -40px;} button[disabled] .icon.avatar { background-position: -320px -40px;} button[disabled] .icon.nearby { background-position: -340px -40px;} -.icon.big-line { background-position: 0px -80px;} -.icon.big-point { background-position: -40px -80px;} -.icon.big-area { background-position: -80px -80px;} +.icon.big-line { background-position: 0px -80px;} +.icon.big-point { background-position: -40px -80px;} +.icon.big-area { background-position: -80px -80px;} +.icon.big-inspect { background-position: -120px -80px;} + /* Toggle Icon is special */ .toggle.icon { background-position: 0px -180px;} @@ -765,7 +771,6 @@ div.typeahead a:first-child { .modal .loader { margin-bottom: 10px;} .modal .content { - padding: 10px; margin-bottom: 40px; } @@ -773,7 +778,8 @@ div.typeahead a:first-child { text-align: center; } -.modal button { margin-top: 0;} +.modal button { margin-bottom: 0;} +.modal button:first-child { margin-left: 0;} .shaded { z-index: 2; @@ -806,6 +812,12 @@ div.typeahead a:first-child { max-height: 160px; } +.modal-section { + padding: 20px; + border-bottom: 1px solid #ccc; +} +.modal-section:last-child { border-bottom: 0;} + .changeset-list li { border-top:1px solid #ccc; padding:5px 10px; @@ -820,12 +832,6 @@ div.typeahead a:first-child { font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif; } -.commit-modal .buttons { - padding-bottom: 10px; - margin-bottom: 10px; - border-bottom: 1px solid #ccc; -} - .loading-modal { text-align: center; } diff --git a/img/source/design.svg b/img/source/design.svg index af72a509c..b3b801c0b 100644 --- a/img/source/design.svg +++ b/img/source/design.svg @@ -481,12 +481,12 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="1555.3951" - inkscape:cy="1076.4548" + inkscape:zoom="1" + inkscape:cx="413.87213" + inkscape:cy="499.14559" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:window-width="1543" inkscape:window-height="834" inkscape:window-x="246" @@ -2868,7 +2868,8 @@ transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" /> + id="g8385" + transform="translate(-10,0)"> + id="g8396" + transform="translate(-10,0)"> + + + + + + + + + + + 7%Q6y9CiapI;ptx~AOq2|yVZ5-#PP6&w{+bM=7w23h(TsroS?IpWA(abn) zBgE!f2_eD?`O4n~)C)Dm7s@555*Kc8;0)phs)P{YQr_ELJ8=b(f-LpINV7Zhy>H&% zyq%ppKgaL?6@NDoyY_o}v9KIIt0?Zy-stXpOnd&`=Py1`kEN2u@$uR5soANtyQDpL zaNc@b`$AJwtxV*$=9&ZfkRV&`mjerG%FRR)?vv5QnB3p2T?nd$7rbXOiRDY%)1FCXK55>+rMg z`N4^n5&L#xK>I^cl)>iC58A0SAsm*8pew|p#r%2^<`Lx;MJQC^iqg6_|Fzb7GxO63 zxR&S!wz2yD^x%&c+mt{@6)JRWQG9eJIEJ?4J$+br)x}ZgAv6TTox#7ok%Y|tcBkJ8 zkEjpq_c@}Y>2vy<&Z8Lz+sD$)JckooM5_A?uW9%o^h`vZ&p# zKu0CQcg6el&)YUP^l;s5+y=FAKiE zQ;<}XZBf2Vgrxj3F`;<68}PK`#1@-`Q@e8Wkz^c_qZMXjU7h}i)fQ{)rwhOT_;p%d z!)@tJCHi=58}#VD*`AFbdJP2yyUKtShCYNh0h^kI9OfkWi5{ocW}OIQn-=MfZXu6! z(Gqnkl5wv9(OjfzGR6<2f7G-8f*~ZUabmqnjapsy(-9}|uS5@bB<4AC39F-@<~JQb zJ%^gd+g@`y&7V delta 403 zcmX^1i+|Ho{s{_PVF?yap1v%q3=Gp2F^WvI<6^Sm-sts_k=xKR#L&{p(7?*je6kyp zH8Ov557QQ=$zRzNHz%_8Fm0aC`GZl_&CS%*!qUjm#MsEy#lXPX%+kcz)!Eg=$=K1@ z!qURgM!zI8ZSn#>oyiY4jWLFmVfVokG&591YnKs{cdMW^Pv;y1{r-P?%o)R0+ z%(!s#mjr=a)~PpcKI@wPu#_oybIiGUnLz&Kv$Y_;&30=G#;qWMvvu3S0@FFYm}REx zKVUN5-n57@1tfLcwFaVAorejm_Q0RK?Lf^RL6XlUUqkc(4GP?z@_-4f<+)THL<`Wg Ur66SwoFqU33fnJlW-j&w0A#9vng9R* diff --git a/img/source/sprite.svg b/img/source/sprite.svg index 274921176..c1728cc5e 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -38,12 +38,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="29.5116" - inkscape:cy="98.899907" + inkscape:zoom="1" + inkscape:cx="123.17543" + inkscape:cy="55.423782" inkscape:document-units="px" inkscape:current-layer="layer12" - showgrid="true" + showgrid="false" inkscape:window-width="1560" inkscape:window-height="922" inkscape:window-x="308" @@ -53,7 +53,7 @@ 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="false"> @@ -165,7 +165,7 @@ image/svg+xml - + @@ -1386,5 +1386,10 @@ height="19.999998" x="-135" y="39.999996" /> + diff --git a/img/sprite.png b/img/sprite.png index 8138e59809a36f35c056df9780b07b61146aad9a..8d95470f5787835aa4b68e566bf21aad5f5db376 100644 GIT binary patch literal 15767 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 F{eN%TX}tgd literal 15342 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 C5xqbF diff --git a/js/id/ui/commit.js b/js/id/ui/commit.js index cd5a74324..fa3ba810b 100644 --- a/js/id/ui/commit.js +++ b/js/id/ui/commit.js @@ -3,43 +3,43 @@ iD.commit = function() { function commit(selection) { var changes = selection.datum(), - header = selection.append('div').attr('class', 'header pad1'), + header = selection.append('div').attr('class', 'header modal-section'), body = selection.append('div').attr('class', 'body'); header.append('h2').text('Upload Changes to OpenStreetMap'); header.append('p').text('The changes you upload will be visible on all maps that use OpenStreetMap data.'); - body.append('div').attr('class','pad1') - .append('textarea') - .attr('class', 'changeset-comment pad1') - .attr('placeholder', 'Brief Description of your contributions'); + var commit = body.append('div').attr('class','modal-section'); + commit.append('textarea') + .attr('class', 'changeset-comment') + .attr('placeholder', 'Brief Description of your contributions'); - var buttonwrap = body.append('div') - .attr('class', 'buttons'); + var buttonwrap = commit.append('div') + .attr('class', 'buttons'); - var savebutton = buttonwrap.append('button') - .attr('class', 'action wide') - .on('click.save', function() { - event.save({ - comment: d3.select('textarea.changeset-comment').node().value - }); - }); - savebutton.append('span').attr('class','icon save icon-pre-text') - savebutton.append('span').attr('class','label').text('Save') - var cancelbutton = buttonwrap.append('button') - .attr('class', 'cancel wide') - .on('click.cancel', function() { - event.cancel(); - }); - cancelbutton.append('span').attr('class','icon close icon-pre-text') - cancelbutton.append('span').attr('class','label').text('Cancel') + var savebutton = buttonwrap.append('button') + .attr('class', 'action wide') + .on('click.save', function() { + event.save({ + comment: d3.select('textarea.changeset-comment').node().value + }); + }); + savebutton.append('span').attr('class','icon save icon-pre-text') + savebutton.append('span').attr('class','label').text('Save') + var cancelbutton = buttonwrap.append('button') + .attr('class', 'cancel wide') + .on('click.cancel', function() { + event.cancel(); + }); + cancelbutton.append('span').attr('class','icon close icon-pre-text') + cancelbutton.append('span').attr('class','label').text('Cancel') var section = body.selectAll('div.commit-section') .data(['modified', 'deleted', 'created'].filter(function(d) { return changes[d].length; })) .enter() - .append('div').attr('class', 'commit-section pad1'); + .append('div').attr('class', 'commit-section modal-section'); section.append('h3').text(String) .append('small') diff --git a/js/id/ui/confirm.js b/js/id/ui/confirm.js index b8eeab955..40558804d 100644 --- a/js/id/ui/confirm.js +++ b/js/id/ui/confirm.js @@ -2,8 +2,8 @@ iD.confirm = function(message) { var modal = iD.modal(); modal.select('.modal').classed('modal-alert', true); modal.select('.content') - .classed('pad1', true) - .append('div').attr('class', 'description pad1'); + .classed('modal-section', true) + .append('div').attr('class', 'description'); var nochanges = modal.select('.content') .append('button') .attr('class','wide action centered') diff --git a/js/id/ui/loading.js b/js/id/ui/loading.js index 19bbb0140..303d650b6 100644 --- a/js/id/ui/loading.js +++ b/js/id/ui/loading.js @@ -3,7 +3,7 @@ iD.loading = function(message) { var loadertext = modal.select('.content') .classed('loading-modal', true) - .append('div').classed('pad1',true); + .append('div').classed('modal-section',true); loadertext.append('img').attr('class','loader').attr('src', '../img/loader.gif'); loadertext.append('h3').text(message || ''); diff --git a/js/id/ui/tag_reference.js b/js/id/ui/tag_reference.js index 58cb96f04..4c2997a14 100644 --- a/js/id/ui/tag_reference.js +++ b/js/id/ui/tag_reference.js @@ -2,11 +2,12 @@ iD.tagReference = function(selection) { selection.each(function() { function g(x) { return function(d) { return d[x]; }; } var selection = d3.select(this); - selection - .append('div') - .attr('class','header') - .append('h2') - .text(g('title')); + var header = selection.append('div') + .attr('class','modal-section') + .append('h2'); + header.append('span').attr('class','icon big icon-pre-text big-inspect'); + header.append('span').text(g('title')); + var icon_row = selection.append('div'); var icons = icon_row.selectAll('span.icon') .data(g('types')) @@ -30,4 +31,4 @@ iD.tagReference = function(selection) { .append('p') .text(g('description')); }); -}; +}; \ No newline at end of file