From a7234ade1808a295ed72a883b96fd673692528b7 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Tue, 11 Dec 2012 14:10:43 -0500 Subject: [PATCH] subtle restyles across the board, styling to geocoder. --- css/app.css | 65 +++++----- img/source/design.svg | 43 +++++-- img/source/sprite.svg | 262 ++++++++++++++++++++------------------ img/sprite.png | Bin 10081 -> 10071 bytes js/id/id.js | 48 ++++--- js/id/ui/layerswitcher.js | 5 +- 6 files changed, 233 insertions(+), 190 deletions(-) diff --git a/css/app.css b/css/app.css index 9f9df3081..b4cb920dd 100644 --- a/css/app.css +++ b/css/app.css @@ -8,7 +8,7 @@ body { color:#222; } -#iD * { +* { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -45,7 +45,7 @@ a:visited, a { } a:hover { - color:#222222; + color:#222; } table th { @@ -53,13 +53,17 @@ table th { } input[type=text] { - font-size:12px; + width:150px; line-height:20px; - padding:1px 2px; + height:20px; + border:1px solid #ccc; + padding: 5px; + margin:0; + box-shadow: inset 0 0 3px 0 rgba(0,0,0,.25);; } input[type=text]:focus { - border-color:#222; + border-color:#aaa; } /* UI Lists @@ -99,7 +103,8 @@ a.selected { color: white; } -div.hide { +div.hide, +form.hide { display:none; } @@ -125,7 +130,7 @@ button:hover { } button.active:not([disabled]) { - background-color:#aaa; + background-color:#aaaaaa; color:#fff; } @@ -203,14 +208,6 @@ button.close { right: 10px; } -input[type=text] { - width:150px; - height:20px; - border:1px solid #ccc; - padding:5px; - margin:0; -} - button .label { margin-right: 3px; text-shadow: 0 1px 0 white; @@ -374,6 +371,19 @@ button.Browse .label { background-image: url(../img/sprite.png); } +.layerswitcher-control button {background-position: -110px -90px;} +.layerswitcher-control button.active {background-position: -110px -130px;} +.geocode-control button {background-position: -70px -90px;} +.geocode-control button.active {background-position: -70px -130px;} + +.map-overlay { + width: 150px; + position:absolute; + left:50px; + top:0; + display: block; +} + .content { background:#fff; border-radius: 4px; @@ -404,21 +414,6 @@ button.Browse .label { top:210px; } -.layerswitcher-control button { - background-position: -110px -90px; -} - -.layerswitcher-control button.active { - background-position: -110px -130px;; -} - -.layerswitcher-control .content { - width: 150px; - position:absolute; - left:50px; - top:0; -} - .opacity-options-wrapper { padding: 10px; } @@ -469,12 +464,12 @@ button.Browse .label { top:160px; } -.geocode-control button { - background-position: -70px -90px; -} - .geocode-control input { - display:none; + width: 138px; + height: 28px; + border: 1px solid #ccc; + margin: 5px; + line-height: 20px; } /* Map diff --git a/img/source/design.svg b/img/source/design.svg index 02f98f513..8dd737fbf 100644 --- a/img/source/design.svg +++ b/img/source/design.svg @@ -329,16 +329,16 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="315.10272" - inkscape:cy="734.82658" + inkscape:zoom="2" + inkscape:cx="57.428809" + inkscape:cy="875.20462" inkscape:document-units="px" - inkscape:current-layer="layer11" + inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1660" inkscape:window-height="971" - inkscape:window-x="981" - inkscape:window-y="59" + inkscape:window-x="396" + inkscape:window-y="0" inkscape:window-maximized="0" inkscape:snap-bbox="true" inkscape:snap-nodes="false" @@ -1393,9 +1393,9 @@ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7403" width="70.75" - height="125.75" + height="140.5" x="-128" - y="167.11218" /> + y="152.36218" /> + + Patterns + + id="g9662" + transform="translate(20,0)"> - - - - - - - - - - - - - - - - - @@ -469,7 +406,7 @@ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + id="g42138" + transform="translate(-1,0)"> - + style="fill:#ffffff;display:inline" + id="g14125" + inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + transform="translate(125,-192.36218)"> + + + + + - + transform="translate(125,-193.36218)" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png" + id="g5560-6" + style="display:inline"> + + + + + + - - - + id="g42120" + transform="translate(-1,0)"> + id="g14251" + transform="translate(-430,225.63782)" + style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline"> + style="fill:#ffffff;fill-opacity:1;display:inline" + transform="translate(-430,226.63782)" + id="g14185"> + + + + + transform="translate(125,-154.36218)" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png" + id="g14255" + style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline"> + + + + + + + + + + + + + + style="opacity:0.20000000000000001;color:#000000;fill:#222222;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" /> ?kb_CDNOWHz5cjg)75!z~?l0cM=hT<7<}q zTi^rVLmsY21YUteFOi^6?5b?!0lq(e{l<~!P4fkV44w*xp1LkJo<5fD){u{n55JwW zg9pOW)tcYM-8Sv7G$RDDLvYwrJ>T@LjG#d3(Ti<4TW|46i1@z*3y$`LN%{gBd)jZ$ zA1o}4kI}-Ka>WaBj6uSGBp)xF|02EGBpYr|ps=J*b8_(>^W_0n@EX~O9=sODRPdV9q?9sP*>n?|@ z1hWIhDHexpr6Ihjg+;>LGFC{NdVFkbY<9-Ly4Iw`E4U?uf%L28O~j@=#EuCeh0J$x z7SohpD8amf)<`ULTrs@NbxgOgk_Y>5MyI8+I3y zi{UjBbo>3oxY5joH>H{Z(GCeG%tv+7cNZ2Fnee-ma$rhPYX%tKCbM|#*5zAm$*le( z18DDT`VPksDFFdNW>^?5s^(r_HO~i9mNfBL29f2rLWqt>)YQ}?wA9p&e7wB16ONbo zzdl`@9SvVzoMksNj*2`tjs0D6IPLO*G-F>jkg*Fl9H1fVd&Kmd> zfk2Q_CXR0ebvVjG&#E0K%jHoyNKSYnpK)~&l#pOvco;W1W;0YE&#^yQrX%0TS|Y8H zE|&3=H<33w4QKiny{@-44g~|^s%^==x3su8Xz-<<+r5Vmdk8~i0uHBtN|G2mCFGv3 z)9&4TOBi17FEx^^ZtLsrb?)?t22Oar+9Xf3m1pfwdTc-a9(o3YCFKwFY5Ybx7joa_%ekPZoEqkg<``WaUyfTF$Csa_IeqSQ?+x$?j78$kOih^jrB4ZwlO zrT;;VW&+fh7Jws^khiY zsGe6lVZT~;e;8Gn@@+gAGdBEcfg^jmdiSnRHwg*JgWi45H*el>3GR?wyk(d@CC19=rL;qoV}>Nwb*qWVyB6TNnpR^o25~mG9g4NlBvB&CQqW3|i*q zA%YJcI227HFwPI060qNT4vaa*-GYKI6k(?03oz{*m_NUWuXJYR)7OLwE!#5c#yk?$FOHP6J~4j@^rid=vN7K{OYz(>Gy}cLO&z`llFy+46d1%(? zn>&k?AFc3Ho6>2s3VabUo1ioE<|sAIxqhu^e1o*ydjRv!z5oOEkL^pc*d zR$Mdv!G|ItnCf@z)y*GA7hKP+X6n5(ZEbDma-#NH&tJZ0Wj#P+U0PTkJTLOqpa?gH zl3&nj<#oy*iEPTfIhYTEbj{Q0R0 zd8Tkm2A>}X@2ffDh4ITwFLu34>YYueelg`zyAUx$7KsPB9&Sz&$Ce$@BepYS0=#jd zS`&T~k6uxx-!BFQpS0&uP~lt7${bDaDVx)}_sbkfa}a%(PNq&%t3)R$tS~%!HDKLx zI$HYS!CBkFKPKo>B&vivmNz<6eAYJ`8@tKm(kR3=nJxHWjiVOp+_2?pPQCjs>wGaj zZJd2p)In-zT*RLG^;i>9F-%|MUi$oPdUgk<$KVKPyXm>#cFY1 z>8V>xjAVw!iBEPwyjA!O#=#6}zg+F&zc!3c7J3wPy3fTu zmgetHJpZ3f*N;sYoGqJ2jC`L*hpJE;KN?t#n?uzF0)D&%RZ&zYv4Kb z*U6NOPgUW#zxFAM%RN{IHAvQVvq?sl^|oJcj*y4+Ll?O%(R4=g*oMu_l1NvHIrwkl zxV8mOhRb*tvY+y`^AgM?3t=12=n-8FN+oQY9;o=wS8eyi>!`Fd{2Sr}*F{rT3`dN% z9w1_Kb8=#(+!vJ}hh9w@EHOWJU;J-mWF+aE#Xkh&6S_a=Dco*I(IDaz7iJiK>G)af zu0gh@^V>TUarTPK-n=pal`yH=tJup8P$C%FL%caEnG~9t+>!h~o&Jv!T~+;*fD* z5I^I3AA4_3FejBp-1xC^Ae&8PKpcv~Z%@-PF*$!XoUa)|;gnNy7)-=o5qa?I{hrd+ zJ?nH}m#=^S{+$IW!xfnhS47m`AAX2eXx3mjS%1Xs$Stqa_pR3H<#+80><-xvf~u;j z(v49;swjM54oU7%pP2!nYfq}^Mm`LtDRVGV9vvOM#C<*-UBP72Zv5iKi=mN`efUEu zQc}`LG3V*poEuGwmmP1J(2pKHVve?M`22b8-O$hwinH>Q(|C#L1JUK)MOD)(dwnAb zX4(9gHzV6to)^E+CuA4JVZ*#q$fq^NZT7RON+HyA!S?A%G3c9=xK2A|%Yz71aot*Lzn+-Q$=cd_93S^Tfht)7a0Dr;1a8rZRbY=^wL6Jsi#D=P@>MoGO8B@O+erGbfC`y#NI zKV^Xq&d##I?KB2z5rNrnq6XAGWoVc__gUi=(WNiTKccjv{WocwWlfcs!+E}%9iMmK zZC8wvQdC^L1)F_yU&GOq4EfwqMNn5$pI#o;fLM&mRNnnJFpz0O|5>Js+Pixx)vh%8 zHW}V(3ik{w{|;ptsmV7=F9vZQ`9}F6jzr}zsDEWYS<@o>cusAk4<`_N?=OH2mU3+d zy8rm#`0YO=Gptfnk+ovWhFhj%Do^!}t!qLI%aba~;7WG~8p=UK-5=%yO@EjTHn_Ft?>U;zMCk688KF5q?;A+x9%z}Gt=w|j7_K`&oWfn3a3>X%0I15SArfs!@WAatd<@Q z7y7V$;4h-|mT}bjYHc`Qq~)k-dubRlyAc=jA_%y6Xq5Rqnb`NH58*n3&zC`_7NSf^ z?Fy6TOa(sS1z(+n^j&1#7dwrnW}Oy06Du%DYOdZwW=7mtQd6p<^1#QwBVtWv+aj+C zN$)#5JD2Dmrljx+{c*wd+8oo^;f}WAV@Uo-EF>GSXdAztH>pka1x1*A&oR+V5ssQd zuAbSjjIknTk?Ibm7>w1*SIf4)T9LqgGE@R_9pX*~QiyfYTvxRWQ#w~f>&3S*H)4i! zC^Jqa2YX;qPX|yF#0&vqTq{Y`)MMBA)?~aJWYnGJ0YSaoSf=4&Up{WL z_)4lLxp0ppL0^-GlyRZ8`N1g`qW(vNBMN6XY{?&KGOPYLd=iug?=f$o=RA$+WGfpG zky9;j0e*2E4Kdz#C-`vapvsq^gOflqNE5HNYs>p6g*{M~4ab+PmCw0GD$(c1!9Cfm zZGOnLVJ7VqOLtI5LH?!hU9wF2HORX`9b4w!Zg)`Kzj9Y0)TW@Yu>RY|LG!}i31gtF zd2#;=_Vn^>+kCoP((|>@b2CFjZV}FG94XVOTlflAY1UUWi=<<*4^FxFJ5b3`r``8%n;eEctG-S zpr7$<m_-Bzu~&3m`NiXTR7pFfJ;A5EshTx-{7Of|Mmz~tAgj=sLAT*O3Z-|M}~{*|*x?3V0gn!D`z zzcxpXDRRiRFWm^wQ!IzFx3~9K!`$;DPP04AWG$ieR(KFc>UVnV%7OoF#%5lglyCp8 zgzL`jY_`_5O-*GcY$}S;oWziz=c<^6isg&C<>TYT8Vf#?(ObAUtU^DS!?<|Tblat76Ffe@ZW06Fm`E*D9>g$ z-_C?PT9}j+@$>PK(wPSeZF);t3?%I0m=!y& zEG>COm6n!nQ?bRX3N%rJOr8=wP(yyvu| zA2=E6ArWYFE!EBhJns&Q^CAQ3Uga(WKZamUw_(1@2Ns!TLu4{b+lAgFI8(_uqV1U0vN^ zP4SdtwRx&f!-E%PG_vRg@>Z=n;z3lnQiQz@W`{QqAid@iP9rLK@0%wU_)={NpM|ZKeq)Q({(D zmQ6*_a38P(Ca95oKFE&=NXcjj1AG>?T`4cVUzbtS#3x zXk2ieSZ$h_8CpAMw>bW{;96(mLLBBQ3bk#Bzb1~ndIs}`l-1Q00AGI%U7AY=V0cS- zFj-7VsxUb^g~5^dTb{7|0j9EhaynC*57xwT^y*zJ+7#|8#xeUHPS<&S0$g_r2Qm*j z82t@!6&nH6Fw<-ZN2jE$X^wbP{TQRG6z&KXvgt|AXCaI9&Kr82*%WV_A@{2@@ve~l zNWls;9oDx}K#$3EdT!1Z^zYjZUHqrDig2HWH*}fh*sUvUri#XQ`+*lRP>FMb)L1kt(m*(bjO)lvzEiRrb85?6G z!1C9t{#YH%mI5%LgkZq3BcZ&2)Uzb!pxSnL;=y>|E1`~&4c8?>q4X#(pV$7$&WAtw zcz9M^RaLw3+YOo+YVfyF|2jp=22-9KOl77-p_*Zuj)e|$&J}39lQMur7At+J-3rss#=VW1;j zw$qtEaoHb?@%}e5KCTq-HY_Ymw=IH{3D0BPxxQeV8mDJ27xS^wG<~wOpx#bwsf+&K0%FVxxbJ z_dy^XXIXOriG^o?w-`cO0!h&%s8 zMdjBzQ0^=JRReR{;dyH-fPp4CL|V*WL}r(FhnA&VH}Bo zS9-A>q2pIXY$Dz-rE12J{pony9rjQR=&JhK+B=`;wq1$~3Xb)t+e1F-hGUmJKm2j8 zEAgx|k#ZEnYC|>l?S#;7v#}HCpu4Mpu54=8l)oZ=&d3k%Z0jVMcJ^^S`a46Xks*0t z1wG5t$nf9!JJTTG*)a1IqU&6H7>OjK7_5SlqZVV4C0v-`t+)M3wezU(8D{~U&|Fn? z9yCF2abHsN?`P<+`z(8{XgL>c_8q9|t;uDx^oV331fiM#8W)N5nX~0GBY!H8_|s0j z&NYMqU9=FS_dLG1yns|ZQF_rBiS{*5Z)O?)5xcSg$dxN}3DgY6bTwt#&4Lc}!{tBm z6Ela!lg~^gX>G*Ds?fx;irl=QW?dM;lQz)`DPM5#)iPSMH0v>)&G;s58Y_*fta<>JB}zb=BWG|$@R_LBHz(&IkfDytu7Dv-Q4cykwo+yx+ER+?DlJgad|GvF0MUMeIuD zaeR_*!h8bN*m3Rb#sPmb(2ZZKtE=Brlr@r}_Ngj7Oz%w-$6i16 zoA|i5pmYtM3n0ka)XaDra|#H!oMrgTp3F7}oy~#@hs>+otQD!iAx^)SIL8G*F9;KL z7(3r6u9>xWu(M-GNlNkx1PHh7ZldxxU<$b!E}vKRe(o4rS}uqPw4CoMY;A4r`D{)k z5<(TW{mz=IssYQ_i@XUC?H*1n!Lg90n2Bo_*K7v*o^AW{^}TBoc6HXw7d_->-Y zmV6NrY!6Opf)a-a1XbAdx{Ha4&Em}CcF^Z(X2nVUt;KV$Nn_jN{7!%lEQffHbm{?E zu@DbshPo>;6<^h>x^by*zNvq|EwuR*{T`0pvBT(I<8Hn~hz&<3lhmw*)OwmWSo?(4RgXj@2w zM_(qhKW5wcxRIk7@|JNI@;s@5LP??H7J^d>k+46UY~;uB6FyY`!;y}AyZ@iZUMq2p z?{NH%WV}`dNEo_>>q^#Y1Z7cb^O~7Gu#C-x=->3+_>P-F9(ut;NpRNxWsj|mHBRV5 zKYiMF`tI!jpXM3Cj)*=GDE!scd$WKaRKICkm;u&>wYRswe1zzTU5hRIgxC7>X>1t= zlp%s`yu1!lwRkHZ0CrPYQex%-DiZxKV`+ps2oGwqR`?YA<&RDRHE&aPWnEl49{$G& zNw5a(4-&Aju$U*3T_0smSF=eViPNr@Pf+kz-<{vWEpu1qiOQS>2SPyn0`48cXVzGI ztCbwOwYBXnGZ&Tuvp=0#_>XZJn6@@oHIOe8|EMf(j|>j(j5hl1aUVv8Y>X8f8-fBx zD3ViHv9PpM?yK`m{hN!Kk`-gYy#fy}+{^kx`fKMr0p-RX(l_$k63lU5DtA6x{d9KW$-}A)lLlCPVFHwVaE@xQJuej-6w=1+uX9u8q3Y$9$x={;FlIoA;|(;&NGrpP%>%ZoT1(m;~8iJR4N*OjXFyKnmiVvm0z#HPe))YB73X6*`bmb};kgMvsLVX!hN9`bzjM351 zsN=EYQp7|@=WStYTrTQ7R+_b{uxS^I8-7fcQqu3~GlO0IKb|JjM8PyDy`r5#88HS& zZ4zjMRtkNNz**dCe#ChHtG3iqnhyQ%wI#z?A)9v1x<%0*L&7y(F05-M@dI z8;+`sLQd&9SAoW7APAw_7LqGLeJ}vXqTOf$6mt)!&hR!_2#Gu`Wibzj0HrA9pfg8( z8j|(7_)9rt91{7$*jNr*_ci+{AkqJcxR8{#H?P37t(8hlHb$sF2%v&v5bP299#361AF z+>rV&<;`|ds;0*FzmFl3R8Xp{P+tG47Am#@(KMS7tIE_&?)@|IzOM zZ&~O6eZ*$>fqZm_ zDD0~mMfjOgJnI&-q-O!2Ow(S{2p=EcD`)4pbZI|fcKDDz95vRLDPtUM(0aIqC4jm& zz0cV8_VzLW$iEGU1`Y&*;44SR_v`EHxC^enG@(@<%RNyJn$!w+09iA-=4EXDt9Mqw z9lfEvs|Z1ijEt_E6GC?F(KP>obXc;!x@x#_boOToOe`m69#jwROl%$23=a?U#Inf+ zBZt>UdZ~%Vz#fV>mI9Ia3GNQQ%jl-554sa3~I6-d*t10 z9W8_LL}LVBb|%!Qs;b7I`HVk|QI==R5aB<|*tti>&PSl^6<+4OHFZd5=KHCzs_MX= zU$XDXr*6@7cA{<&5_r^7AK8JQ4reD)hQt2@jo~$zipov=r(ivQ`M_@!x?y`sKi+>Xbltv^HGETQyk*$@JF^n7%io|N6h!j?xY&_IwmEN!&VUCNv*{h64~KVs z1hbgf@)qnE7#a$*5F`Sn7Wh+te@P_Kf-60MCj~`C(sX2zF;(N97+zXyTU!Gb30I4O z@nUaj(;bQXnZEd_k*Yl^e4LuOI_jF~W~ePP+-+3fAmePeTOj5{l*N{vVrzjOVGRP2 z_k9`Thh;dSGtTjcp4WWxZC6^UUMjner!a81p~ za>tJgI@V%36yd9aI`M!TRPn5=*$7Y&nMhjw0M^x77XO9xLh8^>H0+MW46HY|DZ*SL7;`&A0w?YSe;Fa1dNU16Cq$5%#|T@jP_j literal 10081 zcmdsdbyO75`}Zu3Al)4T(xo&kC`w49fV7l!cPof)^NDA|)l}pjKcadB0Kj7fd07qcI1lcBu`s~TPqfjv z-~r9$g~D4baP!473j^EOj`Hta!1Jg6?T{BwQ#`>=O4nC9u9^-Ot{xwp%>fS&4<0Lf z8yC|Lj^;cL&L2|_B&Yy@0Z@>YdFz>qNDFW!nOJyO@(3^&UMH7j#-?~F^el+ziA+ly zDq#Usm++XKtSZNn`-Vh0lT@TT+al1~4=p-o+Q0J!T!WrFHCs(jrVu|+!`e|;I_8R5 zAzXsWpMt@LVaCj3>-5g_fbezP}qO!8GG71u0>huGE@`AFv z@TVd>Iey3d<;y)dGvT-*-`@q9i2h7`w`z~#-vy(FRH9rB8@KF|e_uW|M7$Eg-N0X> z)S18f7>^ozr%C*=c-7!U@5$riH9HiGOJ7Wr)qBRYTI(JM{zGACcc&+XlAYo>fK!lfip> zxkqYNeln!INbLiJP=x>vw7W@`)J@x%T)3H<`K`lT8&s;F;;=6H)E z(SybZ*ksugunw9hd_WEWC94Ma0s_Us3n+Xtx;4c_Ck5kDd?JRvB=2S~*~%@NF&4lQoPY=^gds>T=a1eHSGt0 ze_yV{iP=>6yY6LW)2Iw$W}D~jYnb)b1mFthFHcBySUAhHN{2=^sO;afkU>1v*rTzu zh}*yClKwrglgv%19kp$d0z@21ns1Q&#dU7qZrt72j@~X{OH7RUVzVwQ%hYlSpD-Vb~7|ntp-?A^rgqHiZ{;^d||Har5vPGWlIz`!J@Apo3+T*m>5^9Z~ zi9_G2Cr*^JEYIK_UvdlM{1E3Z|8oi)m07g#wtN>r7oF6cy9i&~H(=#Lo7g?gwHDZneAE-vV1tdxIYp3awzN&t+{Q+6Fsj_oO ziFkKN`)L2o{e-9aLW<|B^oJIN&h5%^X0tlJqb?EI?Ucm+eS5=?qnQWv$;PYcjoXEZ ze~;f6j;({gjPd+|h`79Ifmo->jmU9sz0a$U12yAX8x?vjg*V5glWCzE(X}DXNb%eE z`ebLVD-s!dmKK(78ga*&+<10&c3ZRPz1JBZAOA<*Tth?S1Zd>AS`! zBtSl7#gWH^5BxN-X(1HI(bvNM;#Qm8)!147o-46=Dy;pva4babt(c8D=PwW0w2%?~)AT8~nb8^3@5p7GJb zVlhXHM^NxI?_aYhf!GNgZHWezz=eh_S6jZl>){F*1n)YA5>mQWQa)=QP5NR80&fF? ze*4Ke(g4NSPvd$?r$;D?5F%kEytS4BtH{fRAnu;~`(3?jHvd-Xw7`{&bi%$}e#-)aJ$ZP{`UT z&!xLAMW#vI5fv=NC4VKPso3n`*&kzo>_zspY*1tIQ!zOclht7Q`=e0KoO6@RbzUde z=N9|!4W?721`9#54ep3!M*JM#IV?i`V>BAXSH;qSt}&M;oMw&mPTctb9I80m>7SjG zzrVEHW)O-{nYQi z%R174%7HQYQw!YbT0uNXy={qk6P6LHw9q)LBrg0C&ag@PnpJF(*{cLk+HR6f?7;MS zW#$BKOc)rP%WhfUr4@{_o(R2v_FL~v!*10llTZp@dqTUB2KEJMu{MC6jcP=JdXR?B z(cjGkxWOrYi3jFKJ>aOKNK1T5gf9$0p2~fhF(GB7&6DZ&#rvGu#t)skmbEyi$ql4Mn7m=L0t%MPw}-l=>MzJw55ib{n>Xs}>V)i6lmh0NPOIW!&*;hT3pr(T;%OSBp6KclN+NDz!op|> zZDkc-GkHgb`O~bq%PegRz$X`oeIyH2n<7&=m^co8W^}GzD0XDit|oZ<_|i~SPiVaE zJ05Plqfqa#vBw;5*mu}iXAT`Rk|m}IZ4Vc`#V??VigIjq5)o@dp9( zqCH|NY4WwvQ>Cz{_cdxA2XF9rGH^zQwi190x*7nXpPpJ^p2T{sYko&E~1jx`ufpEWKvSnD`jP6A6fDnfqtcb-vk5& zzXB9%R@BlTio3Pv|3fTZzI!);0qjT?2+Nfia+}8whFBJ)u{qgjKaP5_sa<1U5{2?N zU@cNOUCi&s)lFMF5jmRs#_0L;=ZN>e&3f(tfz|4lu%xiVLkswY5EnxNP>zwZ48-<$(&Tq&v_~uJs#Ef7_iT_)&_3i|ZC2`0iP` z62tiNvr(<%PoD2fKmiIXb)FXZ0k=L?5}W|LwCZr^Im* z#mugb#gMDwkrO9qr>3G>d^h{DdFjv#iKyv===d}W!n_7kMQaEM?+!eg^_r~4@<^#} zamYUkSAOwm4MOiMDJjW#^?Ph|)Hx?B%ft%bJ2LglmoK^8+}v_ZGxm0Nceek|a@#EN8=Wa@O6WyHDL}Rq3L) z_P%}lHfKt4@)=8($N&v)MWk?5@QVGsdZCi_T`N0oVLf-ze(}y~=T{?n^hU!&8Kz`e z*|-jKCZ=CyWlQsGX;{Q53|QS^+lrBMnD|F4Lsq6c7#!d7+cU;q&-nkMUB;Cm(9a1h z(W{Zl>4d^lIZPTGsghC4=|r8^pC>8f6K?#nZO>Cm5|}}_PsyDOfS;;K0_Fl8)ZEW< z?6dX?r{&#wiZYv*+jwM68BNfQe2-sI5n^k!MnmtfEZ9}`S(%t>=I%a3yJvcs;D|D; zn8bbieixtngvlG)Ce%u-KtuOy7Ki%v=L|EV!>{MoR%Kz3(2c&trPWKMI7_yFv(b5u zimGaJbzPn4RXb()=H}+7ot>R2Yuk4FEF5Ms_~WOoA^q*KZ52G;Z`|G8^BJ%ZqnCcj zi%7GGT)r-i3&fnThOUD^l8JvhlWD)i$HCMTqky~fhs4y>)Hky9f?XC_8T4>q851zn z{_7%-bMlb+in%!T<N;dDwtR)9p#0y()xYO4OvB`Qx(Wn5_5YE1I1n z@5aL?Po8iAFmxO;u4c!THUcM6Pk@W8kKTk|OuCbG<<;^CW*ml}9hkvg>9(9gPpf$RJp$kn_K=Tx!!Ik(*T@t$eHXtMVrU zR$`cCu~uk1zN|wBnZ3hS`i%$cl2(&Wy8A(4fLw3%he3YKN3ncf2CLC2zqqfXGe;#D zz4=6yLDpl$W{n+RkmG0~&d4ms{L(i{-PPGBUdr^MBA}wRZUH&sQ|<{(XMx zHxV;K>3R0TyeR{lY-_^Ck3;yiUdWEV5l2H?6ec)5J;J9E;oEHqM6Fw$GBm0Pzj%HA z3`+CZ!8Uw{5J$~RzhP3iBX|X?Mw}qsil~}*fesEUXN&4I@nMh{dy;3=jMZ`T^)Eeq zSP=TP(18xlaCshOI324YB6-d>D`mw_Jix}{-LRCbp{hb9+9*0K@py1OvrhyA23?V2 z|Cy3;ONawv#t}5r`5$O>uWVzH(}ZR->pT7jNzQ5eH=IlM`X0$5>z81CJEF;1@hbUa z5CBvtu7APA3twbd#5TeMWGfXNj0|`ZDO<>ZOL9`u^CSj+9&*Mbhd@j)dzpC2>1V7u z*U_QEK%LlofAPwnNA_je=@S$DEszMVLeNc%^__K__MPkGi89Hot*sB-#nKw|d9=Uw zZCE>kqEf6s7#|;>Z>7*1qR=za)O3+6CVhjT{f8}2D#N(HJ2$eJ;IoC7 z6cmJ6z1J!#$jh@3B$O%LELh0rIOs}e{iqf#mLl}mwcpU-v3t|vqRY}#!bqjcss`3%uYV1g$UQ-kF zg+?f4poWx$q~o^vMM%9Og=uT^8!JRE^kzGo8W*D-3eo9&M<+vIUw_<19c@{nCzcOv z7_$B8);KMxt4mTz6U)_gu&`kL{rmTguV?8_U3_CMIB0b=I3(~>Mdya|T}45`wwc4O zsPENLf@~!|FqkfhFu0CnxdvsUr8#WdI;2FVA}RV0$E+IpX!2kE~fjNi|hu*JTu)q^^knt*7!( zL4SXL@DqYAow~6dT*Ic|ugZP!f!6G?|603ABV<+mL*Sdqf zy^nev?CtS-qPuFH)`o|NVHXz{1sfg2g^F)f!BF~Ih3i2?OdOk-n6IToDnpP?hW6np zK!J-9LBYQoFj4(4P>9f0B$;}#hO%2+3>S-vic$pJ_jM)$azC1zm!PQ8@rYTy=U}7b zkty9SRY+F@{RTBe+P(rTKZUa+U-{K@EhMuru<_`lD`rxRjsOV?_(nP)< zbQ__RDVrH#uR3rN34Dmy+1dXN4MA;%Qphdgl;O;BQR`SiM>spkqm_0)p%lc&k?NTy zzlM>uV_R~xm3nz|G@05#u(1Sos(+%60u}DNlj?8Xk6{FG(Pz`tYQb2gY~(%G>+9>& z5nX)SQd{${$ zo_-`L{ffn>n_A4*^_ zOd~1uU{H-TOKF& zU3`NU+&Y05L9*ZxIouG66${GA;4{abo*qcqDm4>AUR5=~h^Tz&kba1w$Rgq$^6vf^ zFs{<&x1BDxSGD}o1(2o$lee_RGRrj$Cnkhlkc09KHoT{%?urLs#Pw9Z*Ud;y{_^u> z=soT%Jrl|3-e<<4v0DxM{IMNNJ39nfteu@*8sVY(kMv+H9%kk>%bcJ_Mi!Qh9q^7f zq_lh#F)1l?md~g>Ea5DV!_j2^BjoT6bG<uhkiVXu01kceRC#y!mPmYhlOax;r;u z>e>uImnlbO4E)yIVIrLV^c6Gnt(xy17NrL0lyNJos4UJ+PLdsZTMGyX_&e>4=04sU z%E0gWJ2-eyIb-XAvOR7hpFEC%a%$3um}%Qj2$id(Fg@|Ab+)7!l&x=&ky4tvS^FLv z>r`1%V)tjgNTY+htKkWa$rB+8?D!#s6?Xg?i=s)K0n+`eA>O)pdOTLNhSvEzUd+tZ zWSdeim+j%7t)!x&qVehJO<2+fT%YIdFE#CJkP1LpH=jo3r`7!kc0Q*4)a5lRz(0O1!oyHlGD?Wc!-@qs;N(l-Pc@>qY=e?VjHa474w_TF> z*Yu5+m~t*IF6C2y2L>c1LBLTTc1Pre-Kr2uBMmr+H0EA~zsB&JtX~3=b0qQdPj9%Z zjrQNbFj@SUm9Nq4_x-dDLj;_HE zkc9RTLLL!3Il0ZeG4)2wTH7@WVB(?KBa+>K7bJ ztw$a-xZGb41w{GXUvK$=aNYwZlHwjSs<|ae0~M7)itLdq5m*S&|6#@u(7W@0sL#vG zQ$4%1cWg%|XWMs2dIRQQ$ja&SOgRRhJ6|q%(1Th!HYKIOZzx^z@+>sk%gaj>Qp}Jg z3XDgw@OLdjj(lIfY=_<~HU!{%4nOf%LWO~h$ri1n8oy-#D|K4<;Vd62`3S(q#`b{7 zAL3(%Zv%u2*lr-!)31q#Tejc^VxsCh9y8Mec_1^ug}_Ns3y4mCSqvn*p#r|w8;KTx z>iMUD>1sP_i=p(#UE}9n6z%&n6>z&bAzBIKCF2uCcAS`}O!S6dw&~>6Pt_rfzPGs2 z>TYh&Syj{LOPWTq<;YQ6u8!9raN+S3kic0{3)}0D3=i{t9LrO-?T(@a1qGvdzlGpI z{T`3R+3?Hw#KcQH*cP&Vs#VbwpS&-8KJMh$IP(T9vw)BS=pW1k5yYYbdCDmmfS1@c zNzj5l@6fHlaP?49^xBea;~T=VzzmsH7wBS+uPdWF8L?aMy87p zti=$CU0-cMAH3!&hNQ$F_R5;0bPs%%kc;Uc;khQ0^nGNiYGAOiA4x520@`{<$UDH1 zu7$qiHUprrct+&}`UPt%q4ZtTaMK5jWuLp{z06=$oQ}k^)2*SYyG`Ndo-5?i!{X%l zxEXjYCJqh`H3-@M<#uz`Mds#i&G!Q!N*@deFG*N|j&NM_&2G_k^TXX?yn_{d zpU+6ZAd0r^2T+3d(%~UbOSju~uG>z~Hf+VD_XU_xO!v>qKeQXp)Vbti0-J+rHXtLo zHDRI}q-ZaGUs3LPY(hdxdb~!*3nl>FW`D_z&CSu9^F4(UF4g33%*D#IVv~{yVeXSt zQ#hR3r8&2^zKp`ciRH}z)WZ3^%aFQ^3gnk%6%-XA&%vbek-tj=6BZpF0l)P+-CR)D(?fEWO*PEz zogb8zl-y1H@j5*)j@S_FB0|m$$%KF2`q{U0`LP0j9j)bd^bN1%=*)~)6v_7fzQpCf zCQ8e^>U}OsZ4<~@bKvmfGXLgg&Uv}!rKO4K>8mMF;1B^*sPc$IcUmQdH;kfp2S?H> zIOII3Pl@$N2}!?tb*_5sf;X!HJ&f?Xm8E*Oz3=rHQ&RAY!CIg~K+T@9 zqV6I$18>U`Fvweka-9~ynXxqv0n#0C3HYFSqsYwO*-kLg~UtTF_XOnm0YkqlTi8D5)7DH@uZ z!h|CwAnA$(XY$WHeG{H;8_BlXRp-~w+4TM_7{$?sWi>%z1-ZE!Sg>OPA2GlR=&Gr# zq+w*TwzRx*gH}?9Sw@dPMIaFQ7oZ6#1%(E%0^)#=zyE!Iqt9ijgM$N<#im*EZhbEk zEIIe=c!XklDqbS*^21TGii(T5Q2DaKf2|S`HQ@-{w0jYV$*u_iG%gO8jFe;@2x6nd zz;NsHyS+NL>yD;hnw*%}ATu~49HB;D9`a(u2mrHg!%w(F*3TN+mx7)t6QFtF{|xKf zn9Zu$o-8$JFx#6fQT;KnsgNRMm;40l1q-3Uw>mckg5X}z*i;rs8HlU4U%2U*t+KhU zl%|RM{=)fYVZ}i~kuB?7cKu0~7L#{I7#&;I)<)zEeik!R7AQ{r;b30e0tH__^kUld zjzf?M05C@Xy$i4gh7Rw)o!)03ehl);F^|K=yW7sMXI;f@Wdl((m z(wG}H!!6muiI+g@bYr>o6R+wIz7-@ftJ2kd>nBX33r`8|ESn%5_g%oULME^%2DPSyIWjHPLkYd!M@In8_-j!HUW5OcC4^XrBKrbM{ zT~%WG>e4XhuQ&l~eeB&4O;fwhI_tZZzk!0hbovU|fFC=1T8g34bL z1XqEePnz|v+z;uF3fo|f+u2D?rP&+)`SLNy+W^?)q?UfIql~4s^$D2!CVXWXl6!2MnW5XB`nkJi1|9fB{PA#e}uHdx~k1g zpw&#HspIt8_Xzy+l(_1K-aGYdosxzajoB?VNrLB2kdTwJ&Dsiq!{zH5o}Bz#TFL{! zI!$Dpodv?Mq%!b9nO*?CbppPW5VA7m+Q$)_@hvPlpFXq0Wr=Tp8vjofJyrlYwrR`4 zSYSgQ>JEGGgq{vk81Zy{$~84mnoqHZg0p9Euv)id(s+mryKt&Pw**wZ)dF3LBwrFh zYedIR2=v}iDNHS`tOC2&0vWIf&>(ctm|)?>IHJ{u2*v>Ts3Jk_`DwHW9)<-P0bmmVoKoyBiY+(>>rp;OmA3E+%<5H#p_q%+!-_eL z%aav)pm=f~K|!a;yR{t49M?!vx0i4waDH;EKJj%ajL3g#C7^lDF)}ehTFGWVHjoZ3 z7Zx@FS1(?pidSnLh0=U1qOmf`Ld%Xf)KbR-E8FsFj<2(ib@cS8VbW)6j|(G2Xe9E~ z)^%)bY|4u}iS9Xe`gFLyXG;DXR{v|U$w`&+AE+bp&tIEk94HAgI}~7+N!bH^5C` z`(1k5s5QRdA~RwD=QRY{K+2Mm*r|8)c|JE?Uh|Qx; zLlE3fTwPtI3D5`#OKVpj$*Zfe_j+}bYQw@9uu#Or#D>Sm*CE3L=?u$N!caa>aGk)j zQGN!nj3|tun98BEwk+MYEE5JFT!^IJw`@C#0Kk-?529{J3fX_?-jENvg>6hB2b89* z=?VmBo{fvf4sSu<7i0^;FOR$Fk-Ua~M8M)-tcBHI%PQU2`1oM3 zWY}T?Z#lf|L%3B|Rh6Ve1N?=3YLvU`JfOi#V-?wB+XHWl0^iWW@^Q*_Vf<6T zS9{F+H4Fwx^s7D@*JnZ%6TA{%?Ej6A;mJKOR@-cKb+u?H9_^#W*<2EX_@!AEu_u9+#8klBJui+Q%Yqodo93W} yP>-z=^dJeAjG=^}9ef=QPGukvr#Jm diff --git a/js/id/id.js b/js/id/id.js index 2970588ad..623ad381a 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -123,27 +123,37 @@ window.iD = function(container) { .on('click', function(d) { return d[2](); }); var gc = this.append('div').attr('class', 'geocode-control map-control'); - gc.append('button').text('geocode').attr('class','narrow'); - gc - .on('mouseover', function() { - d3.select('.geocode-control input').style('display', 'inline-block'); - }) - .on('mouseout', function() { - d3.select('.geocode-control input').style('display', 'none'); - }); - gc.append('input') - .attr({ - type: 'text', - placeholder: 'find a place' - }) - .on('keydown', function () { - if (d3.event.keyCode !== 13) return; - d3.event.preventDefault(); - d3.json('http://api.tiles.mapbox.com/v3/mapbox/geocode/' + - encodeURIComponent(this.value) + '.json', function(err, resp) { - map.center([resp.results[0][0].lon, resp.results[0][0].lat]); + gc.append('button').text('geocode').attr('class','narrow') + .on('click', function() { + d3.select(this) + .classed('active', function() { + if ( !gcForm.classed('hide')) { + return false; + } else { + return true; + } + }) + gcForm.classed('hide', function() { + return !gcForm.classed('hide'); }); + }); + var gcForm = gc.append('form') + gcForm.attr('class','content map-overlay hide') + .append('input') + .attr ('autofocus','autofocus') + .attr({ + type: 'text', + placeholder: 'find a place' + }) + .on('keydown', function () { + if (d3.event.keyCode !== 13) return; + d3.event.preventDefault(); + d3.json('http://api.tiles.mapbox.com/v3/mapbox/geocode/' + + encodeURIComponent(this.value) + '.json', function(err, resp) { + map.center([resp.results[0][0].lon, resp.results[0][0].lat]); + }); + }); this.append('div').attr('class', 'map-control layerswitcher-control') .call(iD.layerswitcher(map)); diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js index 509a3fb51..b0e2f98ab 100644 --- a/js/id/ui/layerswitcher.js +++ b/js/id/ui/layerswitcher.js @@ -3,7 +3,7 @@ iD.layerswitcher = function(map) { sources = [{ name: 'Bing', source: iD.BackgroundSource.Bing, - description: 'High quality satellite imagery.' + description: 'Satellite imagery.' }, { name: 'TIGER 2012', source: iD.BackgroundSource.Tiger2012, @@ -44,7 +44,8 @@ iD.layerswitcher = function(map) { }); var content = selection - .append('div').attr('class', 'content map-overlay hide'); + .append('div') + .attr('class', 'content map-overlay hide'); opa = content .append('div')