From 37b2e13086e7f7080fb67f102fb21f5605dc41ce Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Tue, 18 Dec 2012 14:52:35 -0500 Subject: [PATCH] basic pass at footer stuff. --- css/app.css | 116 +- img/source/design.svg | 20333 +++++++++++++++++++++++++++++++++++++++- img/source/sprite.svg | 510 +- img/sprite.png | Bin 12757 -> 15342 bytes js/id/id.js | 18 +- js/id/ui/notice.js | 1 + js/id/ui/userpanel.js | 2 +- 7 files changed, 20591 insertions(+), 389 deletions(-) diff --git a/css/app.css b/css/app.css index 3c2e250d6..5a910da34 100644 --- a/css/app.css +++ b/css/app.css @@ -55,11 +55,11 @@ strong { } a:visited, a { - color: #b0b0b0; + color: #7092ff; } a:hover { - color:#222; + color:#154dff; } input[type=text] { @@ -90,8 +90,7 @@ table th { /* UI Lists ------------------------------------------------------- */ -ul.toggle-list { -} +ul li { list-style: none;} ul.toggle-list li a { font-weight: bold; @@ -113,6 +112,21 @@ a.selected { color:#222; } + +ul.link-list li { + float: left; + display: inline-block; + margin-left: 10px; + padding-left: 10px; + border-left: 1px solid white; +} + +ul.link-list li:first-child { + border-left: 0; + margin-left: 0; + padding-left: 0; +} + /* Mode-specific styles ------------------------------------------------------- */ @@ -147,6 +161,7 @@ a.selected { .fillL2 { background: #f7f7f7 url(../img/background-pattern-1.png) repeat;} .fillD { background-color: #222222; + background-color: rgba(0,0,0,.8); color: white; } @@ -158,6 +173,15 @@ form.hide { display:none; } +.content { + background-color:#fff; + border-radius: 4px; + border: 1px solid #ccc; +} + +.pad1 { +padding: 10px;} + /* Buttons */ button { @@ -320,23 +344,27 @@ button.action .label { .icon.zoom-out { background-position: -260px 0px;} .icon.geocode { background-position: -280px 0px;} .icon.layers { background-position: -300px 0px;} +.icon.avatar { background-position: -320px 0px;} +.icon.nearby { background-position: -340px 0px;} -/*.active .icon.browse { background-position: 0px -20px;} -.active .icon.add-point { background-position: -20px -20px;} -.active .icon.add-line { background-position: -40px -20px;} -.active .icon.add-area { background-position: -60px -20px;} -.active .icon.undo { background-position: -80px -20px;} -.active .icon.redo { background-position: -100px -20px;} -.active .icon.apply { background-position: -120px -20px;} -.active .icon.save { background-position: -140px -20px;} -.active .icon.close { background-position: -160px -20px;} -.active .icon.delete { background-position: -180px -20px;} -.active .icon.remove { background-position: -200px -20px;} -.active .icon.inspect { background-position: -220px -20px;} -.active .icon.zoom-in { background-position: -240px -20px;} -.active .icon.zoom-out { background-position: -260px -20px;} -.active .icon.geocode { background-position: -280px -20px;} -.active .icon.layers { background-position: -300px -20px;}*/ +.fillD .icon.browse { background-position: 0px -20px;} +.fillD .icon.add-point { background-position: -20px -20px;} +.fillD .icon.add-line { background-position: -40px -20px;} +.fillD .icon.add-area { background-position: -60px -20px;} +.fillD .icon.undo { background-position: -80px -20px;} +.fillD .icon.redo { background-position: -100px -20px;} +.fillD .icon.apply { background-position: -120px -20px;} +.fillD .icon.save { background-position: -140px -20px;} +.fillD .icon.close { background-position: -160px -20px;} +.fillD .icon.delete { background-position: -180px -20px;} +.fillD .icon.remove { background-position: -200px -20px;} +.fillD .icon.inspect { background-position: -220px -20px;} +.fillD .icon.zoom-in { background-position: -240px -20px;} +.fillD .icon.zoom-out { background-position: -260px -20px;} +.fillD .icon.geocode { background-position: -280px -20px;} +.fillD .icon.layers { background-position: -300px -20px;} +.fillD .icon.avatar { background-position: -320px -20px;} +.fillD .icon.nearby { background-position: -340px -20px;} button[disabled] .icon.browse { background-position: 0px -40px;} button[disabled] .icon.add-point { background-position: -20px -40px;} @@ -354,6 +382,8 @@ button[disabled] .icon.zoom-in { background-position: -240px -40px;} button[disabled] .icon.zoom-out { background-position: -260px -40px;} button[disabled] .icon.geocode { background-position: -280px -40px;} button[disabled] .icon.layers { background-position: -300px -40px;} +button[disabled] .icon.avatar { background-position: -320px -40px;} +button[disabled] .icon.nearby { background-position: -340px -40px;} /* Toggle Icon is special */ .toggle.icon { background-position: 0px -180px;} @@ -494,12 +524,6 @@ button.Browse .label { display: block; } -.content { - background-color:#fff; - border-radius: 4px; - border: 1px solid #ccc; -} - /* Zoomer */ .zoombuttons { @@ -613,34 +637,39 @@ img.tile { /* About Section ------------------------------------------------------- */ -#about { +.about-block { position:absolute; - bottom:5px; - right:5px; - background:#fff; - padding:2px 5px; + bottom:0px; } -#about #user-list a:not(:last-child):after { +#about { + bottom:0px; + right:0px; + border-radius:3px 0 0 0; +} + +#user-list { + border-radius:3px 3px 0 0; + right: 330px; + max-width: 300px; +} + +#user-list a:not(:last-child):after { content: ', '; } -/* Account Information -------------------------------------------------------- */ +/* Account Information */ -.user { - width:200px; +.user-container { position:absolute; - bottom:10px; - left:10px; - background:#fff; - padding:2px 5px; - border-radius:3px; - border:1px solid #aaa; + left:0px; + border-radius:0 3px 0 0; } -.user .logout { +.user-container .logout { margin-left:10px; + border-left: 1px solid white; + padding-left: 10px; } /* typeahead dropdowns @@ -738,7 +767,6 @@ div.typeahead a:first-child { left:70px; width:250px; height:50px; - padding:10px; background:#fff; font-size: 20px; font-weight: bold; diff --git a/img/source/design.svg b/img/source/design.svg index 27ef8cd15..f47abee08 100644 --- a/img/source/design.svg +++ b/img/source/design.svg @@ -419,24 +419,78 @@ ry="0.5" /> + + + + + + + + + + + + + + + image/svg+xml - + @@ -583,7 +637,19474 @@ inkscape:groupmode="layer" id="layer6" inkscape:label="map" - style="display:inline" /> + style="display:inline" + sodipodi:insensitive="true"> + + Commit + x="550.40125" + y="117.36218">Save Welcome to the iD editor - + d="m 446.67679,2.9063768 86,0 c 2.216,0 4,1.784 4,4 l 0,31.0000002 c 0,2.216 -1.784,4 -4,4 l -86,0 c -2.216,0 -4,-1.784 -4,-4 l 0,-31.0000002 c 0,-2.216 1.784,-4 4,-4 z" + id="rect16652" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssss" /> Delete + + style="fill:#ffffff;fill-opacity:1;display:inline" + transform="translate(253,-162)"> + style="fill:#ffffff;fill-opacity:1"> + 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:#ffffff;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" /> @@ -2129,7 +21656,7 @@ inkscape:connector-curvature="0" id="path5636-3" d="m 35.000006,114.86219 -2.999997,-3.00001 2.999992,-3 z" - 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" /> + style="color:#000000;fill:#ffffff;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" /> + id="tspan54723" + x="-472.15625" + y="291.03125" /> + + + + samanbb + + + + + + + + + + + + + + + + + + + Viewing edits by ideditor, aude, samanbb + + + + + + + + + + + + + + + + + report a bug + github + + + + + + Welcome, samanbb + Logout + + Viewing edits by ideditor, aude, samanbb + + + + + + + + + + + + + + + + + + imagery provided by Bing + report a bug + github + + + + + Added a point + transform="translate(205,197.63782)"> @@ -2435,8 +22414,9 @@ y="109.36218" /> Moved an area + transform="translate(408,237.63782)"> + style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:115;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#b0b0b0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:115;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -3966,7 +23950,7 @@ transform="translate(-570,10)"> + x="1290" + y="-160" /> + id="g44643" + transform="translate(150,-220)"> - - - + + + + + + transform="matrix(2,0,0,2,-1006,-505.72436)"> + id="defs12395"> + + + + @@ -141,6 +152,10 @@ orientation="0,1" position="145,60" id="guide47496" /> + @@ -159,21 +174,237 @@ inkscape:groupmode="layer" id="layer1" transform="translate(-25,-62.362183)" - style="display:none"> - + style="display:inline"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + transform="translate(-25,2.6796875e-6)"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/img/sprite.png b/img/sprite.png index 19d4ef5e920fe37bb10a46624b5481775786c6ed..8138e59809a36f35c056df9780b07b61146aad9a 100644 GIT binary patch literal 15342 zcmdVBg;!K>^e%pA5QL$-hE!TgKtdc^N|A1)J0v7UVn7fHK{^adLb^dxK)PGHyZgR; zzQ6Tb_b<5XUe=o7Fz0aQoc->2_OqW8rluly{~pyn2!ie_$Rl1r5Q-Jp{)3GP-rGKU zM}c4HuF?t`*x<(p`!y2$jpHP*;|h)+yL+KXvnP9k4=LSbwB24hTDW9kho6?`;9Q1(Ma{KUKDfnKl}o-(y<7{A$=O-ht_4I zU7`{%c6xrzciNuZ$?3t0qd&EJ{Wf*%Z_2VrUv;--ulVY;HwNK56N(T%`oZt+0bpZ4 zYWaoOUV1o8`rG&K%OvFFk`tP5zGY|gJb3URQHHe^k4X9m6@rU8pc-93Yi10#4+uY3 zeCPS=&r|>Qm`WM(H3;SoT|+di@NAfA_x@ssB#uUJu~hbt9}egN{_e-7>70YL~lVsA`C~i_; znpuM6yLx(33;c|v5SDsFMNZD5srbn~LJu?~61tD+0@5q%<;clrs+|V<-b>+8@G|5! zG~7@^&oaYF15)|;_;4F9Hu8~C3A6Ryrx71N`q4CL2yR4%goK!Pe54g43=?Mz`fk~m z#)0xAL$*N7d7+gA9uqk!ucD$-q0QO2JDmHn{cL}+k(SRCQTq-JEBrkcLB&*s{Zzo| zod4~pVg1`{{rF|0bP3-JH-385Hw`adz7$rBA<@#;_Ys4DK?$L_xHzPIo2a<>H6}cX zC5QqQLX>G?N59n9zlw6&3W9TSMb3Jy(n3u==*z9-t)*tq$| z-o*t4j?TO&^Mxx6TK@X=>-1*R=r+&hek~3Tj(EfM$<%hL=o_kkF4eQ86LylqFI2Fj zi`};;tqH`B`VXPK-&pj2Q+Z9AHxaMLd6)u;eyjz#z8SE%>|#G$ZE?xuw|M$b0@6Y~ zqY8==OO@-b^Wx>iqnhMHE!+NO6<1bPmKno*U6jQ><2%HxAo`WPOI1lx(LKbhR5e`! zEh{T44V@Q7s!Y`dEufq(%2L7FdR@z8(zhftlTnVIoR(HRzpTtHEc&1m{D5mWdUE#f zJ^4ys`tHqM3&CxJ-}PH{ZSBX~z|1<3-TnLb8~s)iEf*xO_F7clym|B9S4K2Lih%Ob zw~MWb(rspii~VROIs6R_-P;)}GvGpg96{O$gmQa*FzgecItt6E z_eRi5-dHmRY1g`MH^We85Pz>tG`5C@hH7ycD;|csL^irHBGO>Z&P#uy^%uDg1}h!s z?BFi20Vn_U80KxZtf>zlKJ*3IPIYwT6zEk-h`B8Nu{<8Y>}uoIF8+5@?Yi1PNJ>gd z0MSKtTwfjbsrsHwSl&t@-pFo@;og(JHK7v0OkN^r_7QZnvgjSQ>+Kl)j^ARPN%Mt3 z$&09h*yM|2670{eCz)_4$Djq#8VVXFGvUA(u!6xOe*XQl#V96zeq!&Ft=}c)-NlxD zbO<@QbYf|J>u+qSX=#2;0TT!}VQKoW%t2@T0d3%?HsZ|tctk6mor6PZpySQ<MPhQLjJO{NnOMoRi!Rjm|ZG!608?KR)l9gpgrgR^*S*rTT~ z*X`77l0a)SwWp4OA_KrOn=fC!>>dOrr)(Xd4ubVvhL>*qWDfF_0L~p^d`yw)IM*=4 ztk8w_UvyNL+m3OkNcg_};{q1L-{SIQyAP36NJve6sm|bx3Bjof*}GQr{!p-j+>i-2 z-?dUgBr?^kLP95BowhC(SCSof(o<8#l`pxv58~C#gJ9~!Y$|nLCtDLdwhMTWy1M#) zsb!y^*FtNUFfLTgl*+ivEs0Z=<`Cqtl%AN1k{r&ql8A9H@56@XyS*;Nf z6PNx$io+)r5MNEUy5wL3R`5sDVyC35QqDJPBl%-%bmDKPd0kijYGD!3=@+ppu0lHI z(8ol6%ZACXa#7T8k2eH$((V7ejB-~shL?U6oA~| zBvWegEs7@`Gw?|DZ3`#uHZwD;z4+15-tKPj%e3vFsPX1)9n91*2dAfl-rq+ez^glf zXDn;w`}gmHeq#;K(h>Gn#+DQigqenuhO%tV-wcu9j zi`qba6I%a1GBRQ=BO^1P8A>-v{wJQZ`&rp80dSvOla`Rk=gP|4k{&zLk{zwB0^P*i z4GUMZ-n+gd-<1+}_R`!w8k--po%d%x)0%PZ6L0tlI8|L!Fewi#79F+PYhf{aTiLJIY(4`M+I9UT8< zMo2rOf0_05E1&z8w%tt4XU#(W^RONZ>Wz*#ql?pBNA_NNhsvqZUuGSGpFe-5tXaeK z;TdlDLo4R4zvy0TfAPlxRotpSg97@~)pemwe*Ni027AC0H9I@INW^1DKd{H*D@Re? zfj^o^a$MZ-_)DIL4=>Q0=1^#E*1kqrTy_)V-?UciRXVhw_*nJ_J-a*@H;XDbP(BKC zJ^OL##LCFXXnVXdk{(IPFZ+R5w;%WF{BX5MXdy)+UDt38wLOCJ{Ybu+fBdIUpD-Af z&Ps>Y-CzT&D%nGsc+dvW7Ff4*jAVOhRVJAd)wMIjFd z2d=38kCt?KG^<~aKS1g83wun1h7IJFa#gb4Zw~z$PAh-xPwqOTN+)4^Xt&AVXqF}> zCEbHSQ7f8rS0$^=@rt50XWRjI-bJ3Qum$IP1oQ2fz8Ng-}WgIfYT+QKB5 z+1S_!D0u%l&iS4ikk_ZOqNXM#iH>c%YyJ4~Ljos5AdVOzfCAYGO*NvV5X9|POgY%n z?9G7+wFa(d3P7OCdVonjY;JBQFY_sKAYJv;NNH((J7QRrBs@X+@fo7wDx3Ls#T4}< zkVPrp2L^UxLC-i?%2+IglI>$y2c@z1NA(=9x8x)*)E8kdH8h65LN@omq~NDZ-lspZ z4#A9kMI-l-rt>gTW0A&W+?s>t@teFvf14C0qW8{xIZ%L&u%DP2#*e=~q!0KtjTOtO z8!-ZI5*9Uz4=_8HTDs#w|@Ql^>`3$tV+Ky1(e}wH*oho z>5t622Ai9k!|z@XUjE>$-)*>Dxib!HLicB;pek0d7G#qp31DBHF>^2d`uh48J~K>+ z=Di0CAqoRL&-buLn6cX>iL?8GE=;;C8SES!N;X6a>9p++zf|=-7?7i%DY!`?cz>I= zTX)#2q@$zLct6f>tv{2zJ&OKz>Tvbi)^oKtbswbn#_>k~+d0Zy0xJXOQErS8nWY{E zI2-JQvkLlzmj0%HzBe!QPa}F0XHaF_Uz8cYH`V&P=H}*Hl3oW(^kQynpD;byFuBOO zX-&q57dMp<^%`?HPwATthVsvuhj$y&b(5TvRIr5(d8SEe_!C-C2+w?!HZh*lMrL!x zXPEW(_zXtQ2~(2U9`PTgEAS^XVp|;o*yeb3lr5QhFyk>Ns57usD{VbqY*G#Ew4;o< zadGtT_xsA9`qe~w6?X4B7EuCRq1l&1Y$$6)q@=;>Uu8|Y;vP^ucKT-tIo!7pU|})O zU{+8?qrm(pC(${F`bUdoxf*0_I=t75z)<4Am~%g;ff49IaM40ii2G0;N*qd#dgB-* zWoKunAS>HWoM7NS5jSS&UEqvk8cSE!GJkftHy@eG{!ENTP>>YZ*N+WL5agLgyZwbW zQfUE6tRR?nou{+R?ag%pWv(hU@k^5B=Nw_B&n{IEJr=MdXOqGP1_AQb_JhR4#E^)! z!}Hu*g&?-xfYT*w8k=7ecCjEkpH#5+%CcfkQTgW!1{Um8t(}D*{)ujg4OG_h2zs>2 z)H`-`e9uK6Z||!^Q|cI6Bi(zS4;VbbyvtHU9AtCEy}~`ns2e*>Ton70jgieFjC{QN4Suanc#BplZVzw;+>8(a*4vi1Z3B80xaz9qzu@;Bnchs`I> z3kbWZik?!p^}(okZUa$%adGjS!tdX{MTCckKMXuwAu)0ep*oe)(9lpo)90e`8hsbrA)Vg+ZS{0P5&T(GdDu+TjP3n zZHMu;)oTF0R#$qGEnlnMo{(~A+W7(anM@g*rnZ%4Z}Dpu`yq?My|MT-vg3^F zuu>uSM!She*Bkgvp0#?FSmLfLr}o3D*bXzIs+Bcp+BE{-l#QI}M9{0miKig95cjY5 z_W0_w%p}jKUqN`{pa$PI++1wVq^hueq!SO%FKVEA7K+~ns`)+unHz_gGmSMIbI(BV z?%u4c`qxZvyWjdOwny$mPJQC1Rf~&@bM+u+Mv;+|-=-ih(0*68L<-MV)t8kG%kR?q zUL2kK0AMAIB~N$#?>#|7rR!=h>GAO~4-VrFiL_NIwk`n`WHVXm*qB{dxRVPiu*3;~ zD=L8wq@la5DTAOly-eWJbN>e#wJjYj@{3v2{E-VSrbv|H<6j+gt^xuAfBmnI$55c5 zAIdFeQQ|8BPn}1{8+sipBn#Q+VFXM$Hj3{|SG&fB<%GgeE2mwQ{+PSJdi83I%3dB>m(FQecSg@7 z8}Vg+-!l%lGN+=7$_-%vM-a?8hB*~Q%^f(`OL6a$l;lsJc+Ehxp7)3G0~mURv03wG za|5&^540&nT$lv~1oY{fWHa`r2fr&>g8)Gw`hs=HiW)9#%&x)v!(hGHfO=NMi}Z#F zi6?taXl34~4lg>Un)io(fvvXyA74${&$~OVC3$NpRa%zbrF z8vVLbL|oVYL^ItZw13f!{!>y=@YVW6DH|nDZf>q3vV!@JI9MvEoV|EeWLSR>fCImg zQcG1^5cfoHPqwU;6%@|@+v8AwJX)jzj*dab_}ZiM-|T^czMd_4{b0gQXk)C%C^ls7 z&6q(MpfZTyM1)&G=Qc}WF41g~v=JXdSJs{lA- zD+9!k^{H>LZuqP&v@nkQpmrq)24`ipXaXG03QCpa>vz~9PXC$?0UvP)U`ivLSebQC z45#P)D*EJ}LZI}#s zg7#>|RQ9E+)!(M4r_HOYtGgj)88ydrwPUKz#a(S|*__2CQw+~ttF8M@n7ffQLdPD= z-8%Dt6JmtFknHJi_y_`x;?3T_-%&jJRZiOR%SpK8+%yuNd;dD__K=3rHE|qV?|?*? zPC`mrU~6TS;{aaV4_ZfGjt8H^U&ZEPHQ15^kr@?&)y2GTS;02V*hDHt_@Om)quD?oeO z0iZkqm33)U6b|TxQ@^r@%c+y}O_tlPHeFW9w7jvM(wiaoy&4{nOYaEiapIlqmDp?0 zZ!YqGH;6Y*YEbK5z743vS6*J{COYx9UESRTyLW$s>~BvP?l!({n-4L(1%2_$&5e!T zi>WifU|DMY)aH979vV5miEZ3}v_8a^D?Rzoc4%>50I;o&X&?oBa}o9|W)C_cJhY%7y>wn|HwR7Iyc2^MfQ?3+Mh!l)==FmVpodRa*VH_bVVEN4)_?rO zVY+Hdb38;H^iZk0X0!6u;~2PP&*RLiWjUC;U3vmBa9L52_gg|`ePncbdQHw&u*-UU zoG6af=Qxg!i&(@*fz7fpCp+%G=t;Rgxa4cqj z=bCwquKx#>tYl!=jyv~F>H#cs52jB<(qrd^oXN?_T_4}Pf`V%YP}9B|`(U@vTk0L- zF!W}g6s#Dz=fGCnZ4kuP^^Z5PZKue|$Qoo3%-sh#@FZ!(1B8IgwX)6Is!IV=e_b)a z5&Os^G>nXPPdD@;*#wQM>~TZoD-5cZ<+QZ4{1f8=UYlJ!vOi$z*R9$r=^o6>&u?Vj z^(JnVbVqxo21qjwcve?e*9!=ZN*oPygH{~CIioP7jjb)(y{*nzw!<=1KtQq}+^7kU z4?UmU=C|d0!6)|{7JjmKp};pRitC;onjEh5Z~*qz?xGlQQ=e;2M5V_!3faRy;N20= zauH|QE4X30j;HdKj9!&y)8s}zzho^-^2|P30?B(7&7!t~yn@UqkBl#+sSU01 zl&RKYEtV8}|A&7#I5>Eg$1#C&@H&6{$!n+N8Tr{&TZ)aRvF|LM&w`|aIQ78otN8id zxPmp;gzM&FDt}9!fEW%A57YB=ay+vY>e3@(F6yIJA|0AP090R5KcHkR1-|uxjQVT% z2F;&|nwlDZ-Nc23g^sc_km%CrqO#MF@;$_(C%#^Ei|F&hrO;9uuT%-6jeWZM1VloiO)wO)BJDFe_wbW3wu3D%jomlJ7gmy zVQS$muzq=*j%pyDw-4gboV{`QN(-&nak^?>Rz`gmp4D!qC6}7T?r4AaiKmvDzJ03@ zVJ5(&YW!xiRiDiB^YaPpX6w#{;1?{uJpD=Xv5k+Cg&i9TYHBW|VudaQ&JLEAmIxtk zCN!**+v~a8>qunIj~^@PveXyr+3BK?8%qDqJ1jbiJYuV_w@GjP^`50rPfaMI-iL>? zW}TwNW%6!gbgSBkhp@gvqN+BdtQ~=dZpntUvqWDJ;f!g=&9=xXyun5|55ma$#Pg{j zch+_O<<6x7N|ymA;MLiAc;@5~aR~{h@Bk9ebl=#RyG=rMd;9HoFd;Z&%3_g>kgbgk zJ`4kN_Jw5NhCC?ta98`%Z!JO29-|hr)Bf`1i)Ra9+$=wvd+`x|CRVTJ?EaAMy(404 zYPtZJF*|K-L&KY6P$=Hpe3oDjKltLD} zZsnVxWD0S=tFsTl8%#j6-l(N&_)J4n^G4`PDac}dR$lpec?~+%F3Yh1!Y5~tqYFmO zzpo~3tKMg@lX-{fm3~mktY%;`jvMcf6MQT1Th?u{b^!pxq^*})-=gS_S%|3Lv7)0D z?(nV=qxytwTL$p0S`dfMkBfoe6@tSnr+in2R3&}Aj@AYw&yR*wjofQzERjeOnMCU5 zk1b>Au*Z03qc%d+R8;ZAUPW}7dIRWhf@9pvJwc%%$2-G-+tig5<>rc1`(B=yYk}&G z?U~M(>IVqtk9UnmNm5c$tmv)8eRJ|z;Z(ecsHnz)O6UFkePL7zkuZWF~BuQkvG+bNPTI0GtGg8g8Ebhl) zJpB3N7`uFaIC2b2>I5_{JJ$D|M{fyP*x2T_IeNj|$isF$I>qzd#^7@*>^VyZlk26` zAXm}U-3r^WUR`kJpKX+h6aov56!vx%se!cqgvhd4a{qLbb4vLX!DiBRwG)j4{{EsDO`Gkc}S>d{Jh)0C#zP`Ta2}XYB9RS%J zMBNpLJcUH$=<>?SY!EEJ4RT8aK>r({_5FTa^KCc-TZ6{(V&ZQi{~fjQr+471+*rDp z$BsIj3NiQL@Hsr`IYN>#YbrNa-a{1hqu@X34CY$t>04qt7AF=qHF&|KFM?aFI`xWR zg~KK(Gj+>*p`v(ox^;GAB>xt)P^+C6#h}Vd+OErvp>MW(C8PTqyt63reJ@m6FtXd{ zfZn{_@A&Mx)8w@&FJh17=K)IV#Qdh~7kI&G+nlAgALbXB-9q|+xjRbhInx2R7zZ1i zobdW1oY->ins8mhzK2&soy0e4lt=btccJY=c7aZ*g@c=$+e+T6{70lRUXe)>ebu_^ zabubVx}Pa&X;Z5~3akD=&XY#=cLfjtZ27J>Pt{3eX6w8Tm!#Y!Zm$k=f$PgG(fauW zA#XzKI9!iV3&M`1;3dN&Bc#4J=c_M|-LEKj7xq0rhPbGGEh%}F5Y%}u5eU$O%2nD;lvIIr zXvtPi7ODbs<1heT*+6&-{rBmAyYuoCi>y(6F9A(Z5%YAo&Tku%7X>pO_k*3j6T}h! zL3nAAlqI1$C!t7hibyG~gvT7F%W&Sww+JVLV$4gNzV)t<>n;xX;${p}*;oYj25vCZ zb9!1#JK4b#R`-_?i9lRHZFHvvX!$~cm%YvPVAoOX+yS>mD09|#{gU!sdJ@6!EB>0O zXXTaO8K>>vU>lSFhvPKr1g9N!i!-N(D`%}8r07A7px1H{VfDp8J!Z* zL)}06O(C}AwT{I1iU&!^LWZp5ur+*m36Z)ZJe(08%GsUGs+<(JY|Atr^7e7u`w~ui zX20cEf8IZr<4)ZDto7E2=Ufb@^Gg$DC-Gl4|FW_ft{FqFiBPVYGz;9MKH1YA=%8V= zYxj{@4Wg(H6~_PeXicoUySp;RBWFWviF5`1_)rV6^bq82(YsyqtLpbNQ|g0}H%}3B z=hi+bg!lQzt?+Nfe?OgDE~kA(APX6EFQMT@*-g(ch1|e%RNVl#lH>! z)I^ZX{reX8tB^U(;Jr6p@^-d8lG+mW?3bi7>%D6g=@1i&AHmp+G5_jsnF!}3P0NXz zMBt*-#Wc7AExZvT^TK(&|22+Q;K0~s)E>}+zQAjY{e(jex+NDtYscEZde^Logy^BO;2w()XXeQTk=@I0@$QK9aHZ`J zH`>_k-yf@RW9nY^3^xEyh!sFvakO1A@^bQ=og>dDxS@EIL{2i#*iUxn=3|a|+wuK^uVfE9~`bwZn(j*!{%d39_^4iOi(o*xULSSMVYxhgrkKmsRV=Fac zDLg9bc5>U@=s{3%ZUfzC^Ybx4Y-am*W06?B`m_kHXM4jD6-w@5g_CZAdN9MFFvtl# z8_uZ@&sx&=-Y&nz?oeUZ=O)KtltqCE?QvLRGFzYM|C03FGY*{Eo`wEtHr3Ya4u4^= zxFYaAP7hU^{!eI z+XQ2;uE#H==v_qJUZ99NKwz zTD~TZGR>s$q5*tn|F|OXm;ddJ!-m!~wjVIlG?-}|)k?KK_aN5Xk#Pl}U2AG*cJy-= z@H|yvTqGnUOQNa0Tk@03Zla~&nq7`h+&U|3W_G55lwv1({N&}BCzKfAaY?}iM(z#2 z5oP#NBy~kqy8rz(KU^@v7W8G+O%$Y6*R{i-5;??Sv7h7Bl7BcFK6c-JTKFso!A zwg(0VDkF|q2(O8H+9>yCp#vrOMM*}6aqQ4~9Uoo-8)d}dhc?r5al(2XEv?g%scl1a z?*1HQv5W=zg{0ChAYg-UqOR160f| zV@!7K$DyTwg9U-8Pz3)}UR`gIYop@l6VZzSl znkx&imtbvW4B|5BoPe}}M=q~!_$~=jU;4bCy#U+{ru0v%XXcDqkU~Fr)a^A z2Hl(2XFSI%BKro?(}Q zO`7+6K{$n|bHlwR6onXBeb*krx!{M{X-j%#yEh?^kJf+N$;ip6+F4nRM=-$e3#5%# zPohxaWe+9V@4fc8+a>UchrNXJ7JoLM8p>hG>Uj29EENbRWE#4Qr4#wU} z3eJQw*uz_lva;Cm8CzF%8`NL}Y6>wH!~-+fT!TP-Qkup7p~d;}i(!r(VGqSzb6})&&BI(~9+6i}F}(bhPsd7%fe_YtJ|q z=TwNH*>kAPkdImFU%~N_$t~~5Xgpi^Ab~gvI?==4&+4(b^eBF`IaU;9>$4LoH#=)9Er z-g!}F@eCh`LLyKCe!s^`*vO(EY`|vR8EYUXA^G{PlDcs-FTYTf{@af0ZyH=CReoJ~ zul>7+F&@peHCZ?pXu_>dGE5gfDEL6fAP5}$`E;0Rqs`Y&^TM6eF~+V?!Jnqg{v1FS}gNEW41hhd-+N_U&~Evw{{jBNU;X! zV{?%e!AMOoK@Npw8Tt5JjY%VeKwSE7Hk&}><+fU?zT<$#E=g)kpH+#ab9?&qw>~^+ z)ulQO)IcRX0pq}n^Ho@HAybyj#%VS<--8*L+|T$9`Ih4^$|-`wERMwB!(5@ljb*2? zrdb+#2+p~Lvq%Rtp@%R%9yV;Y+^!$D0`ybqW{|{MWAI)v!Y)&nITU_tOlWmKIu<+B@ZqDAT*nH~2SH6f=QtrLh>-7_7&3d{lo zho;Fr6_Rl?*O#XR8YIisP>atHSQ2&UJce1^qepOz2JiJV?0FLDaUjTJ8_s;75JN>G zGqAETnV&8Q!H9`n4b|iHpvTAVNqElM1*3C7ZkIz!aXt3r$?HF#G7=2Icy{{%V=MaE z?s_!Lw7GoD&^D(s*C2}{+y%3Mp|_!QZ~ljzZi1*8Es<|S{3wAyqX4<|Uk-Nmar}Qa zf?fTs#(E2m<+8;iwB*U7Cw)=%k~x?4s8T2a)d1Nu!F90gS%;I=+EE{WFR*%%P$Hz0 z$sF{>{PkrnM?3wBf5{nZ57+5ku}p5C zsDj1s3tP(t+zE|N{4RQbr>gG)7znY<)V%SgYEqw@YDiWlG6X})Rp^RD>d(GhIqEai z`w$4ycQDiF!Yw%PrzR_}xjdAn*Pyyf8~Nt2nG_Q0xz~yd4{MuL5sTy*_{ZvpfB|}p zvFUQrsekm0?UB+Y-qKymdaJzflMgsfDL7w9k45Q}U4@EJ^0p8-X{$qJAO5Oh5Hci> zL;nJYQ4^%~7x0VkAga3;_v>U3jc&Cw-=&cwHfgFz_FQyr8{SSy5+AHj| z%&^}T%%9Gz5%55&Nzb3VmQ_~5jpzqF)6_-*6~wFZl_THbDUv3&GY#D~pT^;vBXHTHfnbM}xIZUBZfvH=p!Sf^?MX=22ol3JIj z<;ue;mtJEzO3l`*XMycdJo?E}ZaIDYa8lX%&=v)ly?wxyEKdL5XK(*|3#ENGo_l`p zza~q;E6xDF{qik=ZgcgEeJgdvgJ$4+8&=Wqp@#6Xo`e9;5*GfOH z5EDP+vTCW-)z!H%?L=m--ku)Xl=O5-^rr3tgE2sHW9EpjB4N^;FG6L(8gq--i?&9m zr~A_r7ChSJ*QE_6!*!mKZz38;91g1ngQ?fn7Fa~d@zgvk6LJJu_EWCI*DEYGpbVu&@WbO8lXE}g6o~d;O&g! z64O=4xLZEJe?mz`t=JEGA<(5hlu?I_OH_%9{uzI{b<*|4yLf@*hhXX%vxoHH=!#1v zH4<~o0A0xn)G%Mf8Sx9I1sYDC5Bx1xt3!FHzPUhwT$Zfn!>gSWJvdKW#jW^(-XVfYFi!=0-zQ*68?FoeGd3_VsD_zhU47sO8tf>rv#^K897LNu z0@Yr~d6YuPZhRBEnMNh{*R%&rhrUZQnN?|c={H@mj7d2@iB=7}MnNzR0CecXoHzYWlj%MEr&yBLv*e_U12jrxIXO zeR~D7C^6>_(jn&rtT|G*ur?hg9-du3##R?5uQ02Nz4;ccvS9kFV&)JNILk1s<4F?- zzBKZ=jCvu;UT(aVrZZ;1d`oB%L)Q1q1Hys93L;DTGcS-Uf`SM5*4Tikph8$o>=IW- z-NH87g48k+9DGX_Eb(rrcFO$>~%RAkaU#-8k`aBtUz_}!<~Sx z7Fk#aoP6#v!WpNFAMX&Y1zcrD8zTqDrU&qtJ;+lrQWwZFkB?;XB*qUj?l%g=r(^Z- z-uebnEqoyW-*(aB*~>;=NoIAhYEMvaE3yxpe1o=jz{rdI(SkP>+K z2NeRE4irF*YAGry*_!JZLJW6(?bB^A*H!?nbtw>+?`ujQoyQ#b;wc+b>d6X*;J0GkO& z$9-_Xz`y`9GE&CQjuYt385M{Y78j!v6DjBFy*)Sr0#3kV4VIDA!o8y2y}Jv2uXKtR z=`lP_+cl=WSMOJy_EPV)M&yp~N1>+Vml&U<%(X>?s#Z${5`PIOUVyy z3pM-g)KeX8ZNE)_HJR>9BDlIAz1EQhwgS`eR{)#!cszf5eQ|sZ8pfxff2}<`^VH@f z!)Cl&=8KEBkks?%c;E?>r-)DHlmLtYd5>TTr=D-eH!x$rc(XZLU<{^;+r6)J_Ifvj zi{CDHtHu3DHB*S$`xD2u_d)JQmQr8@&=rpQoX&V?(#76cP}Yn<7n|=FXa}5i`$RrH zMhj>&wcb(y_7PLT<{MD02m`{!u%WlT(%2vqW>!>?g=a~rlMIiJX8rt$Cyi`Ra|432 zg@38fj|yBD?p#M}%=lgRtAAQ4DB!rChUbs;3sHv!wf6>5aoH@(uK=B{fX4-iY%Tf!3kwg$eMkceQgs6cy1_*d_e*Q#gXplfsTtj~i z!6QPYm#4ct)tm34W{sA$QUpn4e#`9^1=iB7%{4X-H~4!0|6g+A`9#Y)Uy%91(Sa40 zs;Mcw%-mB#|9ipcC+1vd?G}14vx__#e$=xyGCFEF0!WErVJH-zEcj@*|2G_LgULy7 z1zr@W=%MIyIn8%N04fa8hYvTT%*|OKbXtl2{)3zrVyvszB0xbO++GJf4#mC=JjyZo zvRj~(oSfVv1K5dgK1!T^zi;s^zZfN;2ZJ z>*}VNx?Kv>IjisD6lz-BX8@5djkHJ%f=%+`{ErDh*SG@~GVYARc>1jKX{ZUaLUYxA zEFnGGU99F77M`rqgDFO?wT1{>*A;}guKi~j-spJqYG=~+yJQh&6`5{ldzS@f8~_)G zLYN7HypGw3cJHgPlq3oD0+k;ps+!_u#wx>|_NmEVAX@Suw0;X|@LD$sQJAprvU zueG3$Z@pW(B%Cr#NryPFnuA1Y|DzMc{r^_=MzR=}^VuRJ84q|i7gCT>K@>_G2mUW+ C5xqbF literal 12757 zcmeIZbyQSe_&0h+P`ac+It2s-rC|^T5kU}@ZjhEv=`YeCNJvU6of1P0ARz*dba$6X z4PEc%_pZC{UF)v<|NY}-G2@vthnao$e)jWx;xYWCsv;3S9X

L`u&PuOJ8}3yy!` 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 z6A<code " + - "report a bug" + - " "); + + about.append('ul') + .attr('id','about') + .attr('class','pad1 fillD about-block link-list') + .html("

  • view code
    • " + + "
  • report a bug
    • " + + "
  • imagery provided by bing
    • "); about.append('div') .attr('id', 'user-list') + .attr('class','about-block fillD pad1') .append('span') - .text('edited by '); + .text('Viewing contributions by '); history.on('change.buttons', function() { var undo = history.undoAnnotation(), @@ -215,7 +219,7 @@ window.iD = function(container) { .center([-77.02405, 38.87952]); } - d3.select('.user').call(iD.userpanel(connection) + d3.select('.user-container').call(iD.userpanel(connection) .on('logout', connection.logout) .on('login', connection.authenticate)); diff --git a/js/id/ui/notice.js b/js/id/ui/notice.js index 34ab460cd..d1d3eec52 100644 --- a/js/id/ui/notice.js +++ b/js/id/ui/notice.js @@ -3,6 +3,7 @@ iD.notice = function(selection) { notice = {}; notice.message = function(_) { + selection.attr('class','inner') if (!arguments.length) return _; if (!message && _) { selection diff --git a/js/id/ui/userpanel.js b/js/id/ui/userpanel.js index 6c126898a..6543620cd 100644 --- a/js/id/ui/userpanel.js +++ b/js/id/ui/userpanel.js @@ -7,8 +7,8 @@ iD.userpanel = function(connection) { if (connection.authenticated()) { selection.style('display', 'block'); connection.userDetails(function(user_details) { + selection.append('span').attr('class','icon avatar icon-pre-text') selection.append('span') - .text('signed in as ') .append('a') .attr('href', connection.url() + '/user/' + user_details.display_name)