From 22ae78ee4c57930007ad0724b440befcc1ad124b Mon Sep 17 00:00:00 2001 From: saman bb Date: Thu, 21 Feb 2013 01:19:18 -0500 Subject: [PATCH] slight refactor to tooltips and radial menu. --- css/app.css | 244 +++++++++++++++++++++------------------- img/source/sprite.svg | 160 +++++--------------------- img/sprite.png | Bin 13761 -> 14014 bytes js/id/ui/radial_menu.js | 8 +- js/lib/d3.tail.js | 4 +- 5 files changed, 164 insertions(+), 252 deletions(-) diff --git a/css/app.css b/css/app.css index 7af38d1d3..b490ed04c 100644 --- a/css/app.css +++ b/css/app.css @@ -500,6 +500,7 @@ button[disabled] .icon.nearby { background-position: -340px -40px;} /* Toggle icon is special */ + .toggle.icon { background-position: 0px -180px;} a:hover .toggle.icon { background-position: -20px -180px;} .selected .toggle.icon, @@ -566,6 +567,95 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} .preset-input { padding-left: 10px;} +.preset-search-input { + width:100%; +} + +.preset-search-input input { + width: 100%; + padding: 5px; +} + +.preset-search-result { + padding: 0px 10px; + height:30px; + margin: 5px; +} + +.preset-label { + padding: 5px; +} + +.preset-fav button.fav { + height: 30px; + margin: 5px; + padding: 0 10px; +} + +.preset-input input { + width: 100%; +} + +div.combobox { + width:155px; + z-index: 9999; + display: none; + box-shadow: 0 5px 10px 0 rgba(0,0,0,.2); + margin-top: -1px; + background: white; + max-height: 180px; + overflow: auto; + border: 1px solid #ccc; +} + +.combobox a { + height: 25px; + line-height: 25px; + cursor: pointer; + display: block; + border-top:1px solid #ccc; + background-color: #fff; + padding:1px 4px; + white-space: nowrap; + height: 30px; +} + +.combobox a:hover, +.combobox a.selected { + background: #e1e8ff; + color: #154dff; +} + +.combobox a:first-child { + border-top: 0; +} + +.combobox-carat { + margin-left: -15px; + margin-right: 5px; + display:inline-block; + cursor:url(../img/cursor-pointer.png) 6 1, auto; + border-top: 5px solid #ccc; + border-left: 5px solid transparent; + border-right: 5px solid transparent; +} + +/* Address input */ + +.preset-input .addr-housename { + border-bottom: none; + width:100%; +} + +.preset-input .addr-number { + width: 20%; + border-right: none; +} + +.preset-input .addr-streetname { + width: 80%; +} + /* tag editor */ .tag-list { @@ -1021,7 +1111,9 @@ img.tile { border-radius: 0; } -#about { text-align: right;} +#about { + text-align: right; +} .source-switch a { padding: 2px 5px; @@ -1098,7 +1190,9 @@ div.typeahead a:first-child { z-index: 3; } -.modal .loader { margin-bottom: 10px;} +.modal .loader { + margin-bottom: 10px; +} .modal .content { margin-bottom: 40px; @@ -1118,6 +1212,7 @@ div.typeahead a:first-child { -moz-transition: opacity 100ms; transition: opacity 100ms; } + .modal button.close-modal:hover { background-color: transparent; opacity: 1; @@ -1360,17 +1455,36 @@ a.success-action { } .tooltip-inner { - color: #333; display: inline-block; padding: 5px 10px; font-size: 11px; font-weight: bold; - line-height: 20px; background-color: white; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; +} +.tail { + width: 200px; + pointer-events: none; + opacity: .8; + margin-top: -15px; + position: absolute; +} + +.tail::after { + content: ""; + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + top: 50%; + right: -5px; + margin-top: -5px; + border-left-color: white; + border-width: 5px 0 5px 5px; } .tooltip-arrow { @@ -1438,7 +1552,7 @@ a.success-action { clear: both; } -.tooltip .keyhint .keyhint-label{ +.tooltip .keyhint .keyhint-label { display: inline-block; } @@ -1455,34 +1569,27 @@ a.success-action { border-top: 0; } -.tail { - pointer-events:none; - position: absolute; - background: rgba(255, 255, 255, 0.7); - max-width: 250px; - margin-top: -15px; - padding: 5px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; +.radial-menu-tooltip { +/* for some reason this breaks layout + opacity: .8; */ } .radial-menu-background { - stroke: #aaa; - stroke-opacity: 0.4; + stroke: black; + stroke-opacity: 0.5; } .radial-menu-item { - fill: black; + fill: white; cursor:url(../img/cursor-pointer.png) 6 1, auto; } .radial-menu-item:hover { - fill: #bde5aa; + fill: #ececec; } .radial-menu-item:active { - fill: #6bc641; + fill: #ececec; } .radial-menu-item.disabled { @@ -1495,14 +1602,6 @@ a.success-action { pointer-events: none; } -.radial-menu-tooltip { - background: rgba(255, 255, 255, 0.8); - padding: 5px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - .lasso-box { fill-opacity:0.1; stroke: #fff; @@ -1511,79 +1610,6 @@ a.success-action { stroke-dasharray: 5, 5; } -.preset-search-input { - width:100%; -} - -.preset-search-input input { - width: 100%; - padding: 5px; -} - -.preset-search-result { - padding: 0px 10px; - height:30px; - margin: 5px; -} - -.preset-label { - padding: 5px; -} - -.preset-fav button.fav { - height: 30px; - margin: 5px; - padding: 0 10px; -} - -.preset-input input { - width: 100%; -} - -div.combobox { - width:155px; - z-index: 9999; - display: none; - box-shadow: 0 5px 10px 0 rgba(0,0,0,.2); - margin-top: -1px; - background: white; - max-height: 180px; - overflow: auto; - border: 1px solid #ccc; -} - -.combobox a { - height: 25px; - line-height: 25px; - cursor: pointer; - display: block; - border-top:1px solid #ccc; - background-color: #fff; - padding:1px 4px; - white-space: nowrap; - height: 30px; -} - -.combobox a:hover, -.combobox a.selected { - background: #e1e8ff; - color: #154dff; -} - -.combobox a:first-child { - border-top: 0; -} - -.combobox-carat { - margin-left: -15px; - margin-right: 5px; - display:inline-block; - cursor:url(../img/cursor-pointer.png) 6 1, auto; - border-top: 5px solid #ccc; - border-left: 5px solid transparent; - border-right: 5px solid transparent; -} - /* Media Queries ------------------------------------------------------- */ @@ -1596,19 +1622,3 @@ div.combobox { @media only screen and (max-height: 840px) { } - -/* Address input */ - -.preset-input .addr-housename { - border-bottom: none; - width:100%; -} - -.preset-input .addr-number { - width: 20%; - border-right: none; -} - -.preset-input .addr-streetname { - width: 80%; -} diff --git a/img/source/sprite.svg b/img/source/sprite.svg index a8c29982b..b9c2a7435 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -13,7 +13,7 @@ height="200" id="svg12393" version="1.1" - inkscape:version="0.48.2 r9819" + inkscape:version="0.48.1 r9760" sodipodi:docname="sprite.svg" inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite.png" inkscape:export-xdpi="90" @@ -39,8 +39,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="304.46947" - inkscape:cy="116.03146" + inkscape:cx="116.05141" + inkscape:cy="54.058916" inkscape:document-units="px" inkscape:current-layer="layer12" showgrid="false" @@ -194,14 +194,14 @@ inkscape:groupmode="layer" id="layer1" transform="translate(-25,-62.362183)" - style="display:none"> + style="display:inline"> + x="22.888145" + y="65.70871" /> @@ -1081,7 +1081,7 @@ id="path9826" transform="translate(0.9999996,1.4591601e-6)" d="m 114,727.375 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 l -7.03125,3.90625 L 118,729.375 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 L 126,737.375 c 2,0 2,-1 2,-1 z M 113,734.375 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;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:2.79999375000000006;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:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5" /> - - + style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 42 148 C 40.895431 148 40 148.89543 40 150 C 40 151.10457 40.895431 152 42 152 C 43.104569 152 44 151.10457 44 150 C 44 148.89543 43.104569 148 42 148 z M 50 148 C 48.895431 148 48 148.89543 48 150 C 48 151.10457 48.895431 152 50 152 C 51.104569 152 52 151.10457 52 150 C 52 148.89543 51.104569 148 50 148 z M 58 148 C 56.895431 148 56 148.89543 56 150 C 56 151.10457 56.895431 152 58 152 C 59.104569 152 60 151.10457 60 150 C 60 148.89543 59.104569 148 58 148 z " + transform="translate(75,762.36218)" + id="path9830" /> - - - - + style="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" + d="M 130 141 L 127 144 L 128 145 L 132 145 L 133 144 L 130 141 z M 124 147 L 121 150 L 124 153 L 125 152 L 125 148 L 124 147 z M 136 147 L 135 148 L 135 152 L 136 153 L 139 150 L 136 147 z M 130 148 C 128.89543 148 128 148.89543 128 150 C 128 151.10457 128.89543 152 130 152 C 131.10457 152 132 151.10457 132 150 C 132 148.89543 131.10457 148 130 148 z M 128 155 L 127 156 L 130 159 L 133 156 L 132 155 L 128 155 z " + transform="translate(135,762.36218)" + id="path9844" /> + 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;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:0.50000124999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;opacity:0.5" /> - - - - + style="color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 30 141 C 28.895431 141 28 141.89543 28 143 C 28 144.10457 28.895431 145 30 145 C 31.104569 145 32 144.10457 32 143 C 32 141.89543 31.104569 141 30 141 z M 22.84375 146 C 22.06723 146.06693 21.349748 146.58712 21.09375 147.375 C 20.752419 148.42551 21.324492 149.56492 22.375 149.90625 C 23.425508 150.24758 24.564919 149.67551 24.90625 148.625 C 25.247581 147.57449 24.675508 146.43508 23.625 146.09375 C 23.362373 146.00842 23.10259 145.97769 22.84375 146 z M 36.78125 146 C 36.649194 146.01489 36.506314 146.05108 36.375 146.09375 C 35.324492 146.43508 34.752419 147.57449 35.09375 148.625 C 35.435081 149.67551 36.574492 150.24758 37.625 149.90625 C 38.675508 149.56492 39.247581 148.42551 38.90625 147.375 C 38.607586 146.45581 37.70564 145.89574 36.78125 146 z M 26.0625 154 C 25.420842 153.97807 24.780781 154.25399 24.375 154.8125 C 23.72575 155.70612 23.918884 156.97575 24.8125 157.625 C 25.706116 158.27425 26.97575 158.08112 27.625 157.1875 C 28.27425 156.29388 28.081116 155.02425 27.1875 154.375 C 26.852394 154.13153 26.447495 154.01316 26.0625 154 z M 33.9375 154 C 33.552505 154.01316 33.147606 154.13153 32.8125 154.375 C 31.918885 155.02425 31.72575 156.29388 32.375 157.1875 C 33.02425 158.08112 34.293885 158.27425 35.1875 157.625 C 36.081115 156.97575 36.27425 155.70612 35.625 154.8125 C 35.219219 154.25399 34.579158 153.97807 33.9375 154 z " + transform="translate(20,582.36218)" + id="path9896" /> + 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;opacity:0.5" /> + style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> @@ -1284,13 +1186,13 @@ sodipodi:cy="739.36218" sodipodi:cx="50" id="path9870-1" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;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:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="arc" transform="translate(249,-3)" /> z7vDcRv{szB?JI~L`@a`1OOl(!Ezt|9dP@Z zQJ1w>^Pgf0t@^_AdoH9Tv5aioifSub`dOK+x;1MCPIb7^466^$-!dVQyxk@D!y!X>+9T(bN z|BC*#y}iuX$cQrx+TE2R9B^^84mRTy%Yek3D3~{aQFaDcBn)V4sjl9iU&nmb5sVsK zVlewpqa?({WbK(KMkCl-*bYTE3A$+J+ zWZNNOKbLU0ZRC_BD)0m$vFvX&QllJ3*>8h+J-KR7ONkN(a{(1lF*RL~s(4FBIVLtCM+VC$!LqqQAyEwq$ z;Gh~(Ti7j2=j|Z;Xs4p0LjPOpHfOS`u{wNndns?yXXjV*XS&F0$i^@Pz~dhYOecqx*R!YhZ{J1Catpm3WV(($<~(*GnrnkWP_|0MTh;KlPV*~A=DFrZF} zz>)URlify$H^C#KV14Y=``CNhKpNJo5sNwCh7pzgB+da;S5g#~{@%p={CwjbbdX?h zIW{)-W=UyjC0oIL0EJFFIyrgE>p+MK1@E{UF6stNAqyZ@x|PnVnv^D8bOFj4T^N8N z+$540NN#^4Rdn_pV4y~zU;mMt+u@5CxMihnW{`fd$QW=S}i z7Fy8UwLHtU3wizl zG9{dx&0IBQ#^XvKJH@&&dIGzNR>{&G2W5h|+cW_AMX*SkBgf|`d_Y7O!bq3d4r&Y? zC<1+Q-T9rqxmK?r2GmxtmHN=c2xt2)RpFq*mU}g!dfW|;IqsOGNq(Y{hyUaKd+c38 zKYdTT&I$XLUG>-A&4Il}nl2X~CZhf2V8c>=ak{GIds9Z^!pKxWN9o@cP%{J+}uPSNv*jnI67u|TyqFpd<(ZrpT2QB?Ooa* zzSocW`BQ`?Yfug!rQuCmJG~XA&`NoHOv|EfYDrmu`}W(&ROkX#9Uo4;Al%3C$>S+e z#;Vq(Cvy9q-bs$Fbi(X#zdZPw7$6385FaxiKQ3PQ3*`=>6-)P#gf09W85vQ8!yxqI zS!Ne}u!V2vfkVnxd{jAN;q>`mpEF!%BPcRRH7IcI+3=*v{=F{!B-dtR!`%!_ongNZ^n@AFeZUB!LNmwK;=d4%rO466}#$FoeI zUv=mUFCk5>sidhSbb^Wk{%r3R0iGnl8e~rpG3U{!RG;c9)nORKh`R@){H?1ApA8K^ z|7)TN&w{iKLbLT#qF>bp;-7R?iv3+-4raow#zX|n2dxk`CN3DmGxBL%l0lnT0x|DR zV318%{0i}9y@+mK7#pi&MA@_YzFr;5xg>nngRXqf7XR+a_hNGU*@o@KzdznBU@u1P zJY3Z(d2~9bDJ0UO3>Q(lx!u6G*`v5Tm?M442`FS! z&zEBEd|N7V(%Ts9;CnjNVcB~9Ah{#k+Ho>hE!SK6Dg!w7zmMVqWNKxc}Ter?vul?!OmmKO}F4mpFS za7Qe^xL)58uS>i&sCx{#zap8e%HE*~FQth2UOzWChr5t(v7!M%)s*GpeTmBm(u7N_ zUE6^dH2_cY(aHSG8S@n;JTbY~mM?2??noYxjOGK5tS)Cgb+wIJg*SR z4c|bje>F;Za&ed(>;X+#BsMSZKC%K56+A|-0aR;VB!j;ZXW-U+`(-N$3CV&>6fU}> zy`*Gg5b*puT4TP#2FRrkBDH`hyiWX4yM6CAs8Ydp#6r-IYdV3VR#F5h2e5bV`W(hB zT$30i#j29w(wH<4Ahh6iUBqn^x(I~}#^CmgJpascJ)=0lcFyp|A}|pkEt@!P0A+(tgp=o*?N1jDPfK) z&ydwtE@ojZ>-83W$q*V>=PEz!BHXG?8GsIQRV&wEq?!0=Zu0HShbZ?mF)0&Riv9;d zn9Yz(J?P$5z)nifx%}ILUNcD4Z3V4&`2H(8E8Rzzk80C3oS}Qfz)vS|H+7kB4IP6L{1&TT<1U%{SnSYfZ+sIvAEA$YhbiRyIZ#50i)1NMViLoGD^KTMQFvUkqDujRZ%N#;5D!6bEG0`EZl{W;AvKH< zuN?v)C@%9u@F3x za9hzd!^2_qjgEfacJ?QB7Sh&(e(}%{p6Ls4J$?4<`1t6E9t4^X7;5`|JI9#vWb35Uj!^ zT_&-UD6{mTu-6RBZdg@66mp^-rdXlG5Ocn4U^LW5@zw10t%Z}*E=OSUiJxk-u_HgU zJt|uJr>>tcyLQy(=4O!J+1_tE#4kTp)QFfIzB%W&c&1N62frUY3n#I*2-oY173?_6 zw4h0+?X||A} zb3YOC5c{=%G2*Tk@rL#E-A$PfmLCZY8DGxVfsO+P$T7rrKW{(!sd4%u^|;vjg$eqX z4!n|VboX>?`jC!aId@`RBcH}5vM(CCxI{QTJ>49Uam(`P=5~91{oFzL9ys#?a8buV z#pI=eONYeM1o^G1gKWp~hEh-Hu}=|O0qBc{2xc>XycFR9OFuA!`eQ!M3yU#pZlEgT zA2B~ska0Q@=lFGW_=&{hMkGVCf0v=r--Sgr-+z}SUcyC#gVJ-07-OCHlWt1|3!g%g^ zvhyfa4+qa0PdeF^@(aA>eV=-{4k)S-y7=i@9Wym`CWkbwSb$~XnM=c*SPP6OqT792b)xPWeeknFc06)2W_IY` zpL_E7dut;B`YL+U|JmzWANZtEg=BiFlM)5#7_|1CRjuQ{E0=ZI~ajuS(TU4c(+;5i( zsBX|UUm19zweea{Q_=<55t$)jCoQqL>_Yf3mB%KLoz%hnh%Uz>nbN_oWd>9x53D=xqEX8!VW7R&Rri zq;Z;M|9kmmisu_%vW((fRt~Y(3#u32xje3l@TWH9yex*72GLix$UwSMDs(yeO7_Hw zMd5R&q)x`Up^~G3;Gav!37<;m2($by32NP<_D>HV5%DaHDYyY!BbV~uM^d)DtX{Ej zg&KaUhQ8i7QyfS?Rs13VT=7SKSo@6S4ShX6HHUu+cUWaIF1!1BJ3**6nA$Lu8BLB$ zk#~n@`!Oop=LwDPx5iv@qU0XLK%Z=7n!{uvAQ${6mEThY55<(1CfwT>BhVhLAlXW3 z*mI=-1d-HJJ|cUvmupa)9>YvDnC!vl&09nk=rK9Qo$3Q@+$QfD!^RZzxt7&nhB9~a zy6-iRY{=#fke|~Z7x^QT z)89WV2scS!Q@wCawG|xBIf`lQDipCeEQfTprQ_A}_23lWzHOgg&HGxfHMzd}-n>#v zcmM&QYA-Nz4zHN-45RP;{{G6qw~;yE{ss@{+Rxdvjp0Wc=}P5ZPHy~TQrw4m&;85x zRrR8aW0D7Ti`{A~z8#lgj_FB~ZR(d`%lJ-RBTo*1JxLrRip|pnCw<6?0sgtw9O-f z<%L_l(YZ3^cKOj7*Ibls`E*F2HO~W=zw#GvV3E*I;YHtKFV-zXo~EU3PbGazQc@yRYKPe6Q*F}mYDcsX2zK>Zqi=D{u~R6% z?H;Cp!ClbCBrspzm7v%@{IZh94_}G57nw)jN2SQ$%6Mm0Y(CDsbge~=<@UM*`xC#_ zhl6RR$kqsVSc(lTnQ>eLo44K$M=_UgWd~xyCE`2xCrn4^L9}kajr=SBYL9dNhSi>o zim{7rkzXI|JHI8-94pl)^t`21euEr&506+ocrd1Q%0cXtEu!q3RPk-fWMLWjfW4<1 zN6EHUmAD}~aF}vPmJ&7NS!@x_7x}%nh_S?a3~#)<0ZZw0!IG!QBjwxP?d%-lH0K&o zaABRosr+?+&)u5>wu`^mZE+aSDkD&F$i3PU?2|Drt+2Xzoj30u(a+oKr>dR!R*@Y$ z^*u4-x#{rxB=HJ?0>0C8_a`MLUxHl}w)-1{_#Cx+W~lt6Gcr26`?GdDo(p=Kb)#?p z)JUL@`6oTO@K%SgtfzNb#$kt1FMK*ohR{rl`F`rWuu13rT^7m8eF*7osDJ-)&I6Aj zJ$lr@kf0?CZ`uO$RW2)udkb}tEL?774+~l(BlvAXKe~!~?z(WlV2UZ`9WiW@>P6~; zmmo*yq>t;Yahb`d8A;QI{S$_{$;nL##EN3bGqg-v#==+hF47}0r~CDt zD9SW(y|BS@j=$CwTg}=o1fe*{n~w|6oU7u;MPc2v&B{*QH|7H_SVZsjH3NoZw0|0B zWYDTh-qkjW&DiK|Z|0f!;J?75nwdBGaqN)#xIEoWY$EH@FdjJ<_3&X7R*FQ1iBQ&FgNyvED2Xe;&-8X}$+6PM?C9)J#-F%vuyR(sS{|7UzhUb4|CS{isTYVGjf{ z6-8AoiscQB>mn@G6s{8z-Y<+?=JjM#DM^MnL}gn4W&z~slv-IIvnY_`D3FEgDoiN- zE3k&(zXcPpWCZY}f2UQML)pP}EIhPoV4o1e!iu%0jjWhzGlm}t0Eso;Mfi#zSqglB z%skE~Iap!=BaVOxI@{@{W$6tn6b`4x24D-%B;ES4p&Y`ZVfL9Bm_p+qVpIeo*5{dP zK_3UeNj8d&rgwi4^+pM9g9X5DJe;)ez0E;m7`?`YZnM*jqx+FTBd5D=$t`^Dk%Tsks|Y5~ z&s7ZQ)dT#qGj8vr7+EhEQXZNqz#FM})h{~SXvg|TNx&@O7uJ5^JVtk&2=YPwe9q(m zsW>ufjSi}x!~hp`^eNI)$5?8CSBWh870(zvU??MM6+2x8o(Ma9H!q2uX2v9*zQJ{Kb)}pL^`wfHhV>sU7d$WNV zN`!{Nl+`;X)`DGOx1{M=hqotO(0mlOB4YL}u3q@rhb(aib?E48q-iafPJcSmw8Stc zQqx_GchR|c;SiJ_-9eX}`g2{*A_Rw^#JUa_g#qS6SfGsA=8qQsVm9uR?M7ryi3-8T z01m~^7H8ja^G7Y+?~l=XiJu(MXu<0`eioz*f5}$~>fkVgz}*R<0m;$x&%tb`h->Vq zxoEJPM`poDsB?x~8xAhcN31p`QsD!0(iCU*F3J*25dFO6OHAITAi?!Vj}L6z2qJK? zhO;M3e5>~q`z$?yNPVU{*Zl);Vrl}+VMIhj&1$xK=H^$OtzJKAV|QPMGL15C9gXlI z!%5hE*s0JV1L8EBK+1$Nol(dh#~1yIe5{523wp+q-J48w5X}xXQ>< zSvFR5K25cJmGOrUOEaqS@sojyI(IX&tteNQQt?|HalC=Q?(vxe=-3=Qae???&|J<<=ppk=sZKxdCy z-(bD2|K7x_#jH-oc6leg?zF3?^(P~1f%GDclIzKmue-z?6!rb1RnU~y)F?wb1aUw^ z4$TSwt)rkL;x_+j-2-;3gfM9fLEhyKR;`$iO*h8>)KYkLqP0 zzy+D=Mh8GPc=a3}e=qBU`rqB#4GYXM&kBw}j}OFhks$w=(g2yDS{r zI-fDY9rv?0R8PrZ)LW6(D^ZJU6K;+0H~U9l*wNWF4(>ZlY;|le?T{%0zi`K0Rll`* zF@KSVv22vG(+SsIHNp7s{qhYdoy@%lScw+708S--TSpAuczgR~<)hBqx4lkH={r*9 zYk}h>MkTZP-}@Lb1C1~JUO0PAGeF3&_XK1G$WrnIJ!Od&`HF=ksB-P<<9_n#8% z-uqmYW0yo(lR^XN=S@9>4QKq&%mrT%62GSzM{~Ifau7FctGknP{jPcUxp+? zFCpVDRugsbB!w(?lm6%Z?j2XGDnc+FcUQ0ivEMxrkuTh$NL<8QABZ}<^A2aPk%ktV z@NXYN&A)B^XTs7;$)U&9P2JJQitkRUXD_u8uk?3vAIZiHha5cAviOL%K5gX@5L0{~ zWs^sbca`m~jlFk2XChIc_%!uIu|ANG*a-?zPbtZ}al@7hNUA>b4|inniKDm?OaT}| zXeWK?HyEW`c3FgB6r=43LAM;rsyOOzPy5g&@RU2w3A_&m(Fy{}5d}d+loSll5kl zWt>|eJK{4szoO;MS3YN)>&69WJVg5?Mf?O4ax5u*HxPAqFzegMh_z=^EYNN(H5X

lFbxHUO0+F#kkq z+KbkJ|z|B<1uWBP;)Ub6Qn5weqx{tmx%G(NsgN*_06&)~k z2aOpR3(+)=;W#7hTyS<9UtQa z4ogW~iJp=`8eOqFgJIkROA`&`5kIut&dKT4|I-#$mFskk_3$eN(-%S>=Z8#g|7oV; z8z>+uayXYLdouM=B#RB~wED+C+9Y)1_Gd}$PBcB8A2I8KJ(kt4fz5sseHE2nvyD_; zU9wRU1_p+^&q^*G+jR4!e<0B<@7*PGjN(3U7Sw|f0XC3oo%0oh9r#>6+LnF!(oBF_ zh)*pKWu`1DF!B8Nax&O0&3Qy6pG2Lz6oUlu(j>PG@@cdd_}DW6m8kt0YidNCy|PJ4 z9d;L{V$rFtp}~|0JS6FAUqfpis zQq&iaY4I+-`5x-_?4wE9zyoSKAUGpUFjb4yABA1?Ly zpsVDEk@T5Si33nSUAl14g>jaBUIAgoxlay>z6mQmZrSqx&aDAwGHI}%*5TFtZ2cnE zzkmkSng)&o@8=jmU~O%!2^+QGn^I4M3R|u!t*;jwA036nwS8Sc()2h)9MDC&WLdue zoSS(|Sj*qCe(ytisHos6SARP4T!lc(BN}O@4d8XD8M}wPg)|4o3y&s0k6nd2^XZ-l zv{sX`0k6QZl!UfVvTf{4OiaYKAAqCtj<{Vdlp9%|?EPz)I4(-gUP0aMeDfI)6W#93Etu)g) zA-7hu4=+W|rGm>92Ba9jfM|2T~?zNVSr$5+JV zHcFc_c$18f1fg9|%ciKz!5Dsi{#kLyUk0O8%8Z_nhl6ree4E6;>FPip=Hc|;jHi4f* zZ<*@j4w)(F9)Nb7JLacB>?kde_-L@rg(~<3K$`!J=;(*9DmdW}2!DE0vSpo|obbl1 z%_{s9IkcIbnd#6Ykbdbpu3K%5cKjvMT*91^sA#2H3OTl6DS+`0_|gTdZ1)v|2CuHZ zJ|HT?=|M_DhEqujO*4)D=JFbyf8Gy;M15gb;fjh%W_WU*;{xyYdsEE%5j9DdHx*Fu zKv~?u!NCmFqdrJeKi3Zlu*zS88icd~g*x%o_m>pna1^+)^B0ufbX$%WR&V( zod3xYcKr0k^==jSAL~sxfCj%x14(?qWCz!Z`+GsC7=v@~qsz68EjX`~8&fLA6(m4o z7igVQVuo#A&q#4rE-kQ@*JyU*djGz~hn~LEXiz_VDtEd6Qioeb8a#M^5dW*$jSHfx z=))Ia=v3=|lsR2%^O@Jq^gLbG@1)Xmd&Zhf*U!#w)1%P9X~u;y2dCvrYGzPdEl7SU zhmT<`QZi6}+2#M|?o_HB7Y=Nopg-+bpQc`;_!mrAa&KY<{G;h1`2HJ$^}k6O{eKlK z{Lc+m@UP<))pFwr_PB7i=6vVlTIWC(X_bj21V9AxwLL!+=eIX<%uuz~X84099EU^M zX3c>CItofxhn8PD{P!ziLlX0PeoasqRtnv?G0|}#gU<^DyssBt)FR`_K7iXC%GmB3 z3y^1~#&7VA`!^X|*4xKFLVT)_n{ ztf~#fg5Nv4Pj`d97CA&4nXJi9&P6dAfVPjgq*V+z*q+ge_`zq=66$=Vh?Zd;5gkkp zVFXEQZTy*TLy}w_Aa%zLKo2du-nN6q0Mm8k@CR8*s@MQB)DWl;^84Q@bY6yynGqJ* z3f$Rq0#X6*km#MkWmh||t*QMMoeNC#D}GoO+}%rGe^UQ}Ltz%!yMc`J=jLb4r$kId zzdCcOPST6cjf!`S0dLNCKeAs4%!0V4c%X@=9oFAtEvw9x<|12A-Rd_Js|~isL5|7n zHE3o%L1|RBwqBkX@SSW_n6!!%**a!PdpQ~bbn3qsqF*_1zRTC-JWK$@3%2}^`$5t#8;p>F!60#HGBI^~lnS?eg z!cX7*0#uM4a>=T{bj{3e#Q=~ChLt4czBVFZ=DYq$$yB-Z`zsoS9ys5C`bEqW4GoQY z3z}OJb57Xp#oB0Lno#XB^^SE|16xG?e$LZJm(MpvKNL{DEE`>-UuEz^zZB5{oqRSC z@Q>bP~Zooq13-tZTJcMQ1me(6sh_N2fI_5eNZ>dEo32`&IS z=mlcByNjCUO?m%Bogvwcb^ubzN1p&x!MEsTS2Ga)pI)-5O{1CSk5xR8+^6`|6?Hc# zDtZWOQzgk@Q->M%gG&-%uORoVQ zHa4qNtiHV{6sj5Igc^m?VnCLGwYmACF{`giy8m)y^bHkb$@;ekt#%^w6CiwP_zs4Dr2P{8LI=*4Mim8!gPq zs{SBDq|SmytjMOai!|Cg0J4zdtOglIjv#Ezn9= znq@e9l)nGE?dPmHAUZf=6&cDLXZ8TZBrIr#$#jQm$_f<@LH=w?v?~~k>+!VG%gl|9 z9ZjA#I5|LIzWCg=NsiaW#0wWkqEhwhDSTw+12%L4l^8DL%-%F7%LX2(}n6wxRJ&pRhI?a(<`H%mo%S}rv z)8Yzb4^$NtT;=xf1Xxf3QXnBw6W$0EgXCu@M)WpamECY|oje9!3es3b!E=BZ++73I zirlaXJ*-@-m1n+hva~_wYHYV<(606vSU=ahAO3`>bzl200#vd5hYzZ1YiskGD6=|h zYY!*k?w=g|@|{6{wI2y0HjfmB%R(`CB>Sgv%#-E(6*|K=;%>2n&o7+aIN!aX|7e`= z?qA`uXt$|{oNn1dglBbvc7%FC_@hW0y`A3fl)Na&mU{=1N}?dlX#>~ah2oUtY$Nt# zFrzGeaZFv@9%uwuQ>+uw7h}+ZKWDwr2aeJHxKIYp0wQpo!Gv6)h+caRM5Uh-ffPQ5 zdt$0Ik)`jSKG{?y!^x+7AfWo;{f0HCH{SzlWoDuyf>1Ktp8p^(I9~^g%V~K3>H9g^ ze;}Iw1v2yh*3EvuW@YqV4Do@xzmQ?nS#fQ~{Ij&Oxr0ayy6xs0k>D@Jq5{92W*f%f z0e~HnT@;p!mvpDwXXV%BZ$3JdvZZJSzL&M3rQWWVYkZpSbQuj(^ z{v|W)S&)oWdnoL?G$2D$gm|g67CBgwBWnA^{?GRqAQ&5ubTM9Hz7KRar3*D>l`m53 zPr!=n4xTv=%bwBz&%2lQH$hLLC+&0aa_QqcZ7iVe=3;ZI(J6NvgTa7Jt;DN30UOkB z1U5)nOKY%%LPuu5h0dw1+Vke>yeEZ64*)>IayOA+o4HBA@%Z)S>2Bu@7*B&tbQ9H$>`{I!=X?jXxD7ZR~<6uMoT0qn# zgfKCQpP4Zno0uqQX`zj@0L4sYlkL(I{_nnVp}1#0{bphgGj$O*AAFD?0hocf>(R4k z_rSyjLQgNOq~rljWJpVkRJPAbh6kod%LpIU*p``@`3$s(``-jj1GMJs@RruReTkmm zED^Td%4+Q0obr9`4>Ar(_}sWyALin}zhSrWpT2-=@$;>J(Io3PbE5SSJjQhD#9j$- zojHA6Utb^HyA<8q9+h4*%?ExjE-&}T^mG{dk+reEtkh3`xed2@%XDyLXnsKG>qmLZ zkg|RY!NwC35(0qYii)1^F%)0XeaPCi%}ph66_^duzFK-yG%?u{9vfr)I&$ZK2`U-l zmM$9?LT8;!@CIn-&xDDwb6YGq&4Zq2n) z!$qf_WWsE;`BM(VT89Q4+xB~A*i@FL+I(U^(?G!Jr0IIX13V&1ppRebp>rw&|3G1S z@{cJ7wL~QS+4pw+`B6={-At%32MLy{y=6WeslLsY@u`6T)ds|Pr1ZhFAy`2AeX#V1 zj|v-DlVR&Gt*q1;%9USOqXTwY4#jnZYpVH(yykr9F75=MAFk4YbM3#^;oAJmwm~At zf-+F{hc?XR4}8k;w}5tS`#NzK%~sK&rMbCzl}wHe+~@lG`mfqw`wwU6*~F#i^f6BY_az8~bB7Xje!Hfe1&W^JcoRramS?Zsy0 z-JF;&=k;| zIJNC7YwuE{Uw!sjikEPmwin+{W^Z>|kRt+Io9Q{Vv+-GJlcS@z9OZ%FAy`4%KQm(H z{TsKmg0|`G?ZBZYFKuKRS%(`gtj#PH}9 zS@ox^8_Zm2`(LKE?*F^?gA2=UvSNF-GwAmCfb>5WB>79&KYOOi{H~M`)Wl@-aOUa0 v0}8PC?bRP%Rd63Fl-UcE>+VBcR^U(hSeF9HX literal 13761 zcmd73bx>7b951>L-Q68h(jXxnhmaB!q+5`XZX}L?a0mhELw89_gMcC>2au3Px}>H1 zZhrT@Kkl2kGjHA>cix%Vxz1kuyT0q&>$4-ZwN&tNXm9`kz<;I+eE|TFLh!sF3j^Gj z;3wyT2Q&|bXS!J6F97Q`9K6PMRWPMe8HR4o=OIuFI{XseJtH=03RP8 zK6__J4{J+T8$K8JHyQg9ZG4ipobOR-zvzGUl>xuP3z}o16lS;{#aUb;jTlLr0&noY~pT7 zollhbjQ!g)fR$OyR%p9y^L8~ey{fFNyz1}V#G{e(6_b)~f{{KYol$sT1g7L1?58yiPc^Op&~w`SM0zR8;gX3_+PJ z#As_aF+F{e_;52tD5vy^h=}R<#DwRNcB&!(qyYxOy&tS00fb#f!1c-IdHuV*cp04M zaLzoXRXIh)?)O($S8b7;#B3jrR{P>y?CgB0x=4T>h>73UuRMQ1|L+bPK0ZES9HVSd zfZ$K5`6Kee-rio7jP&&E`s&Cn6qeSmGj3>RdV2Z>d*Xl!cx-*xPA=yI#*ZzqiFujw z(Y0mK%-tjPb=@*#0A9)R^^vtc&S zEPMMEAWqoz9JoR0>Q}&>{q@TgpO_cTl?+w@x3g4KRNSJhd>H2QMg42P$+p(k$%lLQ`_r}71h6wGOKpdo4h>`phtsVoc>FRRaFvF6Y4hXmoOnHA z9;W;!?4Zh?m<4DF;H?&FW{BQ0BQ%5nPfySIV=0I5f!F_b0OxNOg7v`suhG$?tWtXk zgpkcogTcB#jXXQ;QBgQn8yq1&5gP1P)jI z|5>Y@??DH9#raJWRdxHA0&qb|BUs{R9>6EiEa6<|U{Xo_T3NASyY%;uO zYHG@eMSX7x?0x2LXi5XMg`zs;Xg!QG@@;i7`MLYAc)=zP|Sn)yeTe z=@JIgrEg||OnfF%!6DU)#`v_S_&|z{DOpli64y&Dm$z@{lQr1yne}a3$=BGFy$zkY z3X2MRwx|J+*Uxwb)Q>g!2~)aNVgMMzm}k)Flgj7rdLBn57?u2Hn^c!9Ss%TRNtPwm zaB4_j_m2z-FNaV|syOSV9IG(!_&iIZfmwk#bHp+7*sP@oYdOa$%~dCeY`#k9G)5;O?UU=cvukBjTcrV{Ya# z^7_KHK(XoL1$ht+=d6)*?~A1uLltLUOH247QvWKat;fzZ&ArtCk4-rkrH1HlHs8e5 z&}?Vn1x|t`m3^SUn>I>dV4(irjD;+2VOz7^{^K}g0H5&lPzNhiSY9`@msyzu)%UkR zj2k^YJ=qGc7niVXUeAshOZuJ^Fu!v+q9<<>>na<@_8=)AurTTQG}arnHqD7xm1CN- z5qq*e&sjb-i|S`?kC(*tzZQx^JtWBv*I+;Po#s=zZO4dANTpJ;d!N=H%X>j@Ij%7M zPf2y;BSHlcj_U1`xxMPr7O~yfMsCPFi_NBR0F+`J;+ImERm0_kE7y!bF8a7>uyCofm`1(-)Y4Lp$V8svw)JLWw5aCK~}FC*4=qaI$(1e(91 zQ_wQM{uea&wYK&M@C`9MohpnDQ~)@IvSyfAtLAa( zTxO>AyWkDPZk~VrM=f@&CcIeNTy`bA2QozL1E)SeObfUt_-%TwSUUM4=d5}xCjz)3 z@iQPJ9Ss+7mT`MSIw}D$dWvI4kq}po^M4DvXb7L*#XS5XuWsHCp4spSY8q4nR z+X9uiJ1SUC>uqMTZtQ+jQ08*LyR!Lx=zPGQ};^nKhGYK;P*#0QU=|#ox6zV>`TZ| zCjnhzrU9X&wGzS&-fO%cF7~RW7*w zr3M}Ytw+L0GeST8GPWm>wtUP{eli}?Pa{746|$<3v_l6t0yh~Qjm8?Cq2*IATBV-b zo$q)xb7{Zw>(EFOSpE?n9-ae^(#7NYVee>XcQF%&O{#^b7K)e>I+{`uIr1k3+%lJ=bVe_!@TG9OL~ZbG`nA;p@X!J(4}NOS4^mp+p)9eyRf}07BBjrID>BZ!aqqP zabWEu)qK7A*yyO+OL(&e6c;p{(*iLZ_}x_cs)MCz$MJOb>HW-G;g*@ywlZU&PkfPL zQ`t|<^RHP+j(P~>UOVp(oV_~Sx?=8MW5b^_h65QIW3oMp{$;X~>rSe!KUOsASux-o z-}lo--R75%{2`9_gx3rw*ir(s+>7irn#DM#7bA&wIAluEYX?6c^yfigITLr|RaI5$ zw^Dn4s-Q0#gl}0xJ!8&hKU9c+)z{ZQUwL=%)kpeYMg-dHoTDIsl*s9(|Ho1)w{V;g z*#~)Le3$m4UdeFF035mDBUGSY8y`m9-u}evAdIOlWR0>F>DP zPY={enDD)aOKtWzYRgnGD@GoX(=qNemV&_y+0`aCdQvsfmxFFEhJ+#WTs$IMRB;T4 z%*{4!+u8k1$E(7lC$RC{-U#>8U%GOdDPIlxj>uRwllJx;Za8s^zqr_6|TsK`|htGj_sNjGlhJfMN+D>%BDa5+=&B7G=YMSjyv>jf#I^!Qs1WP>S}x- z?Q$NJm`w;0bdul7iNHv$SzWsJ0$0c>LG_X?O{}y&gZo`|@v*~qp^$J*2fj_%0Dt<^zknM6K!s$2` ztisi7`5djSt@Fo0u?8sU&xpYM=I4jqh(}l}SAqR-qkX&TyLQ@8N+Id|NEX$&zt-XwR(4IrRbfWcZaP&k z^g7kemxe0=`R*TO!t(l{H;s0(6kX@JuQaDiWIIb1R-q_rPYAYFouP|A-$}tD@-(KW z6o(?qr*d{0uDju)_x9omA@}*MhG{bgzDbB2Pm{Unpg4>lLtaRm4VAPOb;dZmrhst| zMkI1`JJcgggnn@d*}WJDI@V_f2nFUR6Jziq9l0~thIu7fbw zY1v~Ig-=-jp40I~B=rPW#H zb@BW+Ubg$I-%jj16@sDGUjCcz;__AuoMvWWC5sw+ z1W{owUt9fMJEzLaUC+`UlzV3A7biZL@zR2xon0rV>rE9FQ&9sP1 zR-{xig3-NMHlYM1&St|qOS!Fs;Pbqw+25?eMZYx%=BLj-@R&b-?cd|Tys)eKB?CdL z_=EZzk{>f^&n9-V$gXuIL&o_-&=l*ktI&i^?L93Q<9*VZIc;cN>w)RSwXc|P@F#?9 ze>u7bq3}KY)>!q|@&SRWaH+`JMwC>?fdu`zTIzN3Y@jKF{cOYlvyrO2I;JK{jb6?@ z*$mqZBh;IfBV@Ly7UHmdVKSHIBVWb`+(_5CoLEEJAq|eZ1kiT{jjQJ_lb8)YDoJ`> z9!~N^Hqjx(+M!8j>=wh~>~$^|XU0~1WBrXW^E>`C>;5=h9G?~&d$iagzWDyM9(ZP3 zW6?OA)~R6cvII*md5tJoq1g8yM2-!ygr;Z=BSIVUBe&Yx(rq+67$@#ox6Fhml=J$~ z!ni1_QPTF^=K#HtH7oq2po+#c)E2c1H9(74K=Sg?famt7&8Lag{Me+Bj zB>g^V?%(xWKsj8MqT0tP3(z(e+XyK&gQuogXg6Aa77nM$A+TIwCAj1U|0Mz5rKq%P5XT5gB&31 z4FhjzaR6V#;MO+$y&Y}ZT9$Mwe5?bCLKnHOJz)#}*Fv|{4!9nrxBE`cuvtu-#}lz} zzZopuiNyr#o}ziVICHznG;IeED8aw{II@?RH;!LWV*sj@nx$(y@a}oPEdRT94|7k! z`S(YDwg`aEO@vP-IP$U@%?R;u@l(&6s&n zD1%co)%2TWFM;q%z4dObwy9a8WoTrDd}!obmoA~wp{wvH(!9sZmsIT^FLQv3Fd>Bt zML8ND#oLl>%tM_$Z!8Cy#IM%7kk>x3doUrU4D5zIf3nOGU;6KR`8&N(*TBW_?~Q_D zfy0Td}eH4Qw9p&H3ZoTGJq?d1K8eozQ7jN|!we@QQ*17?szYCH;7 zyQYyX0bGKg`qpVr9ioG_kJVJ(lZ(3GvyBF!l_^E0|Czuo}6er_+ zdX>Ab_CttofR*?B*7Jp33o<^)a**6JNSr|{yp`w7jYl{*E?H!ut%BVj{c0Q1Ksj>&hA*; zlCp7#3XP!d!#pY6ttb2)PZgv#wor)Kr1|qVQlm==7j6rVSQZ&06A5gq284M#56n~p zs;}4hJUZ4N*JpOGQ#mh=-UfUPLM@VNboFgqQypx1p~xou+;-zj+GRn--|5JTSFQpr zHOVw@_qmw(JnRn|2GFrc(k>ZqvqM7hD^d^xP4VidpAHBcsl){I{V&%xV^$vx6&aT0 z#a}P+ILfHsHWP|nrf_UYe!wO@Ly-C3uLP}mREJ-=%6@j=2!wTeFhTuS4I2U`Yt!F6 zNz~)EE$%QYxy3aU?YDgeaZ|s&R^66*A;0YIWEn&-0Xrw-ygqpxu{fw5nC&JwO1APo z@@;T^njP+?mBMW-LF(eKzP#Q{TSe;kPGLqi%h*6C-FNq%D3g$fxCF~a{!Ebs3{k1hriyCuV$lG+pxXo}UN*B6zhF`LKUVjUq zOf+hZr1Lh8NKk}&fW;|uy1#XF+gtYvxUfn0d%_#0{DNH3fDHKC^>%tWTH&_TDQY2j zKg=j%*zDB~InZfo%dJ4;rOmw%7b0|QM%WNGR;wMI+DJ6Y1u(qXKvm+otNEcHUk|XQ zT?Xwv8Cp+m5+@!#0*2+h7Yq1+5y4~H%fd~09GL08I&sa_TfU>H$Ieh)^adprAq78N zOAMFae^Xu31Z0*&Ij^JD z5q53?#St}h0Kk%twPb}izdZ3L#8QIzmQdJ*G2uJDEdd6ft^}=`Mm8a-Vf1LSHp>Za z>4C2l3?!x#GW`sCkIOc!PckZf8I@4wqZK~;w3Pu!n?bVDqyAMohjNbI;7+jAeJ;Rq z>p*LWk41IGBmQV(d;Yy>yqzWNJ$yr+cVg4T&zA;P20g(OuKpKGEpgil*LmRzPpxX7 z2O}bh(ys-7>79#NRXKEfrl@OUnDU>sRwPQbCjv4mP+8tF<4L^Nlqnj_ua%UceezD0 zmT{V9s!&<04S~;1bA`LlSrlR^!)k2Q*YSv#-&L8mO+LzJL$-UK?atU5bh6Sf2-WqJ zl3sN#T{)R+Kz(`&i#(&^j5*~)9H=WXYiPO*`=ea%QBYeGo`3d{%Oq^5vA2VlGN^@V z^>%&0Whv;{axazMf4jRUm=3q|D^ud?FU@-yoK2Pl5Ys=0nzQB;Zv50}ikY{XIKW?e zOV7?<&ty`?&#y!P;ezDA6l0{)(Aen8I3xca=7cs;%}ngv;3{<5XRW&8{Ql0IUjPZ9 zK)ol^17tqmeoyeuEXh3oSx~f!M=Ls{@O^sSz$*A*K=lhwg6`qO7{Bm%m5~8Cw^qH# zEMx$qZkDh@L^SHEVk^Ev9QDVL*+xsgiSj@4^$@C})pfPDD7Y>0C^=9CBYD(BwTJam zi_#ZQHSgmMAY;GXj@f^tHdbX+GNZ zJaw_bCB3r7M28ZB(4|Q$wGxG%W=AmUz^Neq_9#*~-z*l)*+u zC%94Y3w>}_!KpV(T?S7|m`Mm4U>&)Y*vLw3x`iW#4MVr^fZx#2Z8{<6^TuyPCY&R& z_0zP;n3TQI)9OYFuG+pcFy&t_Q7O8gt@?Y4El}pex%w_)YSW|i(~#UH!AC3-7^sUO zuLM1oCQn)s!OXgp)r@`eUW?L1#RCUyYE?|1`retCmYDfrTuCCN-!-;)@6AGZ+4PMR z$4oZ`EDn!-nr7W;B-Yf%Lvx?>0p&_->t$^Rz)~RbKW;V`MeL|KUc6K71us%M=N7y; zZw2gFM*T2k8>K@|bLsT?0xz644{du|YAoglQ^O>MmBoe+{jf0I<~Y5jEM$oam_xKk zLW6p6#-B4=>EhIL-r&i#MVQaJJ>`0xaJw9Ex3vcZQM`(Qb1FfLpEoV5#0Nf``RMAR zxT)|}V=aGini&sLnQlPEh|HFrJ8?kAKbqDdTgIa8NVDHZxiY>Db#3-hLVnS$zz1U+ zs#3Gu$EEiPfz#&}g*&C=%eUU+vEM)Yb!5(3f8BRhyuRYUq~xMQ1uH5~7|WyAsBO*Y zSvs5us3#MC{#hUg(j)C;>rB0|RnoM7Xo97&mN+=W`&sn5qzdH|KUJ>lar-B^+@YlO z%h?tinF}?@8#KBF|NRtInG~6#Fob4X%?{^b^yj_J_cdGZrxy(6? zg!P>Uzun+j{?dM(Bvvj;m&!@AoWXakU4QDXZEb6|3OC@e{JjN7b)v@>Y$M7=j%`|5_rT zP*CfW>2n*;7=++dY${Z?6KZq-1rAUAjVnO993p!t*| z_#GC2cY;zZ z8-Q>}pkvxp3!o^#vRbq3As>)kY>%fe7*q;wRyf9#;!Y!jb*gydaV9Y}jUFT%ll{q}80Aa^8`Y&(mzV$NZ}qK$6r`7Ws{$@D1MYW43%QpejU&?ofE_DRq~g zLA`v(rs843b>kS=kXRmwl8mp6^0b+uzlNn5`^hh znn$)hI-|tLnxi5{yBm4Uxyj5j{mY0^YarrR(`=P@C4PDzyYtJmz5LZs}eES{ehR2 zY$olSVobQFQk=Y)87+qt+|_no4k|z9SFa$l=rmhz{QAFoS8})P$(jK@pQ%NV*>D^6?n#NEgd65^d>a^n1A;vh5awG*7oh&2u2_2oa2Qm-6-@uq8CR8J5!nwV{) z%+!Soz2+3ON8`a=dwk4vPqck?`9V24p8B^7yyhdxKmTQJF&XyzZ6OLv=swf(_rLZ` z=W-u=0w6yXTsZ0+XV~&ux6gq7cQZ_wmo&nFAQ3B5AH@cA0?f<3d0-Blp_mz2+PEma zJogo z*ZE0WC8Uwi6{*2GTfyVEEa~U~vON|)NgZA*nm8bZP%9ED>R&9@7Nig)RB?3N*@k+G z!d^m2{7N1F0?_lslhos>0Jt4FOlkH~)HWLv7#bSV4UqyD=&0t1}Lhl5AFd`{)+CA zZU#TOHo7B|x%IQZAqi3Ju&9fo;WE;}cQ>0+pMvxFjTMjT*s-%RHVC(Qe$^_bIETnZY`UceGX3_KAy4t*|rds50m zsq#Rb>cB^uS5+o{d4bMUy`3fF+tqryy1J0&%4xrbhKAb)XXp?i} z)7Hed;T6Wue8yXP>_muph4EI|z-so+6I(Mpiz-$PMK7<@J>V|S#D*M=S&VJ3&bY;W z{R8sG0}a<)=W)HKL>9P6?YG7t{Ikbsuuh9VC9m5REY)){uHR&BY;4d1 z27EpRm6dxGfVq!^(DA$iK7HY!7EzSSKCl&ppd|F7RfvKr<6e0t1 zGs&_0HtSWb0SU!Z`F5{P}x+{%vDJ10vzUHBx4?b_4=zyU>X%%omk>cU z!(;F0s7P(BRwBUF;I9w?W>(&1o))4g(aWa}-u_zb`{a+jhehVu0L+hEsj0 zXGg?TC@6-hzCF)M#`{1711TRWmTgdbQPH|fl%Y(UW3O^kkb<@0q|v4qv+2|Qy0!eq z#zx1hlkGVN2ZsdU*ZBB&Ew~s;3NGaqP?3@~T$fc=R^rNi4K&r!8FlTYezS`ebv*Ae z^85Vs)az-c_Y*NOl`8@rkk)r3Kzc^T2<|E$mWq(lULEaYK@{NK*k@W>=hNs!wW2@h zzZgU-SwDfCsCxNa+UvEG)1CDwI?g80??>Je(Wsl1W+XJ*3`FRE<@Vg4+i9M+}K=(#L+({8%AA@Eopk&Y7 zBOjCImz63>+;H(9BY-qw@YTd^8GPmD)KnJqC7NxaK_lS=tFJXj)yd_Ijpq`*^|P3; zLb(j$SD3&_rs}N@Z0B=!bd((A7(QPTd@stx%Pe!#wBuhTx_5S^IcK|wYUGc+(I~^= zz*6wU`CAtqO$F(?yS)xJ(bxB3g<{TKVTYva__RYX9%{_9Z~P04$lr6?*S4 zcHZ}~@gEB0m6VheG&Xv-=P&}#JB1F337e{$8X80*(x`A*uG~C4Jf2Y)pDMO)qcNwo z8>_mJumT1(7T@GquJjoX9BezVyBG-=q?#k(vrD|nO!>j4VB@z0a?iB?CK1>@J)He~ z`%{Zx{Ghp{J`;nj8y0Ap&XbXk5-#uZ2O=AqlxD zhdl}^8Yg0tL&)+;;2)`G>Khxg%cn3t<4_l+A~qZ9>&X`WKJL36jpe279Rm+!xx> zp$ugYSJLM4a8}Eq4$2wHuf?G4qYgh30v;BZLAP*M1S$$)mwsSKKvPjskF?>7Ut3Xs z=vJ)oFa=4_^01)U5xP1$I(o5ABhgA89>*)7-rVL-8K%QnYI0dwCJ6`JB7<-=T;B#VwNw+Tm^^>%&Xy?wF&_6*((R%$SRQzC{-jO}m=)?+eaYh&M|FzCPGxPtB%~7as+`i%lo=CL?UVDea zjWRMaTzITI?E3;eNy=aFKDl#!11>J_L7&if9nEsRTKu0*DPX8$eS`%p29YJ_yZqvK zs0v+bPvBpH?iG#M{C}+n{co4C{{Isw{I3Lucn@0PO9VwKtB5o`d&Y%#oVwM5wV&~l)Zux1*l2Z9rhTl|X$sD8tML>n|^M3lV zr=;G=P*^#vRpPxn_SjosL_TuI5pagMYRFwALZq-Qz%^QRGYOX}xw8*UG4J>^fHetZ zh?;>oYO7~NGfxOp5^?9xU@mvu;W3~S0o?8Mm60a{e3*v~xncX_m0sL1!fjti2p!5{ z95A`bsmOeT39|theoxs0iI9Lva%U8n3+jbb608%)qDVi)oANikM~+}O8I#q;IAngA z^BtcL$bCz6L6yKVf*uTjWBd3X{qS4-kr{?-l+3*}Y+H#hl{DOec)Ad%09;eh$E ztZD-Lp$_DlfGbe0a91V681^zos^9RN&`|>T+P$e4qq~Pf9Pk5i%e~f~ zX%}UF4sZ^5yz?%%7cQ#kHL~|}dH+M?`<0adZ`6H$j6aNSB z!hWw?$5WMmKF!zIj@+>0TqAFL;J0=!VYaEa4>GW~-S%__RU^~X<*Z}fqfr2*wXW)Y z-Jv9X7e6EuKUcDA0awzrIwf=Q)=j9?>vihWa(gjBbn0$En|F}Y9w)@rS6f29u7)Oz zkV@Q>8P@h4I%>&nVcF0-ix%z#)BA+2Qm8-L8heW!cvHEF*HQv)q(GV_0Xuk^GY$a{8-WO&U%_j2|kilNMUvoY0hSvKj>vU6wLXP7fWWw$2C!v1z(_`_bV8kFhmI5|5 ztLm-?Lw^>dL*U1nr@SIwBm#$FiyDZ^v%{QsisclSH-)mUDhE9R!|_ zA=__4aQUXG*a{*T{OumY20;{mW<{1cdOSwWO@1_ARFatxA~Rj}5nuJ^&+4ZqCz*JF zh=@ovgSabG*1+o&A5TxH+H(*aLS+O;V2VqfOp)yp*U3Zn?JFP`&+u+nkoA*l{YSc||4@a&r*vMvT%|56 zDZ$*^+q*vBn>$xyPqaTHW#d(LTJ8Oq@zlCE2Fw$TMoz$BbM()jKeuOdF4dU7b~)5Q z{!s~9LFd>~O@us-R(cvR3E6%v;GQtNxYJ9Pb0XI^MSQEX8Ej?rU3!0deSY9Vp##=G z;IgQ_@p#<^QtoU0gqhy6_N-vKV?l*cUS6*K@?~gxI*qQL-ZuffiHV7&`f)8~Lk08RG~qW|d(CdEwkU_1)vc}m zM-RjuJ5HIJUk~4*&AzJc%MUh#KM#1zCv#NWVsJ8oJKE?k{bwepYpSZP<19g)4`FC( zO0O&P5KXb4G(GUEwk#5AwLtwQQ%4^p5X$l%`u!c8D{+7+aUd7u+lch}{Cf>{;X&!* zlV6I2nwlUC|7F>P4oHpaBN8T--MJ=05JnEb%F7?e&^;wV#%QpI?(aJnj&Gj}A&?s9 zX)iz-lknc1KK=ZvQsQscE%wbtglre#K?{D0NX?No6-I~aI!nMEF78nWF*Pzn?BJ{H z{pEBhm?0w||g3(EjgB@pqn18aom&s97wuo@RrHg%q3Ri1Yby z5csval!xa0^>i{F%CfBYA9s{ba9^-|QvFCHQm&A*8DkegE#jc71m5vOd-jn*dKQ3z z9|JrL-We4Ku&{kNBPS;Z0QxuD{$5^QW#Bge)C*s`P|p{4z#;{9UUEsPL2}Y{nF9{1j3*?P1`Q>X*E`EgOJ#R;^X|LrY2eGhhC+n zr8(lLg)zQHz^3khWq%2%zR#lvF9fZ7yF_s*K^0hu)`%eok5=-XOklaBz13w=2Ef`S z_)^=wwcn^O9nyZa-*#{oQCVL8PZI<Unembl59Rvq-I*^X{NNqwkV2n>KTZ%ib8|-JSUPML8ZtP1 z*I5>T#R_wNMa3j2G!MS@`rL@qyf(&-(ngNo-Nlw__I~#9(&?0W69Jw0(*MowslUkf zfa|k8=|*yscupH3L=bn&gFO*Ac8{|dl$4Zw2db#0Aw?QBsI%{#dfpgse+0RK#2c*p zwXpCJ#Q!k>p<{!ug$AqJ_FJ?6{=~B#N{{3>Y3YBN^!Cev;TPNdR-w?HsRYSdfBtkVf{pJg9eqZXD4me6 zg~S?~ntbNAXLyUiF9)o4r)zI{SylWO9&A{(*PeuggedrZ%y}`0efMH~_vG-BpXbMU z@FCNNNH7&hcwd^}s$lhH_r)C{!;j6*8lpZ1d>-S*igyQpzKRXdfvzL$f>j;!e|jAX z{r_h38itBU`Y$nRu}#Dk&|G7f^l&#i!GN?On=1&fgX E0T3gT6aWAK diff --git a/js/id/ui/radial_menu.js b/js/id/ui/radial_menu.js index e718cfe51..7e893b754 100644 --- a/js/id/ui/radial_menu.js +++ b/js/id/ui/radial_menu.js @@ -17,7 +17,7 @@ iD.ui.RadialMenu = function(operations) { .attr('opacity', 0); menu.transition() - .attr('opacity', 0.8); + .attr('opacity', 1); var r = 50, a = Math.PI / 4, @@ -67,7 +67,7 @@ iD.ui.RadialMenu = function(operations) { .attr('height', 400); tooltip.append('xhtml:div') - .attr('class', 'radial-menu-tooltip'); + .attr('class', 'radial-menu-tooltip tooltip-inner'); function mouseover(d, i) { var angle = a0 + i * a, @@ -75,8 +75,8 @@ iD.ui.RadialMenu = function(operations) { dy = 0; tooltip - .attr('x', (r + 30) * Math.sin(angle) + dx) - .attr('y', (r + 30) * Math.cos(angle) + dy) + .attr('x', (r + 25) * Math.sin(angle) + dx) + .attr('y', (r + 25) * Math.cos(angle) + dy) .style('display', 'block') .select('div') .text(d.description); diff --git a/js/lib/d3.tail.js b/js/lib/d3.tail.js index 4afaf97ff..b97f0d0f6 100644 --- a/js/lib/d3.tail.js +++ b/js/lib/d3.tail.js @@ -1,7 +1,7 @@ d3.tail = function() { var text = false, container, - xmargin = 20, + xmargin = 25, tooltip_size = [0, 0], selection_size = [0, 0], transformProp = iD.util.prefixCSSProperty('Transform'); @@ -15,7 +15,7 @@ d3.tail = function() { function setup() { container = d3.select(document.body) - .append('div').attr('class', 'tail'); + .append('div').attr('class', 'tail tooltip-inner'); selection .on('mousemove.tail', mousemove)