From c93cd4c9a369f2a2b65169eb1023cbbb5c638148 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Wed, 12 Dec 2012 20:44:05 -0500 Subject: [PATCH] starting to style handles. --- css/handle.png | Bin 4030 -> 0 bytes css/map.css | 20 +- img/source/design.svg | 1670 +++++++++++++++++++++++++++++++++++++---- js/id/modes/select.js | 70 +- js/id/renderer/map.js | 24 +- 5 files changed, 1593 insertions(+), 191 deletions(-) delete mode 100644 css/handle.png diff --git a/css/handle.png b/css/handle.png deleted file mode 100644 index 9148997fe5f6fe685cc51ca596cbe35e4da9dc64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4030 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 diff --git a/css/map.css b/css/map.css index 0e3465cc5..ca29e35e8 100644 --- a/css/map.css +++ b/css/map.css @@ -20,14 +20,26 @@ g.marker.active circle { } /* interactive elements */ -image.handle { +circle.handle { cursor: move; + fill:white; + stroke:#333; + fill-opacity:1; + stroke-width:2; + stroke-opacity: 1; +} + +circle.handle.hover { +} + +circle.handle.active { + fill: #6bc641; } circle.accuracy-handle { - fill:#DF2D2D; - stroke:#DF2D2D; - fill-opacity:0.2; + fill:#aaa; + stroke:#333; + fill-opacity:1; stroke-width:1; } diff --git a/img/source/design.svg b/img/source/design.svg index e21c2513c..23d27bec6 100644 --- a/img/source/design.svg +++ b/img/source/design.svg @@ -388,13 +388,13 @@ pagecolor="#e1e1e1" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="1" + inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="659.71394" - inkscape:cy="744.70739" + inkscape:cx="-378.37321" + inkscape:cy="708.11725" inkscape:document-units="px" - inkscape:current-layer="layer13" + inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1543" inkscape:window-height="834" @@ -402,7 +402,7 @@ inkscape:window-y="5" inkscape:window-maximized="0" inkscape:snap-bbox="true" - inkscape:snap-nodes="false" + inkscape:snap-nodes="true" showguides="false" inkscape:guide-bbox="true" inkscape:object-paths="true" @@ -521,6 +521,14 @@ orientation="0,1" position="810,885" id="guide43309" /> + + @@ -538,7 +546,7 @@ inkscape:groupmode="layer" id="layer6" inkscape:label="map" - style="display:inline"> + style="display:none"> + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + handle selected + path selected + + + + + noselection + + + + + + + + + style="display:none"> Contribute to OpenStreetMap by adding points, points, lines or lines or areas. areas. + style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="display:inline"> Things like restaurants, monuments, and postal boxes are points. Add a point of interest to the map. + + @@ -2597,16 +4001,16 @@ height="40" width="40" id="rect44456" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -2618,39 +4022,39 @@ height="40" width="40" id="rect43311-5" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="fill:#c1c1c1;fill-opacity:1;display:inline"> + style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="opacity:0.2;color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="display:inline"> + style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="fill:#c1c1c1;fill-opacity:1;display:inline"> + style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="opacity:0.9;color:#000000;fill:#393939;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="opacity:0.9;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + 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" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:none;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#161616;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m -679,124 c -4.97056,0 -9,4.02944 -9,9 0,1.45311 0.35716,2.81616 0.96875,4.03125 L -694,144 l 0,2 c 0,1 1,2 2,2 l 2,0 6.96875,-6.96875 C -681.81616,141.64284 -680.45311,142 -679,142 c 4.97056,0 9,-4.02944 9,-9 0,-4.97056 -4.02944,-9 -9,-9 z m 0,4 c 2.76142,0 5,2.23858 5,5 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 z" + id="path43167-8" + inkscape:connector-curvature="0" /> + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + id="path43167-6" + inkscape:connector-curvature="0" />