From 1736ef5de3f7a47f907326374470b2ac2cdaf26d Mon Sep 17 00:00:00 2001 From: saman bb Date: Wed, 6 Mar 2013 12:23:01 -0500 Subject: [PATCH] better cursors. --- css/app.css | 1 - img/cursor-select-acting.png | Bin 266 -> 329 bytes img/cursor-select-area.png | Bin 350 -> 428 bytes img/cursor-select-line.png | Bin 466 -> 551 bytes img/cursor-select-point.png | Bin 437 -> 545 bytes img/cursor-select-split.png | Bin 430 -> 499 bytes img/cursor-select-vertex.png | Bin 369 -> 474 bytes img/cursor-select-way.png | Bin 428 -> 0 bytes img/source/cursors.svg | 2365 ++++++++++------------------------ 9 files changed, 713 insertions(+), 1653 deletions(-) delete mode 100644 img/cursor-select-way.png 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 28645a113aa9d8d290655e9ec35a4129450b3ebe..a1cce8a40e4f2f51d723ecdbf8cdf0ab7333989f 100644 GIT binary patch delta 262 zcmV+h0r~!l0?7g)iBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur*Df5u5f zK~y-6?bFQ(0x=K;;5V|6``%K54WyQZ6ykO5!9xm24_d;ekA-v~49Gq&S@91vvf{-D zbNzUkFhUYbW(5Eu!ZL%1bRyDxES82O$&?bk_cX?g05$+xlBk&(98yZ0lXGU@_q5g? z0R#Z+TCnrp^FFG|7$co?6M%gUT-X?6#+>s5I;X7VCAcaJJgMp~gmBrdh};Z-?c1MH zTDI2OqpDUldivxmG{hJe1=r5GX)&;%2LJ@ne*y}>ae9C75B?ZD0|%DM-JB?!QUCw| M07*qoM6N<$f~;m~X8-^I delta 199 zcmX@f)WxLO8Q|y6%O%Cdz`(%k>ERLtq=i73gAGWAo$CvqsOVeY?&;zfV$u8d(n7(* z1_CY@_bOahc#(ZPc7;HA$%%-iJJs9cg@sYn--soea4=Ynjd=cJhzcg?(M zqq5bN!G%S0sq-bROr|f{`Wf9E3|VWR%$c~wJF04-<I0RWPUwIjJAIsG*;I+P?eO(W-=j4^uv_WH4L4Pu=tQ8}< zP66pzn&F@I|AAQBCTX#$nAFXR5>BgTIX#z>QOPs&0T02_O{{uD6$o6}N{afN(e|>G}x^A(+7&AP+ i9oPXUmQUma>^=bs%tx;+K;Z5G0000}4G+)GYKWQfKhpsKBI2?xh$ti?=gGv< zkeQj2Bw?i#yRLf);2nS?W=5N;e}ETBl5mwYO?ft(vG4mk05O19ZGoXuitDk~@^ZQ4 zUaxlp;9DD@C&OqBcjqIQMaM-^ zI6{bB5CrGd`IB}wilXD`box4u<1drRYq!&(_?t^2Fh>ZB+N=RUJ4 zjUPoyd75RJ5JK$oJb(W{Ja6+W2SIS|d0rNV;m=0}8W_IWY&LQ<8ohX|&lqz(9*?so cz*ejG7fVsF8!57AZ~y=R07*qoM6N<$f(=yMbN~PV delta 400 zcmV;B0dM}N1kwW`iBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJu2e@{t7 zK~y-6t&*Wm13?gmzrAotJ?!!X%T)W@o?rGyfV%{6|Cp#u$a18)MG?L<))|Nkvg8Ns={i1#~3Q zHg}+TQ52G-s;ZRdxquho@>tMWf088Ys;ab$vMiORsg42#*j1kA(%0cT{{rd&FJ)P_ z0szskpm2Gars-Y~a1Pu6Z=s(50JRzcX4cx3bFQ}5z5=tOLBI)c>%Ff5Ip=C%4a8B~ z|7MJdfa@&FF5)=Gd(U(_eU#LZv}vm(0w!6OJ$vuBgTY|l=-PqBJ`9J$W_$1bw%_kR z0TUoT1~jwQzAl%`dbL`q*XuRAxd##h>#$HQ7K<8~H1#(wTha!&8;{5D&N+=nqj%u6 u(TxM6b%7c15o))o*MtX$tdE1j#`pxTFL9@Z6ObbS0000?HV&DY zxhM+OTCh_<25`cfa(Bwf1PAGi&V;fC+VP3K4y8e;i#ib4Em2 z*i+Xv8DoY3Fq_SOB}u};v)BQ46$0zJromuvSyj~u0Q7pjKV@0ov``{KcjSM{7&EM@ z>ckjxYmB*V@?qE$1(Z@g@2f?P3;_Lp|I#`40RWUzzc-uBP0$CdqAD4x_U2o W^tNc37W&5k0000lQ;sKAr)3Z5VQp+ z=bYZjIVa#`p3RXlM*Un}*X(vX02Ye{p6B&zdG5Ix2}!D|N?{mwcET`JRaIRcc=32W zkhNBToO7)eS!)NNpD{x_nM?q#oyK$|Nl_Ga)}kmHH%d$U4aHuTH?hF0`vqRiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur*De{e}e zK~y-6t(475!%z@~zbS=)EA1{j7ees`QgG+WK0;|8L9t7hjqgw)4-oPS7B}vsc><{w zaZ$)lyRmRVIxf7aZTge6cwk^)=AL`z+#gX@{u31d5m6fh5ow7?b#F$iP*qivBvIe@ z)p49La0Ap-m0cnu93)Ai8PYV>e;^3db=@ft0;jtYwtU~$Jd80KMUi@*Hv{f>A*?!% zGfvZVg*1b;rI4^<4g5C7^ujQldn+PK0o;~86sxl4y6)5%Q>X|KKsJuN&=^Khw3QI3 z105UnBEnP8^JWEvop#(9wd2MJ=;Z6w-1yHT@*pA?TRb~FIzBkb@_cdSe?_Qjvy}N8 zQ24||qz*LKsj>C0O(#HKbj#-;zxU<39XGBP#$1cf_vvfgPI{Fhg#bF!S=pYg3a!eO zkuRUl1Ax1;$6%p#0`v<#RMjCcT-czSt1sP#QX}tzeLm93$J^ISmgkFw9t`0nAC_QUsyG7(7Z&;i-!_e198E1gUx9{?Uh1p84G9g3o8 zh*l`u(kj?18~E#*b8l^=l9P9d95i~LVKn0Es;X06M1;*J5!rr4Y8{azLkKj++yEQ_Y)E3MJLnWbAW7C*>Afd_3xM6H zpsg|HR%>NfN{QB5egtZ;qxYV?e;*$H2DAZiNhx*60l@eSo$v_Y@Ja=C*4kchjWKdg zF-8Ko%2bX-giA9fBKI7vp~aw53Y>Fr&Y_g@UNE_Z7Sb+NeGFJtU+w^KwWlraDCbO7 zrK&RL{MOO`+S)h_!z`fHjDO8&58#aXFLDO3{{@!csY67r#ybE2002ov22Mn-LSTaM CoP2`- diff --git a/img/cursor-select-way.png b/img/cursor-select-way.png deleted file mode 100644 index ce6764fe405f1b418249e43ff5496f08458d745a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&3=E8#o-U3d z7QJgHZR|SaAmVyngYooQmf%_UH+a2`f5QKXdD_ZLOKub;CT{29xb{=Tdie#8$(OR; zi}|^j?NWOew}Xe-IQ`!4&pj&toRt}pd-j+goAEPPC4QpHN*(Xk#0sXc11>_fcbm*o zBfTcgDfXJ=azHGCkM-Zvr>T-=^{7Q^jTtJoN=fI@D8 zU$i-9FtKj<{CW%XtFJ~PnX^tstv2yx6=`-nAW_hM*s)>FR;IE^=a_H0ADdzLLGJiR zZvmDorM~l?GrT_S@NLZ#<-X*%->Y@SxEc8>Skw5UcXM6)+pvdm@$UU)`ZpebT(KigwWv)x%s-}lDgFGUxhu^spj!5gu5|sw^S{{YKgS4F TDlwD;LzcnQ)z4*}Q$iB}Ib*4y 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" /> + + + + + + + + + + + + + + +