From 0faf9d114d9f2bf598dccf438ee3144e12b6ad71 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 13 Mar 2013 19:40:11 -0400 Subject: [PATCH] adding universal preset form icons to sprite. --- css/app.css | 45 +++++++--- img/source/sprite.svg | 204 ++++++++++++++++++++++++++++++++++-------- img/sprite.png | Bin 14739 -> 16481 bytes js/id/svg/surface.js | 2 +- js/id/ui/preset.js | 11 ++- 5 files changed, 213 insertions(+), 49 deletions(-) diff --git a/css/app.css b/css/app.css index 2e0d190f8..c9d23e6dd 100644 --- a/css/app.css +++ b/css/app.css @@ -287,6 +287,10 @@ form.hide { display:none; } +.deemphasize { + color: #a9a9a9; +} + .content { border-radius: 4px; box-shadow: 0 0 30px 0px rgba(0, 0, 0, 0.7); @@ -546,6 +550,7 @@ button[disabled] .icon.nearby { background-position: -340px -40px;} .icon-operation-rotate { background-position: -180px -140px;} .icon-operation-simplify { background-position: -200px -140px;} +.icon.add-form { background-position: -85px -180px;} /* Toggle icon is special */ @@ -579,7 +584,8 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} } .inspector-body { - overflow: auto; + overflow-y: auto; + overflow-x: hidden; max-height: 480px; min-height: 330px; } @@ -589,6 +595,17 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} position: relative; } +.inspector-wrap .message { + height: 60px; + border-bottom: 1px solid #ccc; + box-shadow: 0 0 20px 5px rgba(0, 0, 0, .05); + z-index: 100; + position: relative; + -webkit-transition: box-shadow 100ms; + -moz-transition: box-shadow 100ms; + transition: box-shadow 100ms; +} + .inspector-wrap .message button.preset-reset { height: 100%; border-radius: 0; @@ -596,11 +613,6 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} width: 12.5%; } -.inspector-wrap .message { - height: 60px; - border-bottom: 1px solid #ccc; -} - .inspector-wrap .message h3 { display: block; line-height: 20px; @@ -701,10 +713,21 @@ h4 + .preset-input input:first-child { } .preset-section h4[for="input-building:levels"], +.preset-section h4[for="input-ele"], .preset-section.checkselect h4 { right: 50%; } +/* adding additional preset fields */ + +.icon.add-form { + width: 55px; +} + +.more-buttons { + border-top: 1px solid #ccc; +} + button.preset-add-field { width: 40px; height: 40px; @@ -721,12 +744,13 @@ button.preset-add-field { input[type=number] { width: 50%; + padding-right: 65px; } .spin-control { width: 60px; - border-left: 1px solid #CCC; height: 30px; + border-left: 1px solid #CCC; display: inline-block; margin-left: -60px; margin-bottom: -11px; @@ -736,12 +760,11 @@ input[type=number] { .spin-control button { position: relative; float: left; - height: 29px; + height: 100%; width: 50%; border: 1px solid #CCC; border-radius: 0; border-left: 0; - border-bottom: 0; } .spin-control button.descend { @@ -775,7 +798,7 @@ input[type=number] { display: block; padding: 35px 5px 5px 5px; border-radius: 4px; - width: 50%; + margin-right: 50%; box-sizing: border-box; color: #999; border: 1px solid #CCC; @@ -849,7 +872,7 @@ input[type=number] { border-radius: 0 0 4px 4px; } -/* combobox dropdown styles */ +/* combobox dropdown */ div.combobox { width:155px; diff --git a/img/source/sprite.svg b/img/source/sprite.svg index bd1eb8b04..66aad17b0 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -10,7 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="440" - height="200" + height="220" id="svg12393" version="1.1" inkscape:version="0.48.2 r9819" @@ -39,21 +39,21 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="318.18348" - inkscape:cy="95.476233" + inkscape:cx="269.07592" + inkscape:cy="14.857461" inkscape:document-units="px" inkscape:current-layer="layer12" showgrid="false" inkscape:window-width="1280" inkscape:window-height="700" - inkscape:window-x="48" - inkscape:window-y="0" + inkscape:window-x="361" + inkscape:window-y="86" 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"> @@ -66,120 +66,128 @@ snapvisiblegridlinesonly="true" /> + + @@ -1289,5 +1297,131 @@ id="path25361-5" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc" /> + + + + + + + + + + + + + + + + + + + diff --git a/img/sprite.png b/img/sprite.png index 300c5dfe6b3572fd26ede4911c3254ace79f0703..ed8428ef6a3534f280e45ab2798bd90fca2992e3 100644 GIT binary patch literal 16481 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 bcX-GJ9P0%gbvkeXC7|$9MXprVG~j;#C3?^1 diff --git a/js/id/svg/surface.js b/js/id/svg/surface.js index a7333dbba..d5a1bf05c 100644 --- a/js/id/svg/surface.js +++ b/js/id/svg/surface.js @@ -93,7 +93,7 @@ iD.svg.Surface = function() { .attr({ id: 'sprite', width: 440, - height: 200, + height: 220, 'xlink:href': 'img/sprite.png' }); diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js index 9eb118126..d6d2c22f2 100644 --- a/js/id/ui/preset.js +++ b/js/id/ui/preset.js @@ -32,9 +32,16 @@ iD.ui.preset = function(context) { draw(formwrap, preset.fields); var wrap = selection.append('div') - .attr('class', 'col12 inspector-inner'); + .attr('class', 'col12 more-buttons inspector-inner'); - formbuttonwrap = wrap.append('div') + wraplabel = wrap.append('h4'); + + wraplabel.append('div').attr('class','icon add-form'); + wraplabel.append('span') + .attr('class','deemphasize') + .text('Add additional forms'); + + formbuttonwrap = wrap.append('div') .attr('class', 'col9 preset-input'); formbuttonwrap.selectAll('button')