From 53239a50198b61bdadce187a57e5a2357469509a Mon Sep 17 00:00:00 2001 From: Jovyn Tan Date: Tue, 12 Apr 2022 14:56:47 +0800 Subject: [PATCH 1/3] Upgrade bootswatch to v5.1.3 --- package-lock.json | 14 +++++++------- packages/core/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 25faa0fe9d..a803745679 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "babel-jest": "^27.5.1", "babel-loader": "^8.1.0", "bluebird": "^3.7.2", - "bootswatch": "^4.4.1", + "bootswatch": "^5.1.3", "chalk": "^3.0.0", "cheerio": "^0.22.0", "chokidar": "^3.3.0", @@ -6121,9 +6121,9 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "node_modules/bootswatch": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-4.6.1.tgz", - "integrity": "sha512-5vRhlIIvgZ2rH3QLHcVVa+Z+jNpn1/zEvGlJYkp4/g1LmsGY42S6IOpYyBu40RGjqqiYIjoeX/uWDdAAIYVG7A==" + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-5.1.3.tgz", + "integrity": "sha512-NmZFN6rOCoXWQ/PkzmD8FFWDe24kocX9OXWHNVaLxVVnpqpAzEbMFsf8bAfKwVtpNXibasZCzv09B5fLieAh2g==" }, "node_modules/brace-expansion": { "version": "1.1.11", @@ -29502,9 +29502,9 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "bootswatch": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-4.6.1.tgz", - "integrity": "sha512-5vRhlIIvgZ2rH3QLHcVVa+Z+jNpn1/zEvGlJYkp4/g1LmsGY42S6IOpYyBu40RGjqqiYIjoeX/uWDdAAIYVG7A==" + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-5.1.3.tgz", + "integrity": "sha512-NmZFN6rOCoXWQ/PkzmD8FFWDe24kocX9OXWHNVaLxVVnpqpAzEbMFsf8bAfKwVtpNXibasZCzv09B5fLieAh2g==" }, "brace-expansion": { "version": "1.1.11", diff --git a/packages/core/package.json b/packages/core/package.json index 55daee2afc..5c25af2bc9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@primer/octicons": "^15.0.1", "@sindresorhus/slugify": "^0.9.1", "bluebird": "^3.7.2", - "bootswatch": "^4.4.1", + "bootswatch": "^5.1.3", "cheerio": "^0.22.0", "crypto-js": "^4.0.0", "csv-parse": "^4.14.2", From 661724ad87a816df48cd669dcc1667946f146401 Mon Sep 17 00:00:00 2001 From: Jovyn Tan Date: Tue, 12 Apr 2022 14:56:56 +0800 Subject: [PATCH 2/3] Add zephyr theme --- packages/core/src/Site/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/core/src/Site/index.js b/packages/core/src/Site/index.js index ba116658db..bb6918689c 100644 --- a/packages/core/src/Site/index.js +++ b/packages/core/src/Site/index.js @@ -93,6 +93,7 @@ const SUPPORTED_THEMES_PATHS = { 'bootswatch-spacelab': getBootswatchThemePath('spacelab'), 'bootswatch-united': getBootswatchThemePath('united'), 'bootswatch-yeti': getBootswatchThemePath('yeti'), + 'bootswatch-zephyr': getBootswatchThemePath('zephyr'), }; const HIGHLIGHT_ASSETS = { From 6b3f602f23c3d862c6572a319c9cce91c4c787b8 Mon Sep 17 00:00:00 2001 From: Jovyn Tan Date: Tue, 12 Apr 2022 15:08:09 +0800 Subject: [PATCH 3/3] Update docs --- docs/images/bootswatch/zephyr.png | Bin 0 -> 14971 bytes docs/userGuide/themes.md | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docs/images/bootswatch/zephyr.png diff --git a/docs/images/bootswatch/zephyr.png b/docs/images/bootswatch/zephyr.png new file mode 100644 index 0000000000000000000000000000000000000000..da3bf738bc18bed7a07c81a8fd3caf220eb8de80 GIT binary patch literal 14971 zcmb`s1yEc;()Ta0_n1g1c*w;1C=VB!tB^xCIZci@UoA_g&mw7PrL~yL|tB zRj>YAuj<|V>UB+>IWsNO)6?B&s!zDOsvI`P2MhoJfUO`etpNZaK>+|nT{NWEnSpL$ z;@1IOU0F-!<>iG(Z;!psAJ*~h1Do>_6Wi1CGc`Svg1QbI4u5=n9Gkme+uFOmy}iD^ zetLfK2?*WX+=f3q#}{3;ws#5`?Y}%f508!qhDHw0+_w+kiJ3xyuAbXFyR4i%@=9u! z-yQGo@AC?ZPtVS$XXk6`8i%It_V%Iki%Zhh2Ld7z_F<=L+Jt=Kd$iX&Hw{#|EB9 zE30c!v5Cr>`stNdst$)QPmh)XCj&zxkvSJ8KF3KZskXr<$0w&ZkMM={hnI)@?y2@qg&(Nf-qAD#TJ3c9`vbyf4iwDnVq0PNV4W~n0W6P6^r{vPB>h7Dd@d-my z%Yw#h_xSU!o?iG)S8-XT)nM-Ll#A81^}D%Tv6k@fKV1qchO=_>!He)OU5O97drwze z!Bcf^f#nylr`4^8>>5~T=K1sO;neB2nWfE+xfS%_Q1Qn>LsJV+L*RD@r^k~y-^t3` z`{(Dovt8&}VM*zAm&MEqe0^gxCLx8E*L_>x_#A%obbalec>Z*~uVa<+`1Epg_IP;( z+rPOu^bgX~Hx-kV^-VfoIN!gUPO93Rkd#rlZtprTC{{L%KaPktv9i<9HBtSdb$|a5 zlz#Dedb+%_npx0i)R!*T9{pJ%WdA1+27@gwE!|Fn9}Y(Seh1wQxRSBETn`Ng#nfN- zIzUezudeU5u206m>m!G2g=>RRNiE^g@t``GuG^7>CG_!prSD*AT~2xB6W{a0)xUwI z*tu4p@M?O|+|#5~4)NbdCs**L;-8~MP%l42&*S^m)%2xq_<93;wbISgds9_&O+;et z>S%rIXnXJQer_%yv-6^&+QKR4X2`p_VXy=S3|r{CU> zpZAMPjXP6D=C(m;C->{??5gA82~Fj7rGI==wU1qtWd0_x1R0s zw~uuzu+AXg9`4B6>E*Yc&84WT%4f>Z%?NfNO9yYRi8{3Ers<6e`cr`3Tn`>M6}z_Iw-s>j ze8vf#I5ww(iQ63&x;Ivq-VQqbhyN-!!8a_#BGmnJct9h2HEt-5YwlP`ch z^O@TWhx}ObJ?2y8)LAR&=7Y*lDC!n?(T|H5?!{=l6ERR@=n3r-v-2ts?W{lkJ+OAy zQ0(4>^)nyEzP_6}VCdHCvydPVxkAqI$=|5vjQDeCTov77pA_5e6IsM2Sb>=t6US#h zZ{a3y){~`gKS>0{woB6AM2XvqO z--5G2G{e~S3KV}&Xs%o(V-i#kil{@^sDM)x&QP`Yf~gszFd>P;G8U3%$<$pcuYsyQ zebNT$m=^oL`yEuH<0vSJivzbZl}UdO;go$LSc|?(|ojyA2wu^O4C&( zMj!T8D*lsAEudvI_L&-TO?H(~F5luz^>fG~GvKonAAl=Y*2!Ij z9f$cR-ap>c5%0>hb-IJRLbCTyynEdhV9_@y4a?|X}7W4U7W-8l{3+rq0Qx}4NRO#mCR;nFjIN+x|+hi}|MqTO& z8F^52K#l(B9xFg>&8>N9Fyn2cC#U%H zrO&=^zk8}pAo6YJ-T`LT0fv}mz^XQW)rah#e!^);|A|UrtOBCT%#8j5ydIPDLj%rT zlbjSev{u(+R~@yiHW(oUoOS^g`6UVH^%IE7U! zOxP2GnbtS=1X7x5kfm>xnwJ4hPe$*IH#cOB5hs>{3Ep2k4n3PfZg%p@xj;}d`5m6a`j41eTG3pSY~K6s3Kv9 z_sq7OnCP`=N3N|7N^Zx>W_Xhfwbvg_@wb5fRv$QZ7GKH(SuiM09wbl5Yg9s;8?fK& zT>C>4i)LsQ*JQpYDB5PQ-$|><&u&X{=nhZhTxZ{+mc$tI)luHCM*)KaG zaFF$HbB3(@X23C8F;wV_r|P9=EL88Tl*86+i=bnJ4WG694nla}$RKD08D5Z9LrWRW zeJd0GojYH&)K3>iNZ|dmb|X(_+6!Kz_Z;iaGP?V_Y-ED3DZwrXib>0SNVr6Q))@`; zDLIn6^nBt+DBMCi#M5p$+l?!tgY%eoP5nmF2MJj<`!t{ZSIly>%9IGMfWZ8DiD_w%ScgHs5O46OE~32!Qo@h@B$rr^0yrY z_XlsJQ95Rr9*pY3%TM?>%W6|ay%l}}!+Ela_BHq6L@o4bPQ7eu1B*a{jfa^Xa zKCsa5lla+6aJXtia{)S`Nb|y3$?>n z4w32U63bH3lf_v4Y!v8)MJ;2G1-;G*SO22&?)6?1ILb4&JgB(!R^#!A9@77Aahu3U zyO+Z-*V)9IQ>@h_oSkd^BjQ}X2~v~U3j))-@PAOZ4$4XvQM{$}`Ezbqk0Q|1Rjhz6{3s7ea{7aBouLhd|# zaM%)C)qJ$)=<$vC?OBD`V#=++?=Ioq3I z;<#;Gk#v67r1IsrQe-ApP*|sY2-O>=akV)Ffg&|V2d9w)T2BeI3U$!54qo%AjdT&E zl{_T*ZvOpmD4~YI)SW=A#ZYV9lOl|&)$;6q{>0t9>$va*W#zQNr_AO7YgoIahVW~Y zL8>^!L*XRp`#!GNx=3)?^U%V@yAFK*&mDtE^QcGybiD*7YQRwIx#ZJ{PgJdcyjn}K zNNb~KF$g-OM)!vT&YQPN%o2oDzFbL-&Fq93UsNvr91*e-hqbzWMF@M<%0=;QW+fwK zFq8#LAQ{BtA3GlVn$qd5;w7s+W9>G?(tQPa7lJPZa*@7JQp0gDNjerKKT5$+AAuY2 zu{kMezk!?IDQRkvyA6}4f-8#^k3y;Qc&qJtr9Z;x9iNm@x@|nJFJ!Pw5~k((lz~!G zrKhFoCv6D^A6lkeUoMxFe9s|!dWJVnPjoqFjpo~Qqr|-~B0`j-d>$%n|#;>0L zJt(h;@$zKDKey`X3#csl@Qp!KbhoKfP|r#IgV{JsSY=MEY*q1+WN-cHL|^P1l{S14 zWuWd{tg>i-M`g1bx|eBBp&3~`5$ZRucxis_M^KtdryiLn3STD3%p2JzVx#S}kUSVl zpQd?Rd>m~j|Dw?I<%#*d&0P}2p32Uo*Fsuyd^j$Vg{@;kv7RKna-|Y*G1s($`$1}t zK?+v#%x6dCo8=^JbFHAaSZI4Vuc@oM@SB@87-ihg6*Gl1dp^&7%-b1Tj3U zg#L|^<@qQNEY5FVZ+(j=(ol@=K~5unl_MQ0UBvPs9Xc!}VeS-o&${*z#p8Hlk7N+z zgkd+{-bXdrFSAyBpj4n0V~gc*QZunWR{iSw<5eWPFW6Us13}|$=*hdExAE*P7Y))~ zpr$1sze45)5j>%%?4tLdp4{mpozxH@XYxRcrxc=znBx0(`m}Z5!oB%-9Xa?+UXV+- zga}n!!~8sOp``HOa=PYO=U0F8S%oM|ymF26HQ_`{;ptqQK*@#q!VO}d#kLTEw}P{= zYJpL(Orph6JoGd=ZI1L><|Sa24J!yYp%`)hlR`zqJ=ygAM>`nYB^A?PQ!+UibOOtcX5!;>%^`|!9g~`JRsLGMA zxT{_yy0R>!-;geDNQCpD*-%s--tfL(3kSWhz6g4Lan*n=eDnSF=#WYXd3jIp(GyDo z)b$oWyz?uv0@ENN(_QcLtlKG`KQaaCF!{NBDGBQjXQSAacAfoV7hrxST0X8zVG2JW zTqZQd=8hw*67`?MuZk=bN?9f54%4TS=aYPW_$T6o+CpP~@!We#+>e^te22PDe4wY1yx;PphQCCY__5&;yc4?iBruNDg`tJX#H0$FK?YS> zJ;!$NBSl@!Am$%qbYV3Fkrdpox5t=FU0BL6Es@W0A81gSq6TWtKqO*y874z1R0Hj* zvzB831aab_;2(EUwpC-3HlO{Fl&Iqt5l+H8rG=dYP51G ze24hwrA!)Y3Ln~ea-{(O=gmLcM-cC|`1g$j=yw=cPWJZyt)4;hO8kEU86uzmBOd^` z^s`6S{{If9XU|5{XxpEo{fZv8ej`W}2MSbt#R`bT>A^CyDGX@NDCTWq3KGxVp^U}L z2s$P=Tp<&r-w>Pb%GXTa7r0uvTAAIOd7~g!#ng8dzw0A0g#IXkVL%`d!mO?NTRwU$u2T_-1ta90giJK1&Gu@ z|E9yJf~;UL!dhv_;1t(?CYVPxvO&6;gIc|y@#CvOtu4pgdo7 zDaJ&hf%9xK5Fq+D3*ul-ctHO)4kAo{@7v6k-g(n_sV^6oOF6HX>PI!4Ru@aH^0z<; zUNI#3=Yxn<5KeVL`-tMcpdE=WelD(Fop20V$6?K0T0S3UmWqTCQHBL4?23#Q=x<*k z)Irxv9;!l+3l6m__QneKJ*wV}2=YpjC9MCJtIz{xhyo)tYTuB;KIF6fO#J)abJR3p znoFwdahvZttmeT@y9+~P5RLqs!CXoK_mq#8%1y1u-^B*})=2};$72mlqlakAti1MDhMn&)I-bR+AQl}$qgXymR0ksv+&3OX z-#1?l*06khl>vC!M%K0#og2aMyv|ml%HZd#-*fRINrtqrEb=r_ooQF@B5NeSCX1k~ z-oQ@)1KScPkhZHry3eQCO%@uHpE!%t07m+w?{Xq7dQh!i&_IvLO$(EW1AN2OPWq+r zsa$J%M2M)>6RL+XQmqb=nv@+2qfD4FJezeJ(}1A)$OEc_rK1aQEvm^~Rt;*HFB1)M zR||3omDU@;Rg4>n!NH>Lx+FTNg|7ebsmy3ZiJoZ7PniRO_*&B9glIj=_ zDdAsb#E^>XVsY$o00uwx^gj*(M*^m&O6s+t_fUx!b<7S43E386*7}Az@BI#Z&rASS z=Z@r`S{2*1eEgM<1U}}zIl);Agm5>aUrP@<7C~#YfH02UDeT~J_XI6Ym@8~6p&>a` zb#%k$iUN~e5_KU^jdj)@ zg*dN$<&wPJHlA{vKXO8RqMj)61-nnDSXIhZ z%Kojje_`D|1v`y+Go*v)V$V3iPluA^_ z+K#T$CUv-f?)ceRL?^Pt@cc8Bl5Widqd6)joVsDMzZ;7($6YoC4!0M1~R)LGreA~GP< zJUh2+k&_qEAE|a8e1fH9f(F1D>XfX)S)H-@Hx&Wch&^V3Dd9lz0A%qZ!45*@^{)gY zS(21B@xAw{X7{WfZo7vk*N8%|o)+i+W3netjp!)aw4o9;2kg5dfrcmLp7rKWSlLoo1gSEAr z^+&-Aif-W*?@|kn!}Se*p|&z>y(G*3tGxtIJQGMAI&@t_L&ZdN=Z=p4dQJJg?Uj3XWFXXY}AM{2U zL%JSybP0hXz`?jz==wwMIvY`BC6TAey{ABS`8TPiHNYz>tM>u+A(s;W3wpRHz6#0b zWE!bAoTRPSMCW*4Rm zu{zhlF_=Qo69ND41$##WScwmKG>(_6Bo+=uUy0j)0_gfdzW<4{0b1wjy<|wtUkrps z+ERxm9*JDN``M1B=?GkMFbi~c^!rS9OMbF;3Lp|0`MF{RZuUOPX`u(+@CcC^XYA!T zFA?{eUWB&UBW8FSOQaXQ$=UbNrn&40E3@NZSsvZm7e+O_^r~0}S7dUAuF-&)nnh@S zEm6yeQqTEPnQDiEoRkAhEbvBP%1i=cE)iIcrop^oQ>f_ClYfoY@uunflQiWsO~q?Q zhLv(D3z{+oVoys&(WT};|K1>2wQ1YZc*LSpTYUX`;B|}Q8;Rp}&4*yGE}=L>g^wj~ z0*>DfgUjd|D&sB@N4!~5q~yZGPUBMT1kaLR6s9hvLtGXL#}Jp=G=kD;ouNJ>W4jxF z)IEwjO%dO>R#mlN=U$y;^96NQ1sgZ!8VJ!#B?rG@^^$-SdWr9(Xswf>$!OeTJ41^e zJDugd3*@l{tyOFM&0^;Dba4?Bitt866*l__;lfn5@u5Et5=tG@y2;?(Ar2kHp3q%& z_L*Dhmcjl@h=9KX*|ZF{!wad5Y*;30dxT7&fS4j-38(Z*CtDJ{H;fby4G}C%170H4J#J>L(M&(x>~Vax`c9N5=3b+!WCn zI%!Xg681Y!96?$O&0vy!`IysR$i?6C`9jWloVnF#qx2T_5Q^^Kt<@kU}P6 zu`7ATJctRX+Ff)&#kXC@n5%;?lrJyE{xKT=D3~Kylz4eDgQjV5Rr5>g#R$)D0icKL zYWwQz)=-3la^7BrV`BOnwq{dteSJoz>Y@S3%xxriesqjZT-k22K$D0!OYl3{NZtEO zInzy#>3?)AA&Zw`NyIqmx-~KqmHXgveYnX*Ge)c?A@KZ@Pwh1>MExi8%RbTFSmY{b zspNO&%W&MO#QvJscV@m2I-}CsG4`g5Fi0q~&BkZ4!1mLge_Y2eu}z133KbPE9j&tl zEJ*_kO#;PMg@0qO!U67RY1+j9vRWHY&&6Yhi@dt!oE|gvhhrRv;Q_U+te<0rMn4+I z8(dNje??SYeTeQO)-N-1hFV%YTAcXGNSj;8O4l#^Pf=S155ixmdlEQ?5UF&QVz6yf z$?^x^505|c$;cDulZU%8#>>@8Wp?+mxj)=em*h^yeJ>iE*1nJ_wZqAjFh~U^IAgBL zT8T^F9uX{nD{v)6-tW(p_07%_=YtDelDo+(NNJr}a4HM34=4k?EQhOvQptl7ZNJMv zb4_fY{NGENNT@s3gLu7u{D(b8GAPRy)t1B)`cPllx#`(5cXl1W?t!DhuV=r1*9)tz z^p^eL3^nWKquX|Ysm0zT@V2V`m`FsogU$`oNG7KdwmhzaF*$-K?k*S3DvZRA08iyC zt8vGUvlxD~KwJ$Qj3ckmf@*#St?k(YE8@oLIt>lDDfNv(#G}B@(RG(RBT1)I% zZC$C<@@#Krn!s7$B=8yIRB~Xt6s0XLrPT{Bx74Alr+tPvJ2EmKBv5pLsI}-hy2wJR z$+e%%Gma+s8ayanKgJUIMJ)P6quNvBetvs#G}Tl+GK!*y69ece|48b4{2X%N*f+z#npBx$~8b55~Ap z@Q@cNwH7q~5z(0~1_}PJ()DJGLY7tw-&AW*`0gegIrJ@W>v@4OI}izOcP3Z?i7;iv zNT2!e)aqM&6p<_Bt$Q*hC`$aE$&8b?ViVQakHIkL^TPHtU_8A|R!Z1f4plDDN$#mlB;o z9=yVYi(_C(aXnYP_ns+t+Mo7E6)C4=Xq(L-yL|$FI`sscs&CJ8Q zXBcbsT2JdiA@@v>b*@N(8Noy!szAV~Nz`y9T)V1>`NY*sLLgSvBNqFrn3leX#1gNmI+S_jJCM-d{6(BN@42TxC=QFrxjdaVi0r zwcu2`D2ruatJ4FUY;MBCuQ9ulICoAHwR^o10>)8hx##-f&a|SUMq&*q2DhDJTn9^a z;@sYs36f~*@c|CFG)q!iU5gSwSHW-H5Z?48yVk!qbLo6u*JHyvovztJx-mi_wfcpmXy&N$*zz}zb!~d)wber64i2v7}ZRn)|U+ceD5*7lH z5dMRsdYPA1|L>^(W%R#KX*%hkYJdu2j6Omlk4>@IM+{0Xq2?_{CdLB~ys-~b=vH#e z5yWEeX~uN9jE!28_f7Y>w3^s?WNzlXo$OBv`@dnxFQACT+O_|lhFW=&*JC4ml565P z;z~v`CF{p!GWU8@o62#`c;zb6XzF_D8gg#cn*Tnr0AHx4_MKJZu31ibHqd82u1U?lTLC1K{=r(HhSmu#>060W>^(c)rS9$ChR|ty__o11M!+j+hdGx87;U+Ik*fR9ECnCIOv&yna^qQ zEvg2)Cod}?O_ z!YB14O!0uCQw#Yh?&|~@{|q+%mLf0)#uPRV;)dCJ4uB~Q`rmryg2S1B))+oA``)=o zn<1jdq>j*DSa~jza;{YFv<7s7uvK!u0G!DL44zQR71D%aWF||x6@uRhas;0$=du8e zF;-J0b)fBpt=z$tV2}R@Gs?aCZ;a2O9d&=gx6rol>i9Y$tz!u{6%7PR`}OVXzgBSQ zo)^ffsblIe>C5B=f6bRP+r-kBX5r`v`zT4u780N+FVBU?B99hgGc{tMEDvTz`xtcI zpW+{GlE!l&e06;MYrY_0^>5$`M@ijF%PMXEqpMZcq7VbSC`9g$8ZaA5K%5QD8(?Tv zgM~+`!Mh#x$|~rQ1D=vvSBw7TMx$6aYCH}JmFLjS(ceb;9-;Yw)4tukkeDi{fSUtRx^h38 zTcJCWIljo`?)M~IAtQF3RPV=xQEmP=BBOwuzzdS#tPcsEZ{H! zvM>_5MC}EHGYcLkt)O85bg2*g*Ffn+>DsC)e2}v=aq0og=l;-|ur+KzCNOO2GnCUq znU-gjgl0em2x>gJCsyWx=*Y-%7`XIN0#v3CEs5In9C0S82sj{rLVo5k0GdAH|M@j!fPYL%0P61>vM*-B7P*6ap0(CA|d; z_o~Sh!nVw$Rn{bm1u21u!>{lxT)?1Bi7^&nTg-z}ldF3c<>*t- zbox)nSDt!gDfapY2HsToI-mVJ3s4;#U{Cl=YHqG3cf{%$zW9h2*7UbGmcx~8vB6RR z%~$A}Q`AkRdA&L#kx;;zsGxge<7e|P=GznUW$^*Whq1e3Ugywoidx!FqC%g3mNuKc z%skDrSWCM9{8^3u**PGP_=pwG1}OfTsb=bYKQ)zp`J?RfIh)}G9&*MJ@!c{MbF z8ow8}%Nfp1$9_qKtUr9WH(A#^Y|$~$2EK%o3BuumOUxk=pW0<%E`amDbZjUouE+pH zx?#$BXuDn#6UUYx%7jPhvd;l-pH506VmFO4X+EGJ>Xz#n@FcU2LQ&2|5XZtKx5yY8 zGPI~nXSnH9xY%yVcU_LEs*9-BC`}EAU2ny!?XYaoTwqhjKDGSu9ljdhvqO?rb2@4n zsw~KptnUE-E-5RKjZz36q9FsIky&gl-D-#mKY#I%vyS zy}-tRYTdVRlqWP-r zLEUQJ=y2CUXQVb#Cx-PKa(TsYZ8et5}aZ7=q-Js@b`$)*l-+Z<@US>NH S`eQ1uiH5~ot7jq} zlrXXT3B>lD*ygPhq%WI*Dd#Y{qxP6h0TmOnJy$iQjweE=7;A4w3c%T z_@>63Xwu+qnb6+bzQZ+m!HW~u`6WE}H;8L}MJ-DZnC1T|>aLN^#GkAGG-QtqD| zqmYy~&v)y;?fBi`rvn3OnSO*UHaxw1w?+dW0I&|kL8s}WnOk2z&Z!bS9G)R|+bihT z3jv5sqx)GDV9v+VbOhh3NMQU&EQ07ELF{W*8inACmF91ABJVb+f83Zyo1?M}Pce=y zFZK}Uv;A2XTIfOd=WN&9NYAVuu0r1X81(!mN?o6EOzX%u{P<@}dq~(!$Dy%3qUuFI z3}2c*+|nDXv@{iSnltY}U_pi8H=*Vx*JN=MbhuvLZF53^U`jy=rd8-Gl#s$jWspvf z0i*LQH5{pHi*%^6Zdr?P>|0Nq80FRgg3$acN>R^*zTufu`Wq3gLLwqvSgs7Rw)oHC znXGUg>^1l+$^%V~q+8Jm4%Cg>+j8#$j|gh-s5H@>+#zWup3#(B=ISs3v|KQ(9d?~!}; z?N;;IkiuK?TxP>+&tR0qhY?Rh+-gmNYr@Q859CjS-|M9(b@o==($mtWc$|4BZJXB^ zUcPw$6FFpq15EOX&rRFX7bOmf&uv9s2nIchgk3n)rQMj8&#xUo^B2!nqAE6ovm%CX zNZ8=qU;g~ai~qnr(H})oQZOG`y@?eEO}33!JzQ1*mL+SgzWd~u0NtlogXoxIZT)Z> zumZT7(9FqH-SPSF&i>+3P29Ha5yL&heiMdM*mra_i)y7>!y3e7=Q&e zn|&eVRYXNwF7aPwUmPLms5mnvfUi6R!Q*c~)J4~x3KD~@ma83(&c|=j_#vA8JUz@9 zK4e9kAe~KjWtbsjmCHA$Xz4Dh?>}8z3%^!Y=0SH{P*8QwD%xp#N2Mn-7~-I9t1?9) z(lM?CJ_Fc(RPsPB6`fP!E~M^Tc%*8^s~gT# z&q+~LjG+jtp-y-mpLh608V~Q^%t(N$$_aVh_#xqnT8|i_N!DRdX&0>V9uXN17Z#B1 z?k1U3L%Kibu9{N}JTfaH5@_X4e4j!OWJ?IH(Kpe8IV=_C;RMQvu~e0xA(_q-btLcN zw5Y0qguZ=#_nIwZXrjKrv~?}Se1MR4l@B1)nlj(P)Ca6>X@)078v>Cpo0v3I`-WerA^o#pGg2zJN zP1&x#Z0KTfD%(=L8WGc9LG_2d*6c_|y*a<rq^yuGB4O# zdub43)uB{wqO5&D*r)b>O<<>OmU!0==i5~ab8B7y8d)ir+MrpOTT5sl8@(nT~`|MKxf02|!s9#Tp$N;#A&aA|W5F+-334jHq& zA4KMYe1`Ut>KJacwU^zK$vNUnb(XaoPz3G$ep1+UV8hmh7e0?iZVmXn)0Ni+4L(FV zB`!&FC64@&;ur@#C};YrIs_Rb_E2T9Z_(tYf0`SY;~l~3p*`gAB=n1=e-dUJ6p>~?1l;TU zL7v|Jq>f%QE=!~|l@UU6l42zZ)i15sujO7dO-f2(l&fw3M0#}g0aUePDMFyUYMLYm zyph6z5Q;0o60GQmUoYESM9Wu@DWY%rbxt2%1aZ|AyqJ?#`ae(YgHiP$PsHnBPa zg&9+QZMZ*nK8z(zX+)O8s!6uryS&S+4y=_i#*K0{$dprR)M03514MEafNmRZ8Ay6P?_4t$?@KXl~nx$2yLoTq6L}m~t!85?B zG0ZS!g7P;3*T??X;}#sBubVM)DJBRM+H`kHbP4eqP^$@ z+4jS!IrQ@!r`|q=F~iTk=S4hIhqHIMAjk4^R?$LUVzr3Ony5iiLt{!-JZ!dqWMI;1 zaq){EN2a&!QeKvDf=mn%{hneK!hDUwR9yt8kMF%5CukyZ7`C_=GFD>Vxwii6Q1@Sq zEq&1Z@Q+R9-Yl1Jo9T>47j4x57mxz!T28lBc16Wc%w#b=75Y)m!*F9{wV*8uf0#H2_u5Y%$ zs$SEcltN;LU=Ix{4m>?;7RK-k`WW6E_?kX3PeP7XLZB56+8FR#j+=^{gFrtaF+Z8t{{013ur*?GTD^Vw63gdaoZn|8m+2 zc%i&G#X~V=1Z>~cQknhCDLTgs*+t$V~EcC5YI z8fdzILFKJ{42ZetoO#xEI~zTw%W0c#jk(Tjqm;d4E-6(+oG;Bp!bx8*@k51P^I;!;$QgzEP_A|6`x0g{z5R~&GAAM1pltY2k#=beiy$*2Ie3c(dLYz0B8MA z(V^m~t+L|Dn9x#$RRVC=acW0JASYq)J$_Qy@w}x!OT<_#O)&8g1{Pj;1cHV%*y6Wc z0Mv#XAR?r$A&ge5d}&~Ga*5|9oq>tp|$_U-f*a4J?1SPAOpde81*c7Ck|g7_F1oViY<>&J-@S z6ExD?!|SqZYPa)UBGyAWA9by&-EuBFoLg$TwKiZexGId~7{zy%W!(R}*!^)UKxFPK zlL7Zaq9c}#0HNCZ_lZ{{cHan`dMJLBC00-$zXN-^+98j5X!A9PH-C$1&>op1