diff --git a/css/app.css b/css/app.css index 1037d60fa..bfd211278 100644 --- a/css/app.css +++ b/css/app.css @@ -332,7 +332,6 @@ form.hide { button { line-height:20px; border:0; - color:#222; background: white; font-weight:bold; font-size:12px; @@ -743,12 +742,12 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} .grid-entry > .icon { position: absolute; - top: 30px;left: 0; right: 0; + top: 30px;left: -30px; right: -30px; margin: auto; } .inspector-body-line .grid-entry .icon { - top: 10%; + top: -10px; } .grid-entry .label { @@ -767,6 +766,11 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} border-top: 1px solid rgba(0, 0, 0, .1); } +.current .grid-entry, +.current .grid-entry .label { + border-color: #7092ff; +} + .preset-grid-search-wrap { height: 60px; border-bottom: 1px solid #ccc; @@ -811,6 +815,10 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} /* Preset icon colors */ +.inspector-body-line .icon.feature-marker-stroked { + top: 30px; +} + .preset-icon-fill.area { cursor: inherit; height: 45px; diff --git a/img/feature-icons.png b/img/feature-icons.png index 6e61b7d6e..92e8efab1 100644 Binary files a/img/feature-icons.png and b/img/feature-icons.png differ diff --git a/img/source/line-presets.svg b/img/source/line-presets.svg index 05b9e7036..9cc1b10ea 100644 --- a/img/source/line-presets.svg +++ b/img/source/line-presets.svg @@ -14,7 +14,7 @@ height="100" id="svg7013" version="1.1" - inkscape:version="0.48.2 r9819" + inkscape:version="0.48.1 r9760" sodipodi:docname="line-presets.svg"> @@ -30,26 +30,6 @@ offset="1" id="stop24792" /> - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:label="#g7086"> @@ -2310,11 +285,11 @@ sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" id="path24786" - d="m 214,52.36218 -7,-3 0,-16 -4,-1.0718 15,-7.547 5,11.6188 -13,6 0,2 4,2 z" - style="opacity:0.5;color:#000000;fill:url(#linearGradient24794);fill-opacity:1;fill-rule:nonzero;stroke:#b5b5b5;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="m 214,52.36218 -7,-3 0,-13 -4,-1.0718 15,-7.547 5,11.6188 -13,6 0,2 4,2 z" + style="opacity:0.5;color:#000000;fill:url(#linearGradient7078);fill-opacity:1;fill-rule:nonzero;stroke:#b5b5b5;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -2374,114 +349,31 @@ + id="highway-service" + inkscape:label="#g26365"> + style="color:#000000;fill:none;fill-opacity:1;stroke:none;stroke-width:0.99999987999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - + d="M 727 52 L 727 55.25 L 728 55.625 L 728 52 L 727 52 z M 725 53 L 725 55.5 L 726 55.875 L 726 53 L 725 53 z M 731 53 L 731 56.75 L 731.65625 57 L 732 57 L 732 53 L 731 53 z M 729 54 L 729 57 L 730 57.375 L 730 54 L 729 54 z M 733 55 L 733 58.5 L 734 58.875 L 734 55 L 733 55 z " + transform="matrix(-1,0,0,1,1017,12.362183)" + id="path24215" /> - - - - - - - - - - - - - - - + id="g24201" /> + + + + + + id="waterway-river" + inkscape:label="#g7302"> - - - + id="highway-living_street" + inkscape:label="#g7349"> + - + sodipodi:nodetypes="ccccccccccccccccccccccccccccccsssss" /> - - - - + style="opacity:0.5;color:#000000;fill:url(#linearGradient7337);fill-opacity:1;fill-rule:nonzero;stroke:#b5b5b5;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + - - - - - - - + id="highway-footway" + inkscape:label="" + transform="translate(110,0)"> + + + + + + width="40" + height="3" + x="730" + y="77.362183" /> - + + sodipodi:cx="30.5" + sodipodi:cy="66.5" + sodipodi:rx="1.5" + sodipodi:ry="1.5" + d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" + transform="matrix(1.6666667,0,0,1.6666667,608.66667,-31.97115)" /> - - + + + id="railway-rail" + inkscape:label="#g26461"> + id="highway-cycleway" + inkscape:label="#g26475"> - + id="waterway-stream" + inkscape:label="#g7315"> + style="color:#000000;fill:none;fill-opacity:1;stroke:none;stroke-width:0.99999987999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="highway-motorway" + inkscape:label="#g5397"> + + transform="translate(1,0)" + id="g25912-3-7-6"> + id="path25914-1-2-8" + transform="translate(-510,12.362183)" + d="m 139.5,64 c -1.38071,0 -2.5,1.119288 -2.5,2.5 0,1.380712 1.11929,2.5 2.5,2.5 l 39,0 c 1.38071,0 2.5,-1.119288 2.5,-2.5 0,-1.380712 -1.11929,-2.5 -2.5,-2.5 z" + style="color:#000000;fill:#2c5476;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + - + sodipodi:type="arc" /> + id="path25920-1-6-2" + sodipodi:cx="30.5" + sodipodi:cy="66.5" + sodipodi:rx="1.5" + sodipodi:ry="1.5" + d="M 32,66.5 C 32,67.328427 31.328427,68 30.5,68 29.671573,68 29,67.328427 29,66.5 29,65.671573 29.671573,65 30.5,65 c 0.828427,0 1.5,0.671573 1.5,1.5 z" + transform="translate(-362,12.362183)" /> + + + + + + + + + + + + - - - - + id="highway-trunk" + inkscape:label="#g5483"> + + + + + + + + + + + + + - + id="path26842" + d="m -236,70.36218 -0.5,-4 3,0 0.5,4 z" + style="color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + - - - - - - - - - - - - - - - + id="highway-primary" + inkscape:label="#g5500"> + + + + + + + + + + + id="path26879" + d="m -141,70.36218 0.5,-4 -3,0 -0.5,4 z" + style="color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + id="path26877" + d="m -120.875,57.36218 -0.75,-4 2.875,0 0.75,4 z" + style="color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + + + + + + + + + + + + - - - + id="highway-tertiary" + inkscape:label="#g5530"> + + + + + + + + + sodipodi:nodetypes="ccccc" /> - - + sodipodi:nodetypes="ccccc" /> - - - - - + inkscape:label="#g7086" + id="highway-unclassified" + transform="translate(880,0)"> + - - + y="78.362183" + x="181" + height="0.9999997" + width="38" + id="rect7157" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + + + - - - hi, my name istertiary! diff --git a/img/source/sprite.svg b/img/source/sprite.svg index d16ebfab0..d84000b2c 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -39,8 +39,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="372.26436" - inkscape:cy="156.55123" + inkscape:cx="-49.735643" + inkscape:cy="134.55123" inkscape:document-units="px" inkscape:current-layer="layer12" showgrid="true" @@ -201,7 +201,7 @@ image/svg+xml - +