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 682b9fab1..08e8bb1b5 100644 Binary files a/img/sprite.png and b/img/sprite.png differ 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));