From b8b2612e0274b49d54b061c1109ecefcc1b548ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucius=20Gait=C3=A1n?= Date: Sun, 27 May 2018 09:25:14 -0300 Subject: [PATCH] feat: new verdaccio skin to webui --- src/webui/src/components/Header/header.scss | 19 ++++++++++++++---- src/webui/src/components/Header/index.js | 14 +++++++------ src/webui/src/components/Header/logo.png | Bin 25736 -> 12940 bytes src/webui/src/components/Package/package.scss | 3 +-- .../PackageDetail/packageDetail.scss | 1 - .../PackageSidebar/Module/style.scss | 4 +++- .../modules/Dependencies/style.scss | 2 +- .../modules/Maintainers/style.scss | 1 - src/webui/src/styles/global.scss | 17 ++++++++++++++++ src/webui/src/styles/variable.scss | 2 +- .../__snapshots__/header.spec.js.snap | 2 +- 11 files changed, 47 insertions(+), 18 deletions(-) diff --git a/src/webui/src/components/Header/header.scss b/src/webui/src/components/Header/header.scss index 860102c4b..0f53c2263 100644 --- a/src/webui/src/components/Header/header.scss +++ b/src/webui/src/components/Header/header.scss @@ -6,13 +6,13 @@ .header { width: 100%; align-items: center; background: $primary-color; + color: #fff; figure { margin: 0 0 0 10px; font-size: 14px; line-height: 18px; padding: 8px 0; - color: #f9f2f4; } .headerWrap { @@ -22,13 +22,24 @@ .header { @include container-size(); } + .headerRight { + margin-left: auto; + } + .logo { height: 50px; } - .welcome { - margin-left: auto; - color: white; + .headerButton { + color: inherit; + border-color: #fff; + background-color: transparent; + + &:hover, &:focus { + color: $primary-color; + border-color: #f7f8f6; + background-color: #f7f8f6; + } } } diff --git a/src/webui/src/components/Header/index.js b/src/webui/src/components/Header/index.js index 573c29290..3426805c1 100644 --- a/src/webui/src/components/Header/index.js +++ b/src/webui/src/components/Header/index.js @@ -129,14 +129,13 @@ export default class Header extends React.Component { renderUserActionButton() { if (!this.isTokenExpire) { // TODO: Check jwt token expire return ( -
- Hi, {storage.getItem('username')} -   - +
+ Hi, {storage.getItem('username')} +
); } else { - return ; + return ; } } @@ -154,7 +153,10 @@ export default class Header extends React.Component {
npm adduser --registry { registryURL } - {this.renderUserActionButton()} + +
+ {this.renderUserActionButton()} +
77&3ahzg2|pcoJ&=O9^Zm(#$V_Zpj8mr5GLDLj7Go0s(#xPEK`^*< zIWP<`1Uw~2>SV@h(!LHg?NFDHMmRC33GJy9EiMUnJK_*9y6nio1e`r?smQ+4sfmd1 z>$8yVUvQiXulh%ViFom<`I@{@X6)3FM#Y-4PZmwpn+Tq?QI-05hfoOG-+j#Kc4~DBKjcGlV!o8!J7gCn2i{ zSV@hv9-Mp}VLS@O z9$ZLz8z9 zf5Old?O+Z+0}+1wWi!3n^+l21`rD7xsEzg}?>fNsoc!(2Ujz*Pwd>JBNkg&F3=B2$ zIT?S`^#I3!q~wnbi&PrVT0EVuT)QkD+^=?fS(LZE^G>Yb znE#Q|cG3vf1O|=mt7sNy&i<{`bAL$$=GR|m&YpJGYhBG*y~z{KD_1YO)dL=Nh&%LZ z?Xg}BtM3Q-<{cZkw~voqt9koxb%`&bC{6(;3%6|=06W;AlNcw08!(Q z{Y6Qa&Qj8q3*yQ(V<+K#^iB+*m7!uGCkuka#l=yR*XoiqVZ`2uqyH_~C^!i9P(mbu zpt6O9g_$b4zzc$hgrsPIy@z+DF#{*bE-lB>hGV%wfB;iQZh#O3h>VP+&t|Pxj8RdU zBdLDNXQ=gCFLGRio^Ml25EMj%JxKjlaPis&H>@BQ|5Bp7al5*LSX;J#ufT2k@oSOZ zcW94Nh6D(t4$`)yFIU5;(?)QzOuh_Ac+Af%fM93LDp77kwCF66^v~rKVl11!MwlAa zoP)OaWxXGfTWH$;IYEF`v)7Bd5g!avU}{vUDbn2sY0Zw3K&X@xMcSxb-xhFv-b(2M zd4#F&&l2&cIzwHG+!od9e`g$g%RS_z-H62m3E_1v(*_xsElhtAal4p4?P;%2qcx1t0?_OxIRmU4X4inr#jq z-7nT7`3a#+7lgX8<6CkjKvi*tLh}yD|rPEf6g25n5H^OO3EZD1Hx5BEU3|IfXtPl&gDF~Bi>1pA*2KTkR%gzYH zpql$+TNzKAr!@k8@bMT~YK&@Q<8yUNG~iGjQlzVjd3Xg=P#b8>o@)tpzvxi3m%DO%w3ROP3Zi^a{?z|a7j)x>qwTX zEv$XIxGb9Odb~o9JXA`6+;>lk#r54T14Y^2XHRLYq+_PIhzR!zwe?gI2n3Yw7_wir zuZb)h*86>toHT13WyyS(NWb>Vn{@fgB?+R5JrWC$hTQe<6%7(tPXT9ztE9IpCRE~q zhXtOq=gtW8@o#@_rv)D^7iF_1EL8ev-=n3HMnV!??IhzW4;64PG-xhj`A_ZBBFmCh z%X=f<)ymE6ci$tyG_hA=8F5!M%Pw`mttuy=E;mZQ+^Cf({$k-Kr5fCUtK6fHD`k0d z`rnmqDjb&*Klh`B*iM$HuIqJx#8)WjV%X^3WEy@tM}$*VJG&!3?p1&gVRMEdOc(~4dG{mH{L^&bpN zarcrHC;mPrll0j-7dNBelf~1Na(%*7gVzIM?eO~b>(s8-%j5`gDW+J!fd4jB3@f*w z9;Z6L@rSSInWt*0i!|vUfBBB8JW*X!hKyOc(PD*uK|_sf)0S_jM&)PKMQ&-!#DV}< zFUBS%Cei$fD+038<2I^vTHuIv#ulP@=TR%;19#oHaf1>P62z^EC9yzom6g8J945k1 z*e4SWxJxeOOTn*}J!w9nAPxW~8bK^3LL{4%U2E+YIt0;DE2AuQlWsuRv>e6rjT28p zBzX3Vtd8!#L@3Zj(1(eWVsGJ0Vq)x5HIXSb!C5kc3UO~b zXr(OsFUBmKR)P*{LV*q%&ay%nm{*gX&QVriZJ0ZU0wE4Z--w7P*UPlUX?bNXu@dBT z_O*!52K%p2z~LAb6%p0X({v4)i?yk6Ea-b`XxG^kkQ9KU11nhxGB0B{=3=HwVCD*w z0CsFszzPMxTxxF`v{9Ig8Orw2vO+~0#v=uo!4w}iml&m-0BN=p<_^O2BT zw#Swwy4gTJPynWhO#C!2u4N2n`tBoAw;o zr8vS#9DtGEGGd{_h`|I?aRa9_iEeEFN;Y+i?|pYZWvy6W`S#HWms=ydAk8V@aDG#KCGa)2T7t>;aKeNH1RkVOjsWJw1$PwrwYDr1 z06zTNwRa~?n>SJU&efNz4GAV04Detk_+Xla{@sSrlaIT$N|6#v_G#9}th`i-(sY!+KQ;^HECpY5{!&iLrKicr^7xdxGu?lK69(>#l$1yNb;>|>A_T0+^ zw?hOY#_Bb+3+>+jm!K)=)41-7)S;DY|4KDpwEuF`|7hYT=pnw&5M^V@Z1YA4dyDitt7x#mfez!5aP$d}X;Z z`o1-oDweCPIMJCg6}C_?+Z8~M+lYw#hD=S`)zdH*;3mKKF%>KHpazA$J@Rn6n=1qBD@WhPbiG*B9ONVvc1c>vZ|;fKcs2?qC5 zNH9-27^Iaa#(Jk?e=1k{3FWb<@6X?S=@O69FFUp>&EXf^tbGFwV?EDIF>lhR3S;5N zeSh*$p_8a3$Ji+&C|AzhhKvP&Vk5>v$5H~T8SBm7ZK&Jp@3=7*;Q32sL<(bJ&)Jb5 z4)(}cR$v5D{4l!p#>{v)1s;VxnFJG`YlzhSlwH9ZuO9gP#wB=ux9aT_-ZYor*(a; zr-G|Y$#V4D&YzXMQNjug+D)E4fx5NtWrV`843EU+GuIl{nH7SsGO;~kA=|l99=vAI zUdpAEk=$>l21|19`*o>tf_8+@`Gu`(K5(-R^DKrz+tXhX+Vz1M8%uILjH$ajZ z@tD+0GBy5w-G+$AsMzg^^-M@Pd}FkF?go1K%|>cak(Th!K2@8N*^rEFwZ;tikk-um zisUZCvQf*XZRm%eUHiwEDOHY26@Qct9^Nl*7&#^@Fi_C5WxZRXRbt@4mRfmo<)u1L z*Qb-GPly*5%thi?fGs4zSK_%7$mJiaNR@9qX76u%~%+ThPhA>9v(Gch&6{}IP!L|Dd3R;%qQR% z@Qof$^H|hZ%6x2m%vN$zMVYtb|2PF4v@I$kx{^04SYj?c64s$|$H&JFVvVg0r`@fh z`UZABLsEd%7Ct$P=0-$B4&(G0Unk)gbIDGy^Ey9RYchi|7dwmcKnn06?&A6=E(?`# zcAS1Gz`qy1oq*fbzbq_H@H^gNF561U^fhm@w%^~8`@~pcpOOS8Zy8AC{q4|hmjNjN zn^m~ug(yeVF{`7u#8~VI*oco=TV)lg4R_~K0B6*)=ga5bX6TWzphLwc#9ia~&UTgb zMkTvmLjitNCPsuuX64wmD6FYe zjYbyox=ahRMs~SP0fhp*@fL4B(o)IaO1McZW~yN}Q|ZZM=S?ZV0!Z+T4nQNZ?A_gT z)UmUcDWKm8Ps3P&_I$8BDjV>Qpn&vtz+{w1p;*4TBc^9hBCRN(<{?F5+0rVlevUh< zUn#YO#EOfLS#f7g&z?UbD};?*x$n&B*|SP33V^3F2^ScP zBj5%Ca^Z?Ov~Cl=M|0)1%^kFOs_QT@Hu-C-bh*oGrqjQ_e$8l-DfZy+x>{E@s%RO? z`Q{i3&*%D7-WyIsBzEC#r2u%!r=4mfV`1+CY!DI>iv6>+V@^(Tif`MjFxMq!tn18J z`ok!-7>OSG;$Pw3jB=Z?^wddzd8{G&yh{z33yf8=cxn1;-%ht}k5G>j0RaPFccY+4 zDz3!lZR!(F_3*j+FBZ7KP&QNPsgpkQ%mb0ezr2_6f@uc#cuzpd^EhP_@#8ZSwCb!q zn^V?nV<*M@`MtJCmkTfZtY9o%v7Jrl6!43&q~v&*cLP+PT`K1q6&*>Juce%lE6Zh^ zz2Tdbf9MLzJ7BR#X_ft*xuS{ePqxpRkJ7q2%y@?QeLG3((|$RJmHp=VP*O6HwD)Y<%G@;ILc$ z5vbnU_*;)nOdczpae*r)0WuN-CfyfV=Fpw&he<~2DyyEzm zH(SG;(o67Xrx~kb_j{IBq?XXNR8mVyBpFMlLaYxGzfqkY)>A$tB$RH%T&K*@Sq#Cp z{`$jhlUA!Yd`5L^q-?xqIG{VE&@aZ4k2c8|kXp?Txvm|TRIt}*1{<( zgycban{F@D`HSaFNr(+}(T8Lz*`H|x4;3YOQ{0_Hz7m_N!Gie(+>< zu}JSbw41sQ>Z~aTJT}~I-l#R@yg#Q>hs{@B>)Ddd@qy*xyh9;&EksaDA1g4}_;*yF zag;NMcHw32vYE7O^&$=KkKUU}`jg_70huKHVl0VEN)=DKR#bEZU1q5z?OM>QF8p&| zVKU&75)A2qZx6S`R99|Xrn@s|M-z_$o0#p|v(t^SFb?d(JoWuqN_*@_x|6s5R{u!Y z;1=6~W7lQ`9KQZ|nF?YPw$Em-BVHF%+9R=e)qGmT`>(5UT)cFiRe~1<6XwfPKm-5j z+9kA-FE#w}Q%9*Kn`{2Le39PfJxyh}5p#q0TCMN4`?IV^Yy}2z*iBl`RBgLAr{YB) z){F(e4R)l)ex|-W#@(Mm=+#2N9WAAbM_r5ISTmznyS^xx>-Ao(+^|bri1EgxW;8e8 zTLm|hZkknT%1b|7mKkG*rVN>uU7FFL9w}Q@>_5DhzUN)_^wO!sLnZ0t-^Y~pYxr@t zaOGUF->IIdE?xPD7A&9bw*4Zc9xwDOIAj8w*UniogO+`~Miz;1c}`jlZ& zZx*b;7`4S=1b1c5O7C_VsHw(p(!29OdV5euO}V#>-;5;@>!p^VT`O}06Y7#UsKC=B zuy-f-Ny&cvjY~3P96EMD)BFnC*sfl?qEXuMc*9+(4?B1Z$~rabE5!$n>=T>FLU+># zNF}udRM(d+S)T5{_kMK|z0$F<;cm?U!fwpDbLLUt@fdxe$U}5jmaIydK4Aq0ZLrHU zc8XSqnG2`Tq!BaJMM}C_rRsF}*g++4C6Ow|l9EQPYoSwjyB13={%iJn$`52TxNGLPkh(2Rw)-bjLgNAFENgLEm84Di0k&))RU+d>@*txDS zRXUc$rI%VpcCD!BDBkqe{IoJ`gez@Uz~?Pwi8Ox8^VaUj@k10I7D0J)E%0Qbel)#8zgG{O?r3$dlASvY^;tg=tN8H~O>)r=*ji&|LGwOE|# zhv3TNR0V0bLW#s{3{4anZhnWEwLy93zU^t%oG*oP|J7q!xa4Um5y=61wA7Iy> zKY364N=D5TeMv190RLq9DjwnS))$O`H%WP*0q`F+rkFWxdN6V0L{bCW ziZ|-VYx-lXdo`%lRD&MyvloA?DLZ-kI2%?w3;5?$$~Az>lzfcFO>?;_X&R|AR$yTL z*S|z`YSWEAU9(t)$(6*(VL1J4$u!?L8cNlPVfvBaaU-|o#u;o^u zvgvEYflyMv@}^tKcD}@a^4*97HTBB48VAmz!I2?Qs7se9Ludm>M%e~R{}?u)dODU3 zr$1!RmR*=5HhjB|t>SUQMumejXQ|#oWxs&GH~T$&9#4HfDPoMFxDOd3D@yqU6R%}yox6f`^~^uY>@zKzUd{#Y4#{LzX&S=wcL z8MDuO%Bd;7u$fDe z$BwN~K+jZYW5`&ju$c=~u!A=W7%>&vnA)z;0MAWti0%6SCI!G7W=sW&m@*bBp^T|D zeU#b3rT}4=WwmFd3Hu_>J*f<2T1|ZeJpI~wPWz=4BI(~LIoSXUJ`ORGB^AXSf3^pi2%cYXt z?8Snqv8|T*^Rw7(Yzkyt3P2@ifwn5dk!hSS8kE%;2SjMGmwTyXO8S^TNv&wLV;jz< zfK7q_5Ct5xErdcl@TuavQafwEg%(cFWbe>9!E}pA?d0tCHU(@7q(2H^`G)rzZW|UB z^@Bg7^I2%|S-?Ztk$sRqo!M<{3fL5|DWIW%!!e8xt{a5E|lml~*F?d%|HV zwBU}w$7lX!+pIj1&#tp6U{fH_6oAbuA|kS+%dNs4yP?p+Y9N2x{2L3dF!v^QiA@2U z0yYJLO92*GiM*FWIiuA^H?L(DSdH-&zAdnV`=i*{Z3@^FFsA_I59AQ!kseB;X~8Kp zDLHVP9qBu>^EL%+3fL6zl>(t5nJTHBR288W>x?brNT9XEYHy`+Mi`@&dDt*E1@1HoU{{EUi0Gw43IzIq6iF<-062f~EVX^RIs2$e z2;bsfZ}z1cPu0>iN{t{pJ+TX2SwCBY&)-aV?jlrV)=p)6Ux_C**syEp6$22rHYLM$%`uJ%1!3c-bay(6N$ACGl2;U=HwmMDhUt7Bh! zx^hj8aPUVk$gu$_(wEoIqH~kG`9+3^Vr8hn2b;y1Fcx_MnLlImYY=uLn*#p<3a}eQ zaYtN2To-3@^5kI5R|*Ei@-z#a!2`k7u}@o{1Xm&pu0$!gSmS!SitmE!^d#1-)&)kh zlJp8ITAK2V*(grtkcTValnyDZWGvzB*rtF@0skrB2nl)1!QT`vV(IaU|7grxnh7l- zxGtQfE(6;8D7X??aNQIg;#IMFML*gDZ5|J^75O;5zq7Kf1bUso}(UMC9bN-IHUk8PvT6Z^^XcWSUT7Bxl(z?mgMQA$_ilk; z^@bZ3!b;w_^2AKpUyl27(WK!Y3&92EijPh3YU2tEcYRp|jce?*_jtEgqUx1W1edzM z%%!VPNTlk<(8WBxd8g@=| zfras{-}D82_1!vZ-=Y&Wt^cANvd{6wOXsOw_m<-3?*I1CJ3?TA2OK=S9XFUTeKc*^{yk;Qk~L!qEtXdfK1=#vzFD&blfG(UfOKFqt`r;BJ01J8##O^q zR{EPCHqiKKqo~4TPtuTH@A=iu$E*WhDR(lE+{inS@IJA@VNGs!e=@Mnd)OPLtQ%=#Rc<;eI)S=g_+{QsO z$1k{}1lDhV{vrg{gGGwl0?U9aGMd1;HHD~5d~=5y%qQSQ5EKw3h!Fzws)*Cpox(T| z!3Eq^D?P2?)(ft$Hm{?(OJ^!$zj?XSA@n6{7`9&zT_O_oPbB2_J%hQ z^*Qd#K{<2ergP`d(2?VZs7OKOU}vxBx9`|SgU0m10faPr!XnCk_dTX<@G$v)+jn&M z*nT>8>KI+Va*1;1$U_emD?trwH=&5|2-CKx*zoNabUo&V<`wqe>(^*Kmmfa5pN^b3 zLgAUh>ArjKrw*+;Q{G(pO!58l$5uLUcpn`*d6Zye&zdb8<;#_y>Ob3%3gs`NwEO(a zl_K4sw%a$i3XD+#!fwxjzvwv6^YppDDOhvkPbmbq)oih&=%wL#_GEJVXR)@ke1%Fc* z$ScR~KIc~o62!RFuV}b2{4vhMhYP-32=8_oKu=Y8S_ls*K+w1fLtO@Gh!E(A- zp$F;1;nOrY(OBY_i1c|`9_)DhjQ8oA&0o?Rt-Da8I?XI~x9P{PY3$UILQp|qL2&5< zew)!B4HLo&0=i+Xrd0mX$Eo-OkMNBZ$v5_HLDLg|9}~i2(#RQxjC<25`mrP$J+8OI?_%56D@|Ha#j;iSA(>0e1;+fN{IHp`bO!C- z|Ce~{7~FFtJzgfb=iA(Np#`c0LvX=|OS(h!?%bcMR;;1?0P8odr73eiRPw$giWYo; z#tojV*s*Z)s)ds}Z3XYeYZnCAeOd3f0&WTB>+d(vgz2N`$?{Lpz#hZBwpqPlB~70< zneyc+Kr_b7;kmgh+f(OGq_tnIqI|jY)A*rNgu&Jfaody><`%M)jgUcKu2Z6n=Pm4aAM+;ZXp%zWsP)ojy0+ff2@3te@Ix9b3mHKrX;`O(J_V+rQ z8DKwb-=ZUH)GryK4oDf^uWoz5jSj&jZ+JcPN*fp4A*7AVo9Dc+Z}C!MVqzkVnKF{` zJE+PNRmE$`)Oi#Anj>BX-tYf`c$&(w`h_USjY^j&BYN1i&%0d<+61%;+;kAeMxp1B z&O(c_!h8t{@w9uN>r|-xc?!CrOT3vVv|Lo|-2Dele(z&~=4vHCGhVlG4OM)sG7auE z(n=GmS*X$4?zK?S9(4NkU*%d7_%Bz#2AwfDl;l-SPIcgqG5{T|MDa z(7W?Mf+nR8&~k6ybiKNd9W>dpz?!*miV#>&Rj6)RV9CC--jz)xF;6o)-P~m}g}{P# zYE>Xg{JGecg8*R!mjQj~Kf1RNSfGi&0t+|;g-4EW^VUst?cb|ZjqSdYMzT)EJ%)4< z0&8TSv6cmvY?~`*Zt==1{QVBQ{QYEIAmcRAwB!VE(+6DRV!=fYmvR2LoxjSie2Rs@ z>N8#=MCEIt6jU2JAVFSUoQ!rm)x1PpM89|%2d_&LGY($;gzU@|zf~~*) zKwE$NQ5a{7vOyp4|FS3fwQGE_Ks?X(oE>|9=kGw{MSJu!;@#2024skk3s>KIvf~x% z;RijxdPy93#rSO9a52-{tZez@G#r2{L`?|d7$v9C$fgMN`wZrjOhYrQ`oO6u^@k}^yBKLmeQcj zKbJ2G*aCUowQfsDEC6NVn=g(9N2CSVpnwELaIpiblSeC!^S%sR3M{=lgA`i8l^TH+ zNL!YAUZo(k*tYc-zar{iSqAWvA1h+eo?dC(THQ>O-n{i&kuSind3e1FkBFp5w)Ny? z+t=g#6wSq}g}!_S^V^@>g^lB(q9ugwN7I>y%xCMDi`pjjUNl@F@X(Z?O~Sqcfok?@ zv+5T9X6%fcIXbf^bZ&Js7JMY|W0ls(pY0c3kww5Nc4|VP@W?S7K6X%O&@g!zEp!0x z_g&isc-4y4MeOUpKX?Bwn!rrpZ3Wa<+!7x0iq#TlEElAi(86GXA-KX>aIwP0uP&}v z6FF&5aj*rJr@m8LC+%AM4(-vP>OQCwp{!f`UR0;XbDBDR=HSr-qUd?nP>f#n^zh#D zYrb;XPg*u>;|)|(fB5JjkuO%*n(a$A#tI|84nV*h%)%jdu|O!w26A5l@PE0nd*PeShi_7 z&ZQbp01!y+1u?F`*to(J2UKrE%*X-@bAzuImjBORJTH8xP}a5o8$w{gQ{J1v0{jEF zgv6dhyOB**fDs!0R2WzJM=SV*D=EqKpn=PU)$l31Lr9kh_>9$lx}Is%n>Uk0ozrO@ z|I*b975tH`fx_T#6p9xuE{YG_S_m+Lu~HT&Jm?EHrf#V6+K};9}4DOni9?8C_t>x#1NN0Zx%` z_3JJ5-U3#;+H`wK*nqme z)>DAP$<)Y=L*kP7fBF32|XP&ApO0i0N;hzfz5Y~zU zg$KQ@{pxdJJBD*ClmW9)t)lCdcHXD66uYGvtSpCN|8-s|{h4X`M(fV(7~Dx#1t)gW zasKu&ZZtn}dIzTm|F8zbk1HXb9Z(Hk74H;*1xn-9=!1{P2%=*JcIMdmmOQo9ztUg( zcG5e;x{9K5k3PZvRDCFWwtLhdB7Gy~I(^HA`d|LoM#Fl)uc?PkNvHfx>Fb}9V+ z?RvaIXV0CXQYA{$pdKSNA3I|;60Q&n*xv|l0sY<{LQj;bL|FO6Lc-h+mk13{GbmL? zjUNW*{@sRXJ`k7q=P#d435FurMFo#|ryV`t@NIQYjc3>1 zo#F< zKAQB&c=2hNycZ=1gxHhitMcN?tA;Dp5-u2Vh$FO-g9j8EpAdJQ<1{tK8%5~HdO4v6dB1)|I zC_)QE$v^doF2&7DgBw7yBcN2lw^YbTRxC!G+;SjY|qD8B3uC7%7MlOF<>mh}HFg zw}VXqn*!;H0*)D1=#CLMKwQs3~4AQvNuYUO0 zS$|=*QLSmopF)jGmf5jQ0hofcG{+Z zO@Uxjz_BI75i*{?_g&3`%55dkpWXu|w2V5Bb;cG7NuZb6N4+WgeU&$YvCC`<*c7-! zDBz%9`TLTU$>Fp#$`N%eShEVM(DF2B*33eAFRx-OeTzFC&ipLY^7B`P`FLOV`#7JC zy|1z{Og47G;w^I=c=g2gqhV<039nseQ^2NxZxrBr5c^Lj^2PgHI}`a+zBn$s%J<_{ zhm&ImUF7@m6ffJI#)+&bQ720R4Z2h5s~EzYnhf0000N1#{SgRYKu>Bb@-iV@k`5gVThdyesP_91d?$#$`Vv^pD6A&dKD!x7{e8I*B zUEx#~G;-M@nVMRp*jaVF%M)zXG{x1X$?86K6BNrRD#MJ4f+II7@*t3vVg;0-UG;@Z z;0FEcQ6h&xD8B%CF813}#-)x5r{ls^&ZeG}WY*-iB zXH4+QLaD}229yH~l0e=t2;s2-_{Hz)VL{J5Mu|fDkdwdZk<4E|MrROlZsyXY{_UiHN7%MlHw_H?tb1$7ffr#JS^2osvg7NTy zxXkfrg9V{zvkWLNgB1zUlF)b*LH1zuj}N7O01)K=f$H_b0g5sL^BqK2e=Y*WG)C8h z<3Vw62P=SaLO-eSq0YkWv7YY{lD&Oc{D%A;LF%J1LK;IXADM@m_es&d$b`Qkj02wy zvKCR^dr_P#qbYgB(eWqBT*+bz9G5Z{k1@6W|8y^hTcMq7`FZm(eg^#8mC1~-x;8csW(7<|1V*!Y8IeHzzcvMsHRy*DT z>;ALmd$XiJpA&p?-?Q+)+lmuJ8+2zbhQ70n?G3gey5n<#yGabpPRvgTsj=3uu3i#- z7Se(hX?QS(68dx)TX1}M{o`S?5-qEGJgHJBGsRm6IMyqmb>vi;#LZ7 zlm=i^jdJE}1~V3dIBCrUc2-giWm>sM6Y65h4PYOzk4*k!ydubmesM};rlCfQY=CkA zuR^?F@?r8)Pg#6PtYhLCVHRl?;TA6zg}-RAG{?c>>WDSogEuO_v*h2Uel(o#^S!=Wty+B2dXkS$ zLG<0laQw!XBl`80BW!CHYoitR71|Z*m8!3gF+cN}p9(&v%8!bVYKn?E6k2T?1vGDhRQI!r@|+rzCoyaKJlj zAk$3fX8H2fW@TfzZ~eK$ul7yJ&3NiG>Q-thY8~oip-y3{G)P)c+Dh7*P*=5`A#M%2 z;fmo}jVWJZ>h8BEHY`<Q`g(dX#;~&`LP_a z_6Obmc|Pf9oVb#a`jMIBGvsDmJ6zh_TU_)890nNr&efZh=k1dnX^tkA0bQXEOO{pr z1v9HPW$(G?yxMjGB+^VOXULn>n+A^Yj~OpmFZgdszIyhm1^?uShZlR(%Yad$t@VZa z{{5(>TWo%8ABL3*=Q0iYIr{PX^Kfrd>`{zxQ@RbgF4WVy#qwD3M43H<=8ou0B`z6m zoqtmsk6!cYaPFA-AvtkXf5AzhLJ+GE*_BWjzeYWPYZ{hZp%<%HQ5Sb&@zddFp_I5( zxKy+hNvl_DNdWKZ(<{)G*ZIuh_}<$2_=N`gee_c7b)0wT^60v^q;LhWi7`CU+drXx zYI;u3``wJ$c!V7E=u*ZjzuZ4>mWjdM^W4gb0 zD?~<w_M}_Q%KP4d@;7Fm3|#Nsp`oXnBfJSG`TTxGwfxAe!FvULJih7GMci5^ z=UVi>$*J{aEPC?Gk1vO0lRHepEtSfZ$dr~q8V_scJwKWqz?R=9yh+I85PU!MzR&(; z^=b9+BbKKTm7FGml58!!?Lv8cGL2vDM|X8d-hzi>RoUGQY?@MDU#tF7jABk_d0~KC z3;^tJXK7)uZLKWk@ew&tcC+ps6wkjL;X|>1JjAY z@_Cc8m2U@c59*rqwp(?d8o8Pi*vDAKR0|Y+Y*DUoP#7)Te76asj!9c>+4QU1$(-z( z8gH9(4jM*{M*DJ0>JBMwb5Qq*reoPd=PysE7fRa)w%%?ww%G=m1nDB`R zDBfVZ%08|gG>kCJ9h)8tuYD(C@2BcFw-G#?N!L%uEuDVje-w3`npXAIR%IZzpDZI? zEZaNq;8ADDeq=bsD{(y!smAK%@0sP5<+Hu8VRE62bgx1UO z-Xxw?XtZMtydU6{ua@6bC{q}SI*Xd|{c!YUuQw`rcqycf}ntMoDKD)++js4I43TjNwCF*{n?+aLS# z;2Ep4&Fb9A%fkx+af3iWQ({9E4ct*sa7ljuhl-MxL5YF_Mp2S|_~aSt&dgalvx3k1 zMP0FPW@=Wzob9_<^v|EWOEHa{Z04+J&_W&Q%`CUuKYS8dd$1<9)h<2XC7t2-llLUq z-Knzg7r%fx%vl80;uiKxbi+3`)vx8NG`uw`bUf$Q(>8WDUW*nBd=%&8JWL-DED~oD z5L}FB;dfE!pkbuNVhBb7{r~#2tex{c+D7e{ft>=uU*R98Ff3a@F0#=sF$9 z)dqz{qe*nb`lfK7AA!plQC*$MRca6;@&?e+(-MnE9B%Y-aqen^*d$fGlRD2MP2LU0Z*Ix9U{s>HaD_N`59i}(3c z1-SE@jm}`_4VwiGHKOtN&UN9pAvk*Zq=<_nT&I8?&S{W0Hw5AhDD;I!HQEh*c&tJ$ zEK(rb?{8qWIWQKM2B0JZ@EX52kFw7+D;Hv(P^@n(b(e?RZy=y99Yw(S6?1>sWF9ATS%#O`341 zuUib+hSRv;G{Q2@GZZZ+Ar5ld(X{?~-MVUvb}v;0e#8qy(>j1;=Obk8qZe0X zbW&#Gd#yZkpZwA6XcQ+;xuvL^+(fcM@5{H{FtcH!()(?f1&{&sTLRLpmt5II{{ihc zT4r%nA27RJ8!d>GPO-QhnWW)bE!F%gB`lhZC#pv$nDM9{%~dvEsy~0%ZI8ETqi!~3 zANc5Br2b zK}S8w;5K|AhuH<18TQGCgt;v)faxNTohM8PH8{|?De1rMFYbRhQ!!WuGJVha1+*Vi z6Xn!MaRE1ooP18F`C>DtJGzZqpwZtoyKD7(3nRrZjj9cfWm05RS;HFpu^xC9c2E0U zbV3YLdiOtEkvH{^5_8s;yw+#Yt2nwIrhIrfW)ko*&Kz%gv&4wXP=xLov)iY71R<+XxYD+)-`BgzSH|rpIsA zwOZrlmRLBuf0bZUG~$d&EtvI4{Vvi0f-`y9no$KaCb5CU*|5>}`VMr`SnZy&k zWkp}FE?#-~h4I3Sq+F~pheswqGUBi0K(Oo4BW$O(_eC1>gkM0PxqmLCW`as8Sy;$N z%QMNC%=o|9)xX9sBMRf#qHbAfu7IFgduba@}$LTz>HOj|6vj<%6LK)V4QugRjg@?=w70R-!>YD0L4%@yU>ubs8aXJuwSlseMKIdtlcNE?8rtdYdyLgKp z>9APm+16V1%`p%~P*Ky{xh@ejR2C$NnWus+TWh!+S^4q?Fq|&TN_xm$OuU|MD=>*f z(B4*|P}VKhb+quS^Dxm#_quY4aC-33qyNNy(H5Ytb`dlwntntF!sEaJ$|OvIcbmJ6 zbZ*7tx5!z!r|5uG!}Dc#ek?g_CcDxF6n2LOa8{`ASMjgv&_zXjdCOzy6d-q5wx4a%%(ee& zhL>dGqGX}hMq^8JJ-MBi+5eU@B0=PYfdmIOx~JOKOIzS~T$qf6pEa2zyKYD~`RISp z(kRdrNs~vhs}Tt47+c%WTs8WI3G*9pd=hXTxo~%gRBaxK#MT92y=;aC+j1ny`dy({ zjcUQKn;VGg%jxAWzo!Sxk3sP=2q3CYD}w4ep=hn&#~M1TUv~t^)loegE0@7W#0aUG z`DI}m?^4r3VB=L0L5sn=0>`Z9J17^q0 zD<9*1=C2DR2ZuYx21GF z#gftm8dg}F)b&)N=DU@#CRQgn6y{5#80DF!gjkDDD_KP*eBDnUQv_rWXO7XpN(C1r zG$Rltjt_ZCww-laMw?xoo4E<6LC+7=CUspFNh+A2=s|z+xL#J(i4J2^kl5uQm72q1 zTzY-q#eKw6lye_cWoz`wh-uIJYN4-D4c;UxUuQe*VhJrVEf9uE9qhC*xb3MKTA(yI zuJYOu7RnU6!-}T8U67y-mcl5=g6!Pd8EZA@YLqOSceeXh{2_EL`t%(e6I4w}0;8%) zlZGJN*t@9{DtyrjS@W!0sGItR4D)k6^8=zjZ`ZooHv5yO!=8+g2_5Gj6@|UcV z*z+CTj|@H-HY5q??MgPv2tK*4ZDr_tVowLT<&~Veda$I6*UyANpkPysX%SS4pwggS z>^kTLH?X-a*N0+HUX%Lc zY-8U+npw_|rfW^1uT`iU%uaJ(H-78`hlL9ufYq00FlBT_(~K-N@GC@FZYlVM3*p2V zt9DDkE1qP^4_el6b}VTr6BIrEV;HWq;M8}fpM(?s+NY_>LFH4o{k7|;u(4Qr8x~u(+tj=bf;J-J zIRi6%P}t3DwwvvHLE?t| zd?_=l^PS1~MLJ$$u|3~_YBG@H(6rcoE8=c$20i!lz96B8rg?{! zY18k-t3O(8tQ8p1`XqNhF?U^l>@0;y-QYS5o|%d%bbo38@iJaJ7A{xp+ZVg*a>Vh0 z255B$){S&OW<=0l(C8*{T}94bop9HP#m}LAz$z1SV}_m-79D55}b-RbYIiJ4wJgjUB%( zk6>R=LBtYzoj)vvcx4(VQfjmNRblq0)!7RP=)IXtDQ>;of>2C&1k_u{i{p4-Pf>SZ ztj>o11alx-|0VinvL{tMD`%>h^>{H}B<R;JLGJ5$UD4r&T@RCBrc6;B1D2nv5T@5 zC^u!)QH>_y->DDP@oJH^nsfY208QmE!5Kb-Uz7ZO%U+D>uyh(9M^$cVznwLpRG;eJ zo?an2Hz1w*;Yq#r2I#(ExYB8E1NV%ZjN_UYcIAj?%>6pO>C#=QE+oad4@%Zp=c=pN zc%1KZafb$fvwKRyBR$yDEAv6}lc-N+-BH&t#e6gjK?fn~iBH^qrq)-cYLEk?Mk&Z3 zBw|W-Z(Gm9a7FMh$pI&)yh-iG=o8_9S;365*xc5m7uwRNG`f|-iD-1bT_$|;D#V?S z_=pK%iJkg%6*`Bna0bYih9)^ydJ`XEX+(AkW|^h&m+%QnnqT8*Bauq5sqnsdQPr3 z%M3&J${<4+CLmszJ{~4V^l5MW2JP&v^7x7uQ#SMGbEH%fwB?ey?QLsqd3kN;Q|QQ0 z|0KGgjM_hS1+x_8q~ z5;U*yjte*3>09WQ7D99aPoS^z))1riXV&>iRkkLUTD40xsY@sQP*Q#Syubt1IKPPG zvE*EoWCh{GA!pWe>q49CVcr5(QP*@rH^i_R4EYw&SVN{4@O_MOc5;%Hq29lzwV79C z^S6|h6uOu4t?igF}t4GS2>}M<>@TOrzkAUnfZy9ba-b3?Zsl(2lih`~hG~u%#*qPM8eDQ7{ z$v*eaQwEKWRm;ZJojyiklMCG+?O3VzcoyUjm^R;j>C$(cf5h}8lHz3l6%pNHi&h;~ zQS@XcG@U5xs?p|$7-T#b{SSe`-eL=x6dd~rX=QXN%$(N69p5^6?1*O! zHO!vb02r~xub#+ivTwaT4i#_Km{7EtW$@Y6f$3@1uIoM+Ib@N_!gmt=uhSd#4wzv0 z_LY@-C*D)PzJoJ~Nq<@4ZkjVI0<&YJmm?Ngc7qmJL*GCFH*YLg+oYY|e>=y0tx{Unkn4CJcd8J ztdq_+KqV3N=DH~CESxj^vVW4>Tkyy0W|liz)(kKk#=%~z#YAMHYkXnvEa z+O@FLf@6|$nJ`pE`0G_qzEaCWg~jRSxk1-oqLjOJREU}2vQ`fNR3K)mk-Ued`y(g6 zhj;u2(?zKE(?vRYu&aekP;4a=6fX=9^3r%b52MGkjLzcIW&E!pbRk)02A>BIj?a;< zdEjIB`#?eIxO(RGWEg~G56~tG+u{ja*hg0Aula}aDF%0kuk|9g{gvv+js(wnLv8lo zYrI0H7G02DRnfq$k3~(^GCae}jV1;)#W7iyx2uJtqOP5NlOX8*)7?{cR_UFjt{Y#7=qiZc~;Kv+pX;jLkd;GS8HT zz)!EzoDVL1*T8WtWukS&N%b88w6(#~7H$)=rNkGeh95;xjrU?nd9dnzK8v=RSwUq` zWQVJ>#`}oa?qHAPVj&O=54O;Zh~69tRS<)JyUFj|@Lnx87N-e^@M5(*Ah!}wGlWNM zgg)lsClx(bQ<$F)orBCm*XuoEAPJ{TR~U-(q71oP95R1WqMS^yrFx-ipowiTU7cg2 zH5lT)OV?&Mo@*5nOhoem6B44`cBwxagk9cbGF)a#0oh-cDN}2kSq(=7mWOtZ)Tpwq zfcw|h5~FMP)3Qd%q*agk_0V8ILbzlCZv00+Kvg15efNGbPMMMJt^k6>XVD}LLvg$d zF}oVXgEd5!q5B?EY&SJnOGDCwfBEf*Cs2ZPof1lzS>>n1=*WLuJ)n(`roCT&i0)>ciJF5;F>R*@#Jh>hS;bG{!j`@d#b)O_EiV9`Ub zoh_0XZhR5I-WD~*1bGVN?1HZmsf7~O8?&`tUSXewVRB(ZM}uEo3#T@=9i8_#LKPGd zztQ9C{NbdId6;;<>>Sj5{ggO;QLc4^Jivl~;| z`r#JeohuqX0t#ZQDPQsTgWX}_=YK1|KqflY` zMH(Uduly%53e1^8pSB%$WsxxB`uJ01hLvIFna1f|YmOR=ya#14&fX^dtw8)JAm{V@ z677WhK&g(rzUYS7^jrxk)Z|mx)tg;!-DyvjX}cT`cAj$-3ckqy?p`Ja7Ob}U8t6Ou zW|CgraH@S`C#M5oy4%J#>5P`Iev2Lw=}~9Q))My=wDx%4akwcTv;ZxCFX}yO(2H2T`m?Sn2)5Y+&qw250!#`8Zjrx5QoG3 z2vWTyf^oh!NBoKfuu&z(=$>xu7LZxyT1&{GZpcZO{wQ)FL#IjQ2_CkN{?w%XBLLL|iMH;F$quw@gqYc|pVw~3l@q4NII59p4Ek7%Dq2J{)uX4Dw1h^$JT;}g|si7M2B z5+CfK+4diP8+%u&0aV_$76WB0>rtB`qdBf9jyV|x#TgN_t|kvG{FSiub5<^FXOhZ| zlyV=xNC*j^F;9A_pW_$#=)th4nQjjzXeq49dc3g%&voup>WV^LP{;7qRKk#R|Fg4~ zIxi0Y5VRbzUE}SQ6NgZ@D-v<9X2oT=qbE3ryjX4`4M)Fs=re&D1w8feG{u0*=I7)0 zMozwY5JA3oex0eWu2uXOni|Jn*}Px=6C>Hn!BypXkU8Siks;B;!M4JmS7fm!yuyx} zgU+Z-B45YlXJ>YWP6RQE#iI{GPpStfg|12PmRkoz&{&x<{#_QB9#_c5V|CPoakz1} zPkj1-CV9et>#&SEW8g7^p5y#tfxAtQPO~jtpyNdl6|Zzby69|~cJ5l_c#!YQf6FBa zI_80oNPYwubXaFpzn-+?Gzjm_hsTzITgTv3O|NM3UQQ?{?%CtEFYpq0`>(#c_L7eW z$|bZ2BJ$kGT=&FFVyPCJvhHFbX{z2CB=7yhlYJuu{AA?aQjtAAXGWBRN?Is%M+Zj7 zJ0k2#BbRmgHf!jYORME>bNBlJJM5o5UF~A%gxw`5H+^5X(sNC)7zR~f@}~=1UXj1M z5nu+OEsdX0K+bo4Q$n2F!EAyuK7s|e)7T7jd+`jWrr^O#aK+v0iuZlmLidml^q@-W zx1GSe7^g0}yuW-zKv+k)@XkEO3*lj_MAi5+f4|Y9mvLGY+^G6mOjS}{^(!*>rX z8~ebC0g}E)n9sQWO%DepV9s^xBB&K?&$ec0^pCB6*F9k>RB!{wc|dw>VbTi{QX2BQ z#REPs(!PganXh*%*OKLqn;+@*?s*>=H$%6CkL;LSO2ir}-xA%^q;qmUHKBX{htYD@ zL6FJiS~GTE-iy*8`R`@CaMPnvydlV=1@*6{9Wwh(FzoM z>odmx@`@`KO{Mg&Z`&G;2FK(v9&gMx*My_svf`f8_P_KoX!IU*81 zOP7eiqCk@c1ExI9=g>%W-~HNZ#E!v*_)o|MKC!0+Q_-Yi+zkeDo#8Ur(w}4T&nHD@ z!qg6CXA~RR=*|sU$+rUkZTk0f2Y-V8myp{4`I|z)72=wL!4&9Gr)u|HtEjYJ!wooe zN_D+ZgN^>%+dsbzU^4$AuT#SCqsjx7)^YxMJ?S6O^ZS>ksE#6ebqC*jfUgbMlbO%{ zJ1PI%rbSzJB)mwQ-o0S8$Ln`DgHU^Uw2(#QHk8HH-Nl|p}d9H!9 zP`EOx;PWaR-P!rH>|qROtk#k+_x!E@r0?&0<#>Qv6fGFXn)`~(KYCO|;Ui|r;315t zA7RnWk=KhG^oaH$m1l4hv25f>0L=5b@;edIEg4MV>NFO&`$Fi233(velci5sHa|G; z8pSPUU!E6MZEakZD!P08I&?URd_r#+kR|wM&1Ymq8j(T|g6c}7xE~v(w^>5`hP5Ux za?QR~D9zP;d%gY0M2Q0afxx)C)_LOF`<`0QMx##@&W`46y95ZR4Z=RXhKN>}K!X~C zzQr7Rciz{T^ZPDgP(?NMfO&>gIWDDoA)gY-lzUi0>Hq5z#l%EWQ&g;>A?}w!(+btE z;2pmZMJLc44ljot(rKyf&xE=ESvv3ud>7;GTh<_yvG*Fo%1?<$lhm`7C6P>%qk&%f zqx()8t|ylXN*8tg8*Xc)I|Q5MusP0u<4U*|aU(}sAA52zKZqh#gBggMU-Z%R%0(Z! zAe{!(wqT+*d+Vl-pu&(Upi~1SuG1dxE?@;u<`T5%uOh6@^MZ?)<&D-ShG#s0{K3dC{Y~d8UsO zP*Xnq=(|q`WR^%91b;%`{!w%bH6yWunI~8I(=6%C!~Zzs_xf(bW=mmAj|EL{6(Vns zj1P0tw+gd7)eVQ$Vad9z|8QXvb2nD15{V6C;`Xt<6(8pY@Q+elv7!#QFO4^Mr} zaxdlRI5Hl2t2a0)A7Tv%Hyr_n;s>H!p$uLw^5yIq!1>i-{^$G>jZSy_eZZtgY!9Ho zh;dVhGIR*5l_}uZ0E;yK#UfI$?oX8fzkQk1eE=-MGx9G$(&GZ{q~Uv5$HFEk3dHdY zJRwL+48BW97Aa>^{R733>1UC?+kUw}GD}9>HD`HNs*kY%0V-?EJnqW%N(sn37D5q5 zeGIHlr_?81%bDYn=Isl_M`(%wI%89bm}Cr|xHF{?gy_>8PLM0r6=2y^RAW8g4mISR zUz1lRHKtNswa);WN0{?^D_ZL_RGa-z#QD9_uZ-q$UJKV3Xq9`yy(+(}DlM1FQiv3W z0t%tvvt+7bkd5OBW(rs8PD1Pe5Q5>ngI0JM^r2OVs}2SapnrpjR56T<0OGArc_!$v z;6}(6aq%cH0c`!JhGR;qLbC2Lw0n~@4QkDvV&VVloqtXZsV+QfzVvy{OKB8bQ@8xR zCF)jJ(#Pi8V@B57a&_b%T|Dm5g9@d7alF@vTFc|_HRNyhi*fSXGD^-|U;@pM-S=C| z6gb@O*`2M%^)7Lyj5qn|qd~FT!42@X5oouKY`2Yy7K1#@7>$A+E;)xYAGURV<+uu} zZ)v;v6!;T!XW#>z>Pq_E15Bul-*NXW!NJVHzFy(abdkUTNin>6k-eFp7cLZZ>}l}R zmJ>oa*=l~;{%^?oUQ*ZR5eGRJ$t55b=21X$M3uFEy}o!E54@_REvl*Y6DYva$c`HU zxx%zB*(XD(f>4qhnWmABHz9jHSP&v_>5n2R?t%{O+<1O5j7*W{HNj-`!e!4#>-4=? zrGjbFquaa;&`!gU4XgJLi@lNaClt{ayYA=S$Ti!M<_r$1%C|-RW4SSj>B~f(7KX|5HBPQBdug?n%`Men0Ig` zvaA&Ti!Q7Qi>z8OAr2#9l+nZ1&#;e>uh!==U%~3}$D0PvNc$>W)?RwkT`p>r03)Nstzx$WBU$lAes+g5wc$_04=<(79aBQ z*&O4a^x*e#F(IoQgNGXs`uhXu;M;B!abUHrjQ(p20r$+&6;s*xpW+#32g2+Cz5ORX zEra1<+n>1)W8Q{T*eB}hqm5&ecp`&S2b5^@gbQ%`=k^j^6bdrM@=XFZ+%^CH5M|AbKpq}q-(kO@v0Dx=bZ$=9$uMl1&q9IK5c4H9>MX{+>d?r|aOp5> z(iNGeK=NpJVlWY0X$;la8g3WvDy|nMgo*q;7>*NjP!;QqiS+<^-fZ0kRzwvIxch#p zyGR*fRhy^1B%-?*-WbEfVi@Be;WN9y6FD~+e^Vxmn&Xa{lqA%Ldz~!Jk{` zo**hyaO6L{_yLorO0WOL0r%cKeW0R^M&?%&Cei7GM`FhmL9tCH>C$JS4VM_0HVqezgE{_KDX}I+ zJ{+L>0;$0h)wu>u5_XxKHjK^qk`wK?l0iQJn4H2NtN+=x`w4WD+~7kM(sIv03FvsNtfW z>xLmxzZwN(O~m)8@Kd9fc~i$N=%~$QjhEkF>xf`653ygXHDa;3(MEsTDFV_BC9A?F z{X<^AKgp5vEmnWx8ixZDmECiE=b?!9bmZm}NPY(9-p7ax;EPY;8kQG$aL;ca7l zp{q_G0dqW#ZX1ITuppaM44t*}8Ce z$dL}KCNV5mbsSFgK5^MmP83lJF(d}_Yk&MoUH_!i7zwOcR;-#;Ho}wKVH&cJKisjA zP4=Ss%Pcrt<{gUKdGatdB6@f@f5>;k9NRh=G2*(wIrSjj6cJ4g+8CBrbFEQYm{I8` zWH_RrT5hWdn4pcD)8B6mN8WQac+@b-X3iB4n3LFl*hG|oZ1OK;d=~FExT-WiVwTs> z@%kc}e1?Q?QIv{O{XtIB>GLn9m6(v&=LAT%59S6!^+Y)={&ap|m+Jp9HzVek$LLRW zn4*N#lb6T_k?ajN2TJu!u^m<+B+|$v?n9PBqx#P?tpiS8#a>tS@+>hSJA)AxLBwn= z9`bQQmEJ9t$J#poi7OY0col;mOf^2G5|ihG;u{I#7dZqNQCj6r zCooGqWBNdMJERiJvYdHq?ER{sMckxcqgYJIqw{}l(HE7;qxd!@hKRmDir$A~n94L} zljmRFyW%kqQA{ldMrsV$%Q}Bai0>#M$<4RuQ4H_n{7H6BiSEax$hL^{Aae*g`ldno z?_sS~Yh+kpabfHKF54OjERrBu{tYfFXRu&WKE@=ibjZi2-^PU|$?eeOkU#+pnw3&= z3^TJ@$VKXIMO;X&Qz73&KgYrPxb7#ZG>9UW{|f~3FWhKhL_I9`an$_g6-F@s&cfJH zs2_s%*Kc3|e{xJkHyfbo&AU*VAWBmh1e`gTi33<#UjLAmf^hmq4vU-24qsm@VBM_$TX~_W(lnx z=K`L1<*0argenpswD)@8WmKAh*(xH$kxUO1P;6wqt|xb$B8cvDS}HG!{3y#q==B4< z&t41`?hTm##>^@=ns0`5HTY$4>iQ5hX;pTt4SIil64CwibR;ff&jyaHby|mPu{`J3 z6Y+Kazx>JoIDJ)qw!<^rjFtisQQ$N5dpef7d1|qz&#mhi9~*^!LK;^B!#T~%V7(qV z*2CQ?7Q+2gBVfa;+> zTXARkLU{UMPgM~TF0e>d8HRx}ERzdk{qumbb$mp#l!kzr0DChYbLmG)xoaTt6vG^- zlR>WoYZ~mKFe3$>ZOD*cdQ0CC@{d=1$cpgsdIxtU8ysfmU(+=>5JdkE$8dU4?s{hY ztVOi@{Ix`i)99xE47h>Ya7x?GY#LTxOPtr7RnzqdP45+_)S zg06c2*Vsm*u|hyU@sP9+du1>glXVkjKQ)Y#?*S5zprRAw>Ju3sq}&TcFMkX`gC@B? z-S{8O{P*Vws5&xP1Iqnr-?$L<_|4`K68{pe7l0S%dno0$a@5A;XX%WU$&mb?^We8! zwK=Y{27DQp@}u}~2Vek&b^!HyyvA1przo$5p(Vm%$j}2S<&5=Q@hJdZ_e@n5`(+?k zuyA;RNEly`*zs=fn+GA%))g7dqu?tRc*f5mnq)}dur~v>R3)afqc6J^uoC?;&P&H! zq_S3UumT{K;szX|2g~(DUpm22 z!LQ?wGG6`mONTR`c)L9^Qn5htQ3;X4Q079e&!SOCW`j@SQpRRp&7Tt0M-aVdfjpnN zkNmC#45%r5f0a^2y>o})hun^Gscv=C>w{+8jD|yXs+$E#9~T?Qq-fBtF=X;%^Ih$j z2aE&(r|rEOE359NeQszY3P9tyitYM<_oC=ai*xbe*QJH)%x_ykya(&TKzZO|uF2tN^kX1O9TgY0MJmzlaWp!TgJ2Pkag`5Q^k=tL=o#F+=kg zLKboK@5UwSF*6VWveE*`L8&S1(ElG<`Hi86tC9;?JrD&7{xXg@p<>o&X{lhrLQSth z^G?CFq5^2yP0q_>_N^< z!S?8-!cfNWr4IntGm4h!5`N;Q{_FXbaca7yDPLJ53Fco4Lq$0MGP%)jJ_pJ~j`NeP zc=wP2RRAsk(g2Z6K^k>bq$r@NkLsSoy&r4{08KUeEUj}Rf9n*vxt#zs^<#f)Sv7!e zRkQv-GN1|c((ZmQ%F4*eL?KVwK~d6miSb?26)yV88mWM;bkEqc_s1viqa#M-C&%+J zK~z}Zq`Z~h4Ry~e_1qcC$V{BD)nIKZTCQ2^&+N+v*W8nl5M8Y>ss25ar|$?WkjjyI ze?u=p6ZklvRUjuwRQ1_yCtBra7^71-LM^B|dq4q&$D*G1M;tNv?7@ba#`xB-G_lyP znLWv3>T0@kY1vK)4)9hg>^8=3(-p6fX5*U$5(&SN4z!crfV#O^18avBT{wnI-Sqy4 z>Drjk-yGz~vp20Ln|0MJ)hXxE$zS>u{z)|awu`_$Xk!y-j6v_<+x5OS`&GNkq(+JB z3=8|!OxEe+3*b$jrtV+#cb{=yC1arcUvRM}!u!V~Xs-ii7=3^29!Fg>{`w#x%bHcY zrTJYFXj5A)&T~iwJL+DJvqB!77%RILc4l<92eG+r3_-m`X@}=`@)((#KL0}KrLkwh zJJ)IgW2LM6c8vn$mpd{U*X~qqX@0B)O+c2N@oI=Zl}#9BN%0=cv&q`Yy}$-MNH)7<=>+#GkDhqq{GhV^EPK;# zTH4;Nc>@@5X2OUXeBVP|uQ-@tcD#Ken{}z@Y-N7eK~2!`&J|Ovb49n0t=%6z4lV%g zQe0fjm9;HO-)$Kj=$sBvTrh7>qI|0yf z)mu4<_OFJTq$gRB)AL*n2OF>RAFe1UR13fVEr6WD&jHiV+%GVSktguTVR(&q`pY6| z@R=Lkl@7B`ZDWU}c_NhwE>a&n+YCe*Z{MX@9nvl|`ZP5yTdyKvn&;PiMRUci%pm6k z%rE`P9TU{d^#!$goP_gJ@5yw%{~7im-|wsNX0Bm^C$stOPk?mqSGBMZD$jeZrPMF| z&OPSm;0okWMBW;_48H(IiqyIu4tLBSGa<+^_DZm`>`BChv|Q~R`R;Ovg6!)cU8`NU z`aAi~=-()T2n9)5bh(kmCwDkH3n4A{-dKTIv7lKpj$cW{a@WaAhvFhcMtw@G9~by^ zl+VoWzc?FlFI#4XBvC5VVf?OB*0N=H+D{kB7Sc4Xby{ZIw}mgR2de2F*fMV6Cti5W1}GZF7{Bzy`NifJ1z<#t;CGi+S4q{wzuVza(L}--`ZV;YJ)5xM zvb4fuV|tYWcngz0@;1a!yo(Kiyc_RUUTbnT^sGx=K-5fdPnMHq)vv&8Q5ZH+6W;8u z;Y3n$R>v{vkIq~{_2vE-)21{8H_?!k`(&*%<)RU^m%)%JeoDlXfdcvfl1cZ3&uhqv zwD9@A8kQab??$FgTk#mje76S4qp+!!m`~J<2S(w}L#n(`R4*?bjkF80`)B722{!}d zpVE!y>L&G=xKuhI1_{_Mc0K9~nKq`6Ref{PymT%*6rv>;ov!bQ6luX1?D}0t4Z3deJt8Ww z(yd;P*{>vVqty3(wrzsmtx6je=#lI?%G6<=p52f)6m96sbe%J$mCB0h)6S3-%OTdg z9N8*2$W15;weQ{XbjbG{DU?(9S6{w-0lY7G3nR|%!Vr)hd)Lqdrje(+MR+xju*n8)_+og?PT&c_k{GcRp-3Ol31Sw#<5-+RkMD zQbWzrCU1>gPaW8QdSUcdROrM2uR_l$Nm}W$cH^Ks>!4Z9RNe)2`=)G9iWVlJi4dKD z0hj4x5G43%ugd2-DZlLQB{RbJude%PTIJ4^tCTGSM)(+ompsm9J08bmHx>SpOM<&F z6*Dm^T!XE;oK?p6vHt{cSToj>TORE{Pd0_|L2( z3M`NUibi}9XmZnRkNO50v%$$Pfp(4nQzA&nqY`-NmLVE>d(+Mx zp;bBKg5%+nNzboO;tYsM+;Q^B49NGmjit&yO|i+XvbJYVor%ZF+{h~=ylO`b;ozJ( zjL_N|fhUk=vFUj2ITD|P-ZY6vXpN6)bu$u1sp}nj#^IS4srWaWv*dknigE$q&0;jh zrn$F0%B2*#5iXpWf9g`~@nE%EJor~x-LJ=A`UUK-rA;qa?c9?6?7i{x`?oRpXq-aC z6?aqVFO49RWh!7+8B-*}_@s+5-Ha6Z@P8qNqEY(IvbxP*iKpZm{3x?jwykMUYvYx+ z9cAzIaR+yC@m=hg_1fsRJ?0a%FxH!oEs&RKGxiS47$2$|(dFye=ptC>o-C* zPVYVc_-v6XR^eLy-JQv2nlm$obuYwajp?>~A>Zu~PUo1aIaJ$LCCb=KIXVBMRGp1l z&uBE~{}L~9abs>kuMD4rXPjnSlYs4%6BR;+Cp+VL+>7Iz7X)U1~~B)=UhCwde5bETN9J_K(}W5y#(P z2Uy$ZHM&V(mCaWtzx^h3rA$1%m+iOX<0>8sfp3$D?*`#y#!uBu@3H55cYnlURM43yqZ5)-^r4P#U`#)V=XH-*J+ocW`iim|GWe`DS1f{na z90e5wY!H#qMnGx+Nq`U_6O}G1L_np4A|gV-2_ik>LBn7IpeKNSuP3x_KThE@_)5H`2!yrdS6l-lC z%(f1cteES`MYfoE)UjRFxm4w0vU-R_@|HzejwClX$2;v~AJdh><}|s7U5R$XX5Zyi zs1U7!ZBv1wjJ$YwfW%y(W!r{_V|?^v5{}VuewCKTEocn`Zv)pDy-d+TpY@uH|Bnvy z@y$$r@7r!_VKv@bTx?8?v%*gvGyCia99c_Yu|aF9#PC7A!h^T8z-7vMy!7Mi@Br7r z0^=0P;DyTj1AMAimOKbx@qN}K7UY>0!;lB)Q(ha}@6bNcM{}S0EwfoE1kitwK7G!^ zW4!+U%%%S)4I7PD;}FBdfkVq{{O``8RlNITw{L0-(o$<~m7>}b8;D!T9y#;6a3ie5 z#nAH?l8?vTa(lZ+W-|y73UkkUL~L)@KzU`BML#!ZhsN>nqKXu*z8$Qve;7{^kAUr( zYIi7CjDeplGYr`zrmy^kxPxr;T1We$KcK`CV;I_>ju??eSs~&gNS|H0W zdeueUVW_wW!Ln>>+@o+XL>4dsSdUC8eMDH3mdBJK)HT8qa4BXg#~p->B;EgToizOq}+IES;SWu=MR{+3`@16Ucg z)K9wzC@f%HJy5(ywHp!2cjH&6wC_?8dBT%nYeFom#&+|!zD~R5}pgxL+RG)Mf zH7+HU%J?lBp-nCGt<2H*>K2#ohC0`^>sxJ|mLBr}zc3uT zshScP>nX@;Y7bR~jTZ^*`T8epZnYgI#D{Ya5J(cTSrgBC6ZV1(u_cW%D<++`0a7{L zubT1o*C*05EI58cM@QZ*2K6fYAJSGBQWdXyL%x3J3L=GkVg%d~`_2!Xd%%_&(noP$6Snm0`%ZLz2aEjXH~N z2{Ei4+%!`5kHJ~fMKMtVbw*3-Hc8m`2~AZw1(aKD+s)W#&PVyqH{$z4nhcK^O4PTD zlqrM?L-Tr?b9w)?jz{<#;M1xRwIA*$pxvwNh#z0RLvCS|UDFWEOHD0{Pyv4+ zLHlZoz?{+HJCi?@Y#Q*HFbZ`FveK2{WNtxZN(Vu7RcX`aqesk#&yO zN5|FE<3ExIk~Z@z9ziWC+HBwxc-iZbFI*{XC3P;#p|~fb<(8blj_G4CEa1ul_PvFr zB`7UekJ=9&(NncalqXt6`}qJ-RZ2*uH1FsKnH3hSm^3ZEBU<_yubl2X0I*g6^P=Fb zCP_7*1Yw*X_WqE5bWES;wXu?%2(twFod|Py{aatNkBB$gK zTc-cb=pxmBndgA__UF$I3uL|sVah}rsDmf#l0ILc-!{oA)gzrwDA{dwiDy~vdPlqG z^lnhY&=t7+l@gniE5_<_4)L?~o|kHNa$ou6Ob9l&oOb-7VZ46Lq%O%eb8T(^nJ?2$ z-p zuEU^6+De+irYx?hX(L8Ap+QYE4rk@PMxmvKxO-L{~gGzQE&8;HP!rduTp>)I;g8Y~bmtLg0T zPePjPZBp0lR2uq^E)5&%?5bMTK8JNJ{@Q7E2lusOWr1x3Uz(WaIT6wk3Huy=seYdO z;}zFVJs}pNyYsG97#43bId&r{nEF**$%n9QBwdPG9aO878NG&8&%#MThF1OrGUsmO zR@Ivd>M>w#au~as>DW-6y0%xY1IOm0mQ&Qpo0eHfzv0#wK>nDKgG6CVw~WnIuQ5QlYL$cS-!Ip7wce)aZ-2iVi zEWQ=44z29^_AY9laL$Q1y*5RYtW4%Jz{RM1$INk=1C|XXJry_ue>Y#>Q5!imop2_+ z(P-llz3NAu#>lfIVej+Y0a!*PsmO>M`@JYo4QS(~CjLNkzvpdl<+lG8OeqC1I(^w7v0z^1Hi0>RHEm&IrA19U z*jQ$G+-l}7anvhMaaJV$Rq2kNRHclXD%f$^&-B=>>K4ma7)lHVMszE z{W~P@`R`)819zzXu?z3906Ix4r#8q})DYl*wQnnQathqc@g+`<9RprTJPTgZRWBjd zM3%Bio#8;m>r&c3*^M7^ek!ydKoF%l^4!{u?U@$zb~o(b_Bf|q#syU}5S5;lPX%>n zPB<5SN(p)aKQ2OBwGO$WshfMPv7PHlk^=Ifyh>^w|Ke8B5nFAt_2Q$dj}X(!w2#4U zKiWsTy$^a4-r)(whV1Z$Wf%xSdF+XK8{XBZw2cpdsob1SN z5pi)ZY_o$e(!cW0va5O|xx+>M6uqG9*zCEO;*aKr!T30A_XR*p-dnun;2wRUX8Rh~ z=v_7to-&L_!?Yr++z$!#BOac`AQIrNgJ@ZWK6%*CI*#s}GbQo__hz=cyg!v^I~Gp_ zwk`{|7rC6m(MUDH1LXkY7Vg1Z@Jm0VEoMmoRWPx86a%)N*xK3i402iZ=XDqO)mqt%Vb5GQwhP%ErXe{pmj3waOP;Jr z**kMLZ32*zHGHh!yJz0y!Pc>>Z4)*g4X_g6Z5$v7LQ4h92q>lTkJ;3 zTlFzsNaEFmio@`kUO!M%P@zzNgge!Awir1RWq*j1r?GC2Gb7?5poatmxSF(!E=5*7$%S(nh3k0ZSj)u~9XWs3R zu?8{x80X2Lq0;|e#OJN4ctaUwl+bJ_)4ZwDk!1qt&Z_67-7taaA&pxtI z8{Gyi^bOulDBVdBWNl%w%iFKca?_!zfE_9OX1c}Q`Ykn_AI&ip%ym2CjM)uNqX&df0= z1DRP_QLSs$fn9+6!|Cf`8O{oU(n-~ayCU2frsOavw*<6VdH)X(wLA1|It^k$CRE^* zuW$ZAWf8-6&M&{FLL$C&X-32xnrDL8b}JhgX)eQ7YLdc0@)~K-56ql69(RWG#d|IK z{Q5>cEy}rwhr&6|&gJT?aiO63%C#A~R5ZCVGLNBOoyXwXcc;?0Gs(2|;iwAXJT7PE zDVZJkVZ33OofB7rDvu!(HoT?ssEdyu&$BJ4>0~R+eK$3$R~v1>r>CfdAhOE&r?t9~=d*FgY4{=sl1I PEp*<>{!GQ69=HDoP|V*& diff --git a/src/webui/src/components/Package/package.scss b/src/webui/src/components/Package/package.scss index ccf30f52f..54b1b83f0 100644 --- a/src/webui/src/components/Package/package.scss +++ b/src/webui/src/components/Package/package.scss @@ -3,6 +3,7 @@ .package { display: block; position: relative; + color: inherit; margin: 0; padding: 10px 0; cursor: pointer; @@ -10,7 +11,6 @@ .package { h1 { font-size: 18px; - color: $primary-color; :global { .el-tag { @@ -58,7 +58,6 @@ .package { left: 0; content: 'Click to view detail'; text-align: center; - color: $primary-color; font-size: 18px; } } diff --git a/src/webui/src/components/PackageDetail/packageDetail.scss b/src/webui/src/components/PackageDetail/packageDetail.scss index 76e2fb56f..14c64dba0 100644 --- a/src/webui/src/components/PackageDetail/packageDetail.scss +++ b/src/webui/src/components/PackageDetail/packageDetail.scss @@ -3,7 +3,6 @@ .pkgDetail { .title { font-size: 26px; - color: $primary-color; border-bottom: 1px solid $border-color; font-weight: 600; margin: 0 0 40px; diff --git a/src/webui/src/components/PackageSidebar/Module/style.scss b/src/webui/src/components/PackageSidebar/Module/style.scss index 0eaf0268d..aae88c24c 100644 --- a/src/webui/src/components/PackageSidebar/Module/style.scss +++ b/src/webui/src/components/PackageSidebar/Module/style.scss @@ -1,11 +1,13 @@ @import '../../../styles/variable'; .module { + + margin-bottom: 10px; + .moduleTitle { display: flex; align-items: flex-end; font-size: 21px; - color: $primary-color; margin: 0 0 10px; padding: 5px 0; font-weight: 600; diff --git a/src/webui/src/components/PackageSidebar/modules/Dependencies/style.scss b/src/webui/src/components/PackageSidebar/modules/Dependencies/style.scss index 052d3eb1b..5fbefac14 100644 --- a/src/webui/src/components/PackageSidebar/modules/Dependencies/style.scss +++ b/src/webui/src/components/PackageSidebar/modules/Dependencies/style.scss @@ -7,7 +7,7 @@ .dependenciesModule { line-height: 1.5; a { - color: $primary-color; + color: inherit; } } } diff --git a/src/webui/src/components/PackageSidebar/modules/Maintainers/style.scss b/src/webui/src/components/PackageSidebar/modules/Maintainers/style.scss index 657242d9e..2e3895e3f 100644 --- a/src/webui/src/components/PackageSidebar/modules/Maintainers/style.scss +++ b/src/webui/src/components/PackageSidebar/modules/Maintainers/style.scss @@ -7,7 +7,6 @@ .maintainersModule { background: none; border: none; font-size: 14px; - color: $primary-color; text-align: center; padding: 10px 0; } diff --git a/src/webui/src/styles/global.scss b/src/webui/src/styles/global.scss index c5f8528f8..c935d7e56 100644 --- a/src/webui/src/styles/global.scss +++ b/src/webui/src/styles/global.scss @@ -28,4 +28,21 @@ :global { flex-direction: column; min-height: 100vh; } + + .el-button { + &:hover, &:focus { + color: $primary-color; + border-color: $primary-color; + } + } + + .el-input__inner { + &:hover, &:focus { + border-color: $primary-color; + } + } + + .el-dialog__headerbtn:hover .el-dialog__close { + color: $text-black; + } } diff --git a/src/webui/src/styles/variable.scss b/src/webui/src/styles/variable.scss index 352371ec7..21d93e095 100644 --- a/src/webui/src/styles/variable.scss +++ b/src/webui/src/styles/variable.scss @@ -12,7 +12,7 @@ @mixin container-size { $font: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; /* Colors */ -$primary-color: #de4136; +$primary-color: #4b5e40; $border-color: #e3e3e3; $text-black: #3c3c3c; $text-grey: #95989A; diff --git a/test/webui/components/__snapshots__/header.spec.js.snap b/test/webui/components/__snapshots__/header.spec.js.snap index d7bff72e9..2e310c915 100644 --- a/test/webui/components/__snapshots__/header.spec.js.snap +++ b/test/webui/components/__snapshots__/header.spec.js.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`
snapshot test shoud match snapshot 1`] = `"
npm set registry nullblank
npm adduser --registry nullblank
Login



"`; +exports[`
snapshot test shoud match snapshot 1`] = `"
npm set registry nullblank
npm adduser --registry nullblank
Login



"`;