From e6e969e011f469d99b3819df60c7a4acac30f861 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Mon, 18 Mar 2013 11:38:43 -0400 Subject: [PATCH] better area preset icons. --- css/app.css | 33 +- css/reset.css | 14 +- img/source/area-presets.svg | 730 ++++++++++++++++++++++++++------- img/source/sprite.svg | 784 +++++++++++++++++++++++++++++------- img/sprite.png | Bin 16825 -> 16708 bytes js/id/ui/preset_grid.js | 6 +- 6 files changed, 1258 insertions(+), 309 deletions(-) diff --git a/css/app.css b/css/app.css index 4755bbde2..e326be3d2 100644 --- a/css/app.css +++ b/css/app.css @@ -305,7 +305,7 @@ form.hide { background-size:5px 5px; } -.panewrap { +.panewrap { position:absolute; width:200%; height:100%; @@ -687,7 +687,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} .preset-grid { width:100%; margin-top: 60px; - padding: 20px 0px 20px 20px; + padding: 20px 10px 10px 20px; } .grid-button-wrap { padding: 0 10px 10px 0; @@ -736,13 +736,6 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} padding-bottom: 20px; } -.grid-entry .preset-icon-fill.area { - position: absolute; - opacity: 0.4; - left: 0; right: 0; top: 0; bottom: 0; - pointer-events: none; -} - .grid-entry > .icon { position: absolute; top: 30px;left: 0; right: 0; @@ -769,7 +762,6 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} border-top: 1px solid rgba(0, 0, 0, .1); } - .preset-grid-search-wrap { height: 60px; border-bottom: 1px solid #ccc; @@ -803,9 +795,10 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} .show-more { text-align: center; - padding: 5px; - margin-top:4px; + width: 100%; border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; + border-radius: 0; } .show-more a { @@ -814,13 +807,21 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} /* Preset icon colors */ +.preset-icon-fill.area { + height: 45px; + width: 45px; + margin: auto; + position: absolute; + left: 0; right: 0; top: 19px; +} + .preset-icon-fill.tag-shop, .preset-icon-fill.tag-building { - background-color: #e06e5f; + background:transparent url(../img/sprite.png) no-repeat 0 -80px; } .preset-icon-fill.tag-natural-water { - background-color: #77d3de; + background:transparent url(../img/sprite.png) no-repeat -60px -80px; } .preset-icon-fill.tag-landuse, @@ -828,11 +829,11 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} .preset-icon-fill.tag-natural-tree, .preset-icon-fill.tag-natural-grassland, .preset-icon-fill.tag-leisure-park { - background-color: #8cd05f; + background:transparent url(../img/sprite.png) no-repeat -120px -80px; } .preset-icon-fill.tag-amenity-parking { - background-color: #aaa; + background:transparent url(../img/sprite.png) no-repeat -180px -80px; } /* preset form basics */ diff --git a/css/reset.css b/css/reset.css index 18717ac31..8cc4111c3 100644 --- a/css/reset.css +++ b/css/reset.css @@ -152,12 +152,12 @@ input::-moz-focus-inner { ** Markup free clearing ** Details: http://www.positioniseverything.net/easyclearing.html */ +.cf:before, .cf:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } + content: " "; /* 1 */ + display: table; /* 2 */ +} -.cf { display: inline-block; } \ No newline at end of file +.cf:after { + clear: both; +} diff --git a/img/source/area-presets.svg b/img/source/area-presets.svg index 495326a86..0f3e20dad 100644 --- a/img/source/area-presets.svg +++ b/img/source/area-presets.svg @@ -67,15 +67,15 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="456.38973" - inkscape:cy="-18.717622" + inkscape:cx="261.62878" + inkscape:cy="213.7227" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1566" - inkscape:window-height="882" - inkscape:window-x="-43" - inkscape:window-y="57" + inkscape:window-width="1568" + inkscape:window-height="738" + inkscape:window-x="98" + inkscape:window-y="76" inkscape:window-maximized="0" fit-margin-top="0" fit-margin-left="0" @@ -83,7 +83,7 @@ fit-margin-bottom="0" showguides="false" inkscape:guide-bbox="true" - inkscape:snap-nodes="true" + inkscape:snap-nodes="false" inkscape:snap-bbox="true" inkscape:object-paths="true"> image/svg+xml - + @@ -147,6 +147,13 @@ inkscape:groupmode="layer" id="layer1" transform="translate(400,-12.362183)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/source/sprite.svg b/img/source/sprite.svg index 6019a483a..110d47865 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -13,7 +13,7 @@ height="220" 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,12 +38,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.079848" - inkscape:cx="29.99278" - inkscape:cy="12.969066" + inkscape:zoom="1" + inkscape:cx="36.348964" + inkscape:cy="86.907108" inkscape:document-units="px" inkscape:current-layer="layer12" - showgrid="false" + showgrid="true" inkscape:window-width="1280" inkscape:window-height="700" inkscape:window-x="361" @@ -197,7 +197,7 @@ image/svg+xml - + @@ -579,50 +579,6 @@ id="path55334" d="m 35,4 c 0,1 0,4 0,4 0,0 0,0.5 -0.5,0.5 C 34,8.5 34.070717,8.22484 34,8 33.695312,7.03125 33.132813,5.63541 33,5 32.795405,4.02115 32.333333,4 32,4 31,4 31,5 31,5 l 1,4 0,3 C 32,12 31.5,11.5 30.5,10.5 29.945312,9.94531 29.257659,9.7508 28.8125,10.00781 28.377049,10.25922 28.150942,10.89541 28.5,11.5 28.853553,12.11237 32,16 32,16 c 1,1 2,1 4,1 2.666667,0 1,0 3,0 2,0 2.288488,-2.86546 3,-5 C 43,9 43.5,7 43.5,7 43.613427,6.57668 43.45711,6.154 43,6 42.119539,5.70338 41.63994,6.35278 41.5,7 41.25,8.15625 41,9 41,9 40.90625,9.31383 41.0013,9.5 40.5,9.5 39.99086,9.5 40,9 40,9 40,9 40,6.33333 40,5 40,4 39,4 39,4 c 0,0 -1,0 -1,1 0,1 0,1.66667 0,3 0,0 0.01305,0.5 -0.5,0.5 C 36.998673,8.5 37,8 37,8 37,8 37,5 37,4 37,3 36,3 36,3 36,3 35,3 35,4 z" style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" /> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/sprite.png b/img/sprite.png index 682b9fab17d9bf4aa1678445863c141f4c176058..08e8bb1b59ead2deb5a37d2c7770c56d608d5600 100644 GIT binary patch literal 16708 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 bu0zQ$$3Dz(tJr}*vjC_nX+kR%EhGL5yb!y6 diff --git a/js/id/ui/preset_grid.js b/js/id/ui/preset_grid.js index 058741898..247b07bd7 100644 --- a/js/id/ui/preset_grid.js +++ b/js/id/ui/preset_grid.js @@ -24,10 +24,8 @@ iD.ui.PresetGrid = function(context, entity) { .attr('class', 'preset-grid fillL cf') .data([context.presets().defaults(entity, 36).collection]); - var show_more = gridwrap.append('div') - .attr('class', 'fillL show-more'); - - show_more.append('a') + var show_more = gridwrap.append('button') + .attr('class', 'fillL show-more') .text(t('inspector.show_more')) .on('click', function() { grid.call(drawGrid, (currently_drawn += default_limit));