diff --git a/css/app.css b/css/app.css index 552ba486e..7c3694b6b 100644 --- a/css/app.css +++ b/css/app.css @@ -932,7 +932,6 @@ div.combobox { width: 30px; background: rgba(0,0,0,.5); border-radius: 0; - border-bottom: 1px solid rgba(0, 0, 0, 1); } .map-control > button:hover { diff --git a/img/cursor-select-acting.png b/img/cursor-select-acting.png index 28645a113..a1cce8a40 100644 Binary files a/img/cursor-select-acting.png and b/img/cursor-select-acting.png differ diff --git a/img/cursor-select-area.png b/img/cursor-select-area.png index 4baa9e5cc..453573777 100644 Binary files a/img/cursor-select-area.png and b/img/cursor-select-area.png differ diff --git a/img/cursor-select-line.png b/img/cursor-select-line.png index b2ea3de0e..fc95638b1 100644 Binary files a/img/cursor-select-line.png and b/img/cursor-select-line.png differ diff --git a/img/cursor-select-point.png b/img/cursor-select-point.png index 79567175a..1897721a1 100644 Binary files a/img/cursor-select-point.png and b/img/cursor-select-point.png differ diff --git a/img/cursor-select-split.png b/img/cursor-select-split.png index 64ba33422..b4c2295f7 100644 Binary files a/img/cursor-select-split.png and b/img/cursor-select-split.png differ diff --git a/img/cursor-select-vertex.png b/img/cursor-select-vertex.png index 3d98722fe..20e931c19 100644 Binary files a/img/cursor-select-vertex.png and b/img/cursor-select-vertex.png differ diff --git a/img/cursor-select-way.png b/img/cursor-select-way.png deleted file mode 100644 index ce6764fe4..000000000 Binary files a/img/cursor-select-way.png and /dev/null differ diff --git a/img/source/cursors.svg b/img/source/cursors.svg index c3185bedc..fd45ec9f9 100644 --- a/img/source/cursors.svg +++ b/img/source/cursors.svg @@ -14,7 +14,7 @@ height="1052.3622047" id="svg54747" version="1.1" - inkscape:version="0.48.2 r9819" + inkscape:version="0.48.1 r9760" sodipodi:docname="cursors.svg"> @@ -52,12 +52,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="-259.2782" - inkscape:cy="883.17646" + inkscape:zoom="22.027845" + inkscape:cx="-505.43098" + inkscape:cy="989.55409" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" inkscape:window-width="1337" inkscape:window-height="840" inkscape:window-x="337" @@ -89,7 +89,7 @@ image/svg+xml - + @@ -112,87 +112,462 @@ style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;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;filter:url(#filter8013-4);enable-background:accumulate" id="g55815" transform="translate(30,0)" /> - - - - - - - - - - - - - - - - - - - - - - + + inkscape:export-ydpi="90" + transform="translate(-577,20)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="g59526"> + id="g59528"> + id="g59530"> + id="g59532" /> + id="g59534"> + id="g59540"> + id="g59544"> - - - - - - - - - - - - - - - - - - - - - - - + transform="translate(-597,20)"> - + id="g59554"> - - - - - - - - - - - - - - - - - - - - - - - - + id="g59556" + transform="translate(-15,-4)" + style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;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;filter:url(#filter8013-4);enable-background:accumulate"> - - - - - - - - - - - - - - - - - - - - - - cursor-pointer.png - - cursor-drawconnect.png - - - - - - + id="g59558" + style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;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;filter:url(#filter8013-4);enable-background:accumulate"> + + + + + + style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;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;filter:url(#filter8013-4);enable-background:accumulate" + id="g59570" /> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + sodipodi:nodetypes="sscscscscccssscsccccssssscccscscscscs" /> + id="path59576" + transform="translate(30,0)" + d="m -118.15625,25.375 c -0.28125,0.04687 -0.84375,0.25 -0.84375,1 l 0,2 2,0 0,-2 c 0,-1 -1,-1 -1,-1 0,0 -0.0625,-0.01563 -0.15625,0 z m 3,2 c -0.28125,0.04687 -0.84375,0.249998 -0.84375,1 l 0,1 c 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 -0.5,-0.5 l 0,1 6,0 0,-1 0,-1 c 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 l 0,1 c 0,0 0.0131,0.5 -0.5,0.5 -0.50133,0 -0.5,-0.5 -0.5,-0.5 l 0,-1 c 0,-1 -1,-1 -1,-1 0,0 -0.0625,-0.01563 -0.15625,0 z m 4.15625,3 2,0 0,-1 c 0,-1 -1,-1 -1,-1 l -1,2 z" + style="color:#000000;fill:#d9d9d9;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" /> + + + inkscape:export-filename="/Users/saman/work_repos/iD/img/cursor-draw-finish.png" + id="g58348"> - - - - - - + id="g57303"> + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/Users/saman/work_repos/iD/img/handle.png" + sodipodi:nodetypes="ccccccccc" + inkscape:connector-curvature="0" + id="path49154" + d="m -60.5,75.362183 2,0 1.5,1.5 0,2 -1.5,1.5 -2,0 -1.5,-1.5 0,-2 z" + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80575544;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + transform="translate(-367,-1.000017)" + id="g5279"> - - - - - - - - - - + id="g5281" + style="stroke:#000000;stroke-opacity:1"> - - - + style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" + d="m -472.5,43.375 c -0.8137,0 -1.5,0.686297 -1.5,1.5 l 0,3.5 0,0.5 0,1.5 1.5,0 1.5,0 0,-1.5 0,-0.5 0,-3.5 c 0,-0.813703 -0.6863,-1.5 -1.5,-1.5 z m 1.5,7 0,1.5 0,1.5 1.5,0 1.5,0 2.5,0 c 0.8137,0 1.5,-0.686297 1.5,-1.5 0,-0.813703 -0.6863,-1.5 -1.5,-1.5 l -2.5,0 -1.5,0 -1.5,0 z m 0,3 -1.5,0 -1.5,0 0,1.5 0,0.5 0,3.5 c 0,0.813703 0.6863,1.5 1.5,1.5 0.8137,0 1.5,-0.686297 1.5,-1.5 l 0,-3.5 0,-0.5 0,-1.5 z m -3,0 0,-1.5 0,-1.5 -1.5,0 -0.5,0 -3.5,0 c -0.8137,0 -1.5,0.686297 -1.5,1.5 0,0.813703 0.6863,1.5 1.5,1.5 l 3.5,0 0.5,0 1.5,0 z" + transform="translate(407,1)" + id="path5283" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + sodipodi:nodetypes="sscccccccss" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + sodipodi:nodetypes="cccsssccccc" /> + + - - + inkscape:export-ydpi="90" + inkscape:export-filename="/Users/saman/work_repos/iD/img/cursor-select-point.png"> + - + transform="translate(-496,0.98719962)" + id="g58516"> - - - - + transform="translate(-42,-22)" + id="g58518"> - - - - - - - - - + y="73.362183" + x="-44" + height="10" + width="10" + id="rect58526" + style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" + rx="1" + ry="1" /> + + + + + + + + + + + + + + +