diff --git a/css/app.css b/css/app.css index 7c260d9db..d7d35fb00 100644 --- a/css/app.css +++ b/css/app.css @@ -405,16 +405,6 @@ button.Browse .label { border-bottom: 1px solid #ccc; } -.inspector-inner button { - position: absolute; - top: 0; - right: 0; -} - -.inspector-inner button.tag-help { - right: 30px; -} - .inspector-wrap a.permalink { text-decoration:none; margin-right:1em; @@ -453,6 +443,20 @@ button.Browse .label { border-right: 1px solid #ccc; } +.tag-row button { + position: absolute; + top: 0; + right: 0; +} + +.tag-row-empty button { + display: none; +} + +.tag-row button.tag-help { + right: 30px; +} + .inspector-buttons { border-top: 1px solid #ccc; } diff --git a/img/cursor-draw-connect.png b/img/cursor-draw-connect.png index 45e2052d9..f4ebd69f3 100644 Binary files a/img/cursor-draw-connect.png and b/img/cursor-draw-connect.png differ diff --git a/img/cursor-draw-finish.png b/img/cursor-draw-finish.png new file mode 100644 index 000000000..44ec4c929 Binary files /dev/null and b/img/cursor-draw-finish.png differ diff --git a/img/cursor-select-path.png b/img/cursor-select-path.png new file mode 100644 index 000000000..b2ea3de0e Binary files /dev/null and b/img/cursor-select-path.png differ diff --git a/img/source/cursors.svg b/img/source/cursors.svg index 914e89d4e..d34a38a85 100644 --- a/img/source/cursors.svg +++ b/img/source/cursors.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" @@ -26,8 +25,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="-92.003606" - inkscape:cy="924.48054" + inkscape:cx="339.14483" + inkscape:cy="1050.2033" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -37,7 +36,7 @@ inkscape:window-y="105" inkscape:window-maximized="0" inkscape:snap-bbox="true" - showguides="false" + showguides="true" inkscape:guide-bbox="true" inkscape:snap-nodes="true" inkscape:object-paths="true" @@ -45,14 +44,6 @@ - - @@ -70,13 +61,6 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> - + inkscape:export-ydpi="90" + transform="translate(0,-140)"> + style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" /> + d="M -85.15625,27.375 C -85.4375,27.421875 -86,27.624998 -86,28.375 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,-4 c 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 l 0,5 0,2 0,1 -1.5,-1.5 c -0.554688,-0.554688 -1.242341,-0.757012 -1.6875,-0.5 -0.435451,0.251408 -0.661558,0.895414 -0.3125,1.5 0.353553,0.612372 3.5,4.5 3.5,4.5 0.239676,0.415132 0.658877,0.607941 1.1875,0.75 0.09511,0.02556 0.177664,0.0743 0.28125,0.09375 0.257037,0.06287 0.567031,0.07046 0.875,0.09375 0.09849,0.0063 0.177945,0.02706 0.28125,0.03125 0.02248,10e-4 0.0397,-9.12e-4 0.0625,0 0.408742,0.01508 0.835216,0.03125 1.3125,0.03125 l 3,0 c 1.40324,0 1.950823,-1.420979 2.40625,-3 0.19368,-0.671514 0.59375,-3.328645 0.59375,-4 l 0,-2 c 0,-1 -1,-1 -1,-1 l -1,2 0,-1 0,-1 c 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 l 0,1 c 0,0 0.01305,0.5 -0.5,0.5 -0.501327,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" + style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;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" /> @@ -219,7 +204,7 @@ id="g56199"> - - - + + - - - - + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/Users/saman/work_repos/iD/img/cursor-draw-connect.png" + id="g58331"> - - - - - - - - - + + + + + + + + + + + + + + + + + inkscape:export-ydpi="90" + transform="translate(0,-2)"> + transform="translate(50,-140)"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + cursor-pointer.png + + cursor-drawconnect.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/source/design.svg b/img/source/design.svg index 66c195cc0..27ef8cd15 100644 --- a/img/source/design.svg +++ b/img/source/design.svg @@ -382,6 +382,43 @@ ry="0.5" /> + + + + + + + + + style="display:inline" /> - + Area - Commit @@ -1323,16 +1260,6 @@ id="rect5323" style="color:#000000;fill:#7092ff;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" /> - - - @@ -1343,13 +1270,26 @@ id="path5387" inkscape:connector-curvature="0" /> - + + + + + + Point - - + + + + Welcome to the iD editor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - handle selected - path selected - - - - - noselection - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + 24 + + + Changes + + + Added to an area + + + Moved a node + + Created a node + + + + Changes + + + + + + + + + + + + + + Added a point + + + + + + + + + + + + Moved an area + Added a point + + + + + + + + + + + + style="display:inline" + id="g48109" + transform="translate(-570,10)"> + transform="matrix(1.3812956,0,0,1.3812956,-281.33115,-136.73404)" + d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z" + sodipodi:ry="4.34375" + sodipodi:rx="4.34375" + sodipodi:cy="348.03125" + sodipodi:cx="318.78125" + id="path48051-0" + style="opacity:0.5;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" + sodipodi:type="arc" /> + + + + + + transform="matrix(1.1510778,0,0,1.1510778,-697.94204,-44.611059)" + d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z" + sodipodi:ry="4.34375" + sodipodi:rx="4.34375" + sodipodi:cy="348.03125" + sodipodi:cx="318.78125" + id="path48139" + style="opacity:0.5;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" + sodipodi:type="arc" /> +