From b6a49fc4cbeae7514682a5d0fbfe8e816af79a7c Mon Sep 17 00:00:00 2001 From: Zed Date: Sun, 8 Nov 2020 01:32:17 +0100 Subject: [PATCH] Support quoted replies stat, update font --- public/css/fontello.css | 35 ++++++++++++++++------------------- public/fonts/LICENSE.txt | 17 +++++++++++++---- public/fonts/fontello.eot | Bin 9240 -> 9264 bytes public/fonts/fontello.svg | 22 ++++++++-------------- public/fonts/fontello.ttf | Bin 9072 -> 9096 bytes public/fonts/fontello.woff | Bin 5844 -> 5752 bytes public/fonts/fontello.woff2 | Bin 4880 -> 4772 bytes src/parser.nim | 1 + src/sass/navbar.scss | 12 +++++++++++- src/types.nim | 1 + src/views/general.nim | 2 +- src/views/renderutils.nim | 2 +- src/views/tweet.nim | 1 + 13 files changed, 53 insertions(+), 40 deletions(-) diff --git a/public/css/fontello.css b/public/css/fontello.css index 447e9bb..d022bb5 100644 --- a/public/css/fontello.css +++ b/public/css/fontello.css @@ -1,11 +1,11 @@ @font-face { font-family: 'fontello'; - src: url('/fonts/fontello.eot?63207931'); - src: url('/fonts/fontello.eot?63207931#iefix') format('embedded-opentype'), - url('/fonts/fontello.woff2?63207931') format('woff2'), - url('/fonts/fontello.woff?63207931') format('woff'), - url('/fonts/fontello.ttf?63207931') format('truetype'), - url('/fonts/fontello.svg?63207931#fontello') format('svg'); + src: url('/fonts/fontello.eot?21002321'); + src: url('/fonts/fontello.eot?21002321#iefix') format('embedded-opentype'), + url('/fonts/fontello.woff2?21002321') format('woff2'), + url('/fonts/fontello.woff?21002321') format('woff'), + url('/fonts/fontello.ttf?21002321') format('truetype'), + url('/fonts/fontello.svg?21002321#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -14,8 +14,8 @@ font-family: "fontello"; font-style: normal; font-weight: normal; - speak: none; - + speak: never; + display: inline-block; text-decoration: inherit; width: 1em; @@ -24,33 +24,30 @@ /* For safety - reset parent styles, that can break glyph codes*/ font-variant: normal; text-transform: none; - + /* fix buttons height, for twitter bootstrap */ line-height: 1em; - + /* Font smoothing. That was taken from TWBS */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } - -.icon-help-circled:before { content: '\e800'; } /* '' */ -.icon-attention:before { content: '\e801'; } /* '' */ + +.icon-heart:before { content: '\2665'; } /* '♥' */ +.icon-quote:before { content: '\275e'; } /* '❞' */ .icon-comment:before { content: '\e802'; } /* '' */ .icon-ok:before { content: '\e803'; } /* '' */ .icon-play:before { content: '\e804'; } /* '' */ .icon-link:before { content: '\e805'; } /* '' */ .icon-calendar:before { content: '\e806'; } /* '' */ .icon-location:before { content: '\e807'; } /* '' */ -.icon-down-small:before { content: '\e808'; } /* '' */ .icon-picture:before { content: '\e809'; } /* '' */ -.icon-lock-circled:before { content: '\e80a'; } /* '' */ +.icon-lock:before { content: '\e80a'; } /* '' */ .icon-down:before { content: '\e80b'; } /* '' */ -.icon-info-circled:before { content: '\e80c'; } /* '' */ .icon-retweet:before { content: '\e80d'; } /* '' */ .icon-search:before { content: '\e80e'; } /* '' */ .icon-pin:before { content: '\e80f'; } /* '' */ -.icon-user:before { content: '\e810'; } /* '' */ -.icon-heart:before { content: '\e811'; } /* '' */ .icon-cog:before { content: '\e812'; } /* '' */ .icon-rss-feed:before { content: '\e813'; } /* '' */ -.icon-bird:before { content: '\f099'; } /* '' */ +.icon-info:before { content: '\f128'; } /* '' */ +.icon-bird:before { content: '\f309'; } /* '' */ diff --git a/public/fonts/LICENSE.txt b/public/fonts/LICENSE.txt index 1d98124..c8d90ff 100644 --- a/public/fonts/LICENSE.txt +++ b/public/fonts/LICENSE.txt @@ -10,13 +10,13 @@ Font license info Homepage: http://www.entypo.com -## MFG Labs +## Iconic - Copyright (C) 2012 by Daniel Bruce + Copyright (C) 2012 by P.J. Onori - Author: MFG Labs + Author: P.J. Onori License: SIL (http://scripts.sil.org/OFL) - Homepage: http://www.mfglabs.com/ + Homepage: http://somerandomdude.com/work/iconic/ ## Font Awesome @@ -37,3 +37,12 @@ Font license info Homepage: http://aristeides.com/ +## Modern Pictograms + + Copyright (c) 2012 by John Caserta. All rights reserved. + + Author: John Caserta + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://thedesignoffice.org/project/modern-pictograms/ + + diff --git a/public/fonts/fontello.eot b/public/fonts/fontello.eot index 377b209a7ea5d0722262f6ea968278531ff214d3..aaddd6bf3959a71b00b92cd01dd4067db5d94b53 100644 GIT binary patch delta 5344 zcmb7IeQaCTb-(w0k`l%5FNykillCMD9c;@FmD zC2?CX^c=}`l@?j|y3Ht>HvPa>6i9n1wV7KCMS$jy0&BN!7>WVK(4zlLDDubJY-j?s z*3Nm)Qski`?W%hlyC{`t>BF#iT2++QxdxT=62e*T}r#d%?Q@$!7;gHOQxmoRlKR$15;ka0@);iwJj)Kbxu;(sC!TdjA-gmirW0~fhUm(QO33KI2^>Y0uuZO}gp8$eCS-yIGHS_M1 z{{RFWVE_K|N`3j|w+_BVNbFshf6@3lJwq3a-_wKQ+ll&nc4LA|HoiqD*a-Os;Z3B0 zY=M-&MFaw+AYMp_CtRYQe0E#jZryfm`+n2+o*h}5I&Ry(-L~!B)tRwAyiiz=f1N}j zagu;P2u(PMC=iiIL^d|L(AGb4t+bnLKV0U;$ksqc$!BpG@AESaJ0aUJ2uk3H1G#Ru zT7#f$vj%|*Y&)$%Q0KA+K^^RXgP_i54Lr8r^jU*=2zd|ozyaKmG5q+m4ekf9#G7|H z1dcpGLHnY=os+^T8uZI{niw9j%5(g>L^(>iG6;@VMS%2_*VFKMydIz1CUvKL zQIB6rj%0I5m3|1lbmpB`&#uv5aG5>y=7Y`8yhE?vewLoxMX)h&-&x|fxgWxbbmrS5 zlu&x2jglw8Lf66J#du8Rq)>|bom7n_B^myV-%6`AYb?rxaQ!R!$jCYo1rfY~G2w2( zk;1X^OT?s3kU2r(69;o6{eAIRq$A*wrLfUz`=`EJu2v^+Z=p8cZd(*7Pb8U_7Tc&y zseA^6OwSXT%ou{bpOb>dpnYZF2?6VHhll>*NErm-s!&Dll-os#-{%UsL&Qm)BDnv( zT{q6Pq$W;)T_Bur3*u9rO8g>b&QY>N1W^>u5J3>nV-hnScP5ok+e7XiPmj;%wMp&9 zJ1wv0a`^*L3_&8o5|M1O$nzWq!3@uQm|-{^j)tSX{(#5p^V+2@?8HR=F$f5hPT(QlA+k;4pzvhLE^^p=Wt5aVFMty_lh%9(JpR~$K)~E3 z>$=@Q>R;wx<9L^|O%kDq91o;;=r3$>2uV1z z)lvh4nSpF7tMs&s*m96`NKQ&FswNXjIXRjbr0{R#2u+TLa!2TaP%tzal7l@|%wEb3 zXQvSr_c1Gk18&A&KA_U7N|-g|#)&1_2%3v0qd^GtXVPTQk1w>C$cync!hS z0}-BLw?i7V3`dLArR0<+81VR^4d5;{wmnN`fj;0KgFDSd4w6gX1s`aG*dvz)gl{i*ImT#`Cdy#c=@H`G|- z5FO5i4rGHqzmu1p6x9#4qlf8mA{oP*Ta69U3_QFJWV<=~X{YUu-RZR7u{)aXaH1m+ z>V}EUacm&kIUI|J{e5zaEPu?#3FU95pE;WO3vi_78tS0M?%|l?ZD|{7YjM*?(B6?b z?Q<*H7n>=lFZ^ z@f*MY`Wv^M%G!m)6>m#6tk1=V<~qLcu5{(Axrqt?;W6%JP7B}ukH4PdX1Sx|g5m@&_%Gt(%~#pafBd`S1YaQtc6N-XeLanx zo%e(xa{=i0em-2lpM~)T48%C#EyOD@;NyV8`(GH`+1a%TgP;$<-FzD)tl{2Y{Ds`t|gMdc7trUAb^om|t3{nOnmx z0pAnwHh%PHDB+V0HL6C_jMtRf7Vi%by}*10rBczGoWGzqd-($63UfCU=1>6?sx>Ce z-q_?gu29igwB8v-?WQw8^-cw#s&D$J4{RzUv!!}@Gf2@h%><3{DHbS{a6c9-6dpQs zMwFVu-kxPb;+f4p+Eyqo6q!^kMH$~)Hg1I#m#Kn%`({hgCT%mm9UgCRz06TqVB~a( zk>jidEHIB8XWfXpk5})z$pU)Z7s-6NT&tEDO_j?Jw=63)AfW2yG!r$Ys4$_o3LNCZ zY>COL&TOh4iAG^bCCwzw72t|jMk>VxCJscwY8+{gG|CFg zKUsn;BT<&$-8Ic*joAySO=twOA~u++x~edu>Q%@>{WX5Bmx$ZaxKfZ)Q0 zT4kO>McJq*%mX>4nO8eLS858i$#R^v)zuqm=F^TF|J)IX`L!nT7M?0Kz1{+&Rh@ZK zWuVQtUcKqUi`%eAx(>SsqAHjb3=J5{4LPC{3{z7EhSR`n8nlmA2BJD8AzpBNNZA* zVW<(xcCE>y?9iG5%81q!QFdxg31yeolu>p!w5AO~kJhxKOlfe|R?(PLf%2$IhS77_ zYH6nJGY0pJ*DPatpE0p#T(OLbMwl!0M-pvVnL=9MwUWh5_h%S|3>6?2gA7rskRi%A zWQejCGDMkx3{fT_LzI1xA z8%(i5=<$z0k55CRISU5s@f+Kn4$gw-s$&tXNp|=Anog+*#}i~98EA?$P%I6V%_BOn zFZKV;XIN84Oj08d4dWQIUG3CqJl7R>57Pir$^ma+0$uZZSHwN4WkM5aHnvY0Hh$S9 z)5nbMu6SdN!uuWAkHftdWFcr9p%?y5tJ7+==^#35Eu`uj8C6jxHpbHI;G=Fz#&lGe zr0Tog3aj94mOoY65)@I1YzYamqpahTp``%*Z>~_MDolb(8lUWL_X&kcO=TiHjN!2$ z6si#>8h_Ir_qG(Kpw_U;TmoG!8UNPZP9@`a-TC~)E)xZ6E+!r_Q73@pp*<68fjdP} zrqpS8dZ|^g9p1GWmwM`sBfB%;X8dbUqLGKz%;2t5EL14XMoyPY%0xNS9HM^ch{qqX zo{r2uV$~n9?ylV*?|-f+Xly*S-=VR)YIny;jU7yFK=HA{8)N%@A9aOlX4nvLESf3d zAttQMtMIDRt#iV|RG~RC>e$1KrnF{@01qKJdt8$3{r{clG#tr|?#@4Yg1yn~uvNBc zxG~35yD1%o*}+s4I|`F}NM(=z6UJAfJ~0O^c??kl(Q#Np{XRAd_=LtD1MyKzvk3K2 zrr?pfo6boMPn>-e>M)~i5;6r~763(XO53ES<}?6P^CbFAgJ}+Z5IluG2%bhC01b9V z+k(%G0_aMB;IR#;tZl&u9HM6cS-Ov*A4T0+^fS>p^fS@3=x3tyxM>mGD!3_vDsGBk z9ydj>fIde7)Eel7sE$quE}#>FMU&Vhpo=CkL`x(!pH&N@&kLpx8qnuOSbS(N>`Ug% zTyevKxZ>j$ME6fXoI_T~PXcTJMvt488a@65oDc5>eA%3t0pSe=2GjkP1=0OaVI^ph z<82FKyjLuU4r}0hWG~*jIWyhw06cfZ3iv5YjsACGDQGd^r!9y9H!O$_uWFmE<_8Ir zBAWuo7vUoj-T-Ai#cXxP$7gTsKK6~*)Nn)An}iHB3Cfm7Fqd2Ydcegzcb7wC6Ez7KMIW&O%$t{o{fKL*9W zf}*^(u~h9|jDHOw?+D1*_3E`v9JT#B$ZH@gm#XWvAAhGa3i4OLz@KbxT)yJ}ryuP@ zNInJg|GBwU+x)ku)9)Y@djRs6^zY$M;WhmsKExLupkI7bA0f%Hn+U@kLe~*BISr^4 zT)v4oG!J?KC`ROg_ZQ!6HW6aaF$y0HbDI8BlC*e{5BWhM=$P*4F3Rgo%15x>gdsM? z_Gg1_@xUBY;@Qj0iRU}L>CJR6aE+Y_Ttrm=uiI}o4GA#f+Qj&4Bz3~9T(;c-Q(OPm+PqA<&x~O)#|qi4sMMTzhpr|a(AC<*jOsDs3^1P3BGAm_*MU=};D z*C&tSEC&B)uD?+|^Tv&7JahfdyLXS6grTg z1t5r&p;E}K%ZZWC>kPO8$blU^z<(qakHI`3#z_RK-&wHRFq&YVcrfozV^N6p;sjJu zCmzZNWFN`>+@pDZ?s6r%-+Qk+;lh9ZfyeWKtKXGKyz@>X;p#`aWYI>ZU_Yo%ZXL|U z6bs-hGXtXv;&`50Kpe-HSxjc#u53D?wg+6D?oO}QBk=)!)AF5xfkGb=B$20-2=p|- z5j#HZ)2)iYZTN677>ov^T|U3t6 zU_9}9$Nh zo>;z6na3c^77KE;D;Smi-CirdPhYkDOqqh@Qi37Lus&H}We3?JXx1C>COJN+pRu1} z8HEKQ5fE8PAW*cZV&MtIjZn;@O55n+jOHD1`(gurzq$CY?Jw3%n;YbPYKH?hg1QPZ z#AAK~Easr)IKshMfr#0B-hkU3=ok2obeB(1qp`$bZj=V({vkLms85JxaXx~{`;+^3 z;`=A9!PIEx@cT2VVj?X4+4FCHo_q0)n-e4D@<`vp$&qe6J)Ia`IEm}`%h#_PHy~oH zf}0Kc01OGEXd&W$thQK_ox>>LZ?mB=4s(!fK9-HzHdEd#dA(;K0nv>N831%CBzhG^}PM zE`R~^D2e*eWTE7CIUP`@oJ5h|2iYOCE3U%v(H?~S(J81@0*P5?jYsgs-3G#}cY3qw zRA;1vgBEuW4nYA91>g)F2*`nfzZhkSB>K9_LdR~^C1 z`qiFZ*SB4n^wsrB(DCZ7DxCpUZ;z?^$-?Is;2*a@X95fqIJ18BaZu~Ip5D_V3k%my z687#uVIXp!ybX7#A9W3*p+b%~3x}X}B*G;s3alzAW+y0=DPDjcX9b7RtXuZGeQ+E| zd{}?Ov07&-`!&4<2X-%drZAJ$QVQXDp&i3b;vtl?!AZ%%#moz>6Plw?Ppu0GiVB{8 zeEGO6tL|90$cNH!o%($anv5l(jfb+hMV`WPAd7QDa4SLe)gkwR{E#5#>8-B8)X8hN ztKWFR8@zt@&?%4C84QliC$uiDef<6=e_`g>;8S`3p&YrCPX-RZ{H5grIZmFzlX)t% zoh=eSX+K&?oml4mz9TF6fL$rX1qc)v$VT7okLS-gM}CED)O=(5M|J!;m=O_Unh*63 zcc=QW`CnY0`2fu9ePs3keXaSB{-D{^Pq~A2G7cTz+iaQ>tx2vIK=4XNUWD;J@JtVb z+z0x4Yq77Q5Ai`fk2mp$qXYN;#5;qrtpCiHh+sdKaRAv@YHORBrPZya zwc4_!dgV&((v{VXOS;9MT(T~2eC|@_@_Kb`P25~vx^i`^W`~#Ji;v(Oo42oCI=Asi zBW~5Me6CizB3!Ojx0Y7u=ISNx>gC!N5AWJrSLo8ld1>qN<;=NSZJ9f}y0wh-HGkNJ zg1dk8M01r5{g(fzM_E>k`*Q}D`1IXwY%NVJP3X_biqqt(%SQKHIoiNh{dM_Z9j6x; zRRhhHYm18+gKElzVsKqmSb#6hl?`4k8iHC3MWc%bu4D{OQ=@8BS#I!Wiwc{8bzpt= z4f7LA22DjlUsAS}Z3CwpeS8;~alBla3svVA%jzP`7EY95Dik#ei>m(ZfK=x-LoB85 zLi|gWV#W|aREw%&AhlRE$k}rSUV_C9K9w;g_3qx zw4u^OF%`WF`88LxXa*{&<9o7ocNLrl&r61`2KQr|{%kN;w`=CEcWqWWQI3Yx=wd3G zG1{~SArr=Obv$D@G}uK^40~yYZ4QiDTr}F4G!If6NEyQk%eYLt6)0$U?cnEsrn8jkcP4En~Q~Bge~wM^5Z&Ls6LUniC$aft;mh%MGU!LR>8x z&h#R)nsgN#cJ|e#kG1a`b)=#yOe^MIsc5LdTxTE{uzL#fXD>~Gp;MrJGH?)1{aful zb+3jRh)gV$4X0XECJYxLs*@gtW1h4#mJ%AK2$jXAHmA zz>LZeEJg!bgEAV_8XTkTT7ze_Lu&|(hO~yrXjp4VjP9#z4GUu;8Zz3_{|`$#!IB6p zpnxTeM!^zBV_*rRDp_HiGdoa)t- zL37hS4e1X^>DmC zfU(~P4-7*2%h1*EKc!AVFjFJD{w30Oea0Ec^0i_rfR^x@^<$FY- zO6VR*(2m6-YfcGz92SG+)X9p$K~$css*0jJ6pNRXD$A-tOVwrQR8p#j45}~hi)&J8 z65D3j_Gd!h>Z15B^y zA~oq?3!#5MlBgfjR3*!Ho`h~4S9_> zI;I)<^fm;UMRR+YVd|gQ8NALKX)vI`j5Jg9$U7E(6%w6Qhg(KI4dux}LqE#p|2mh2fl4o3TxDRxf7(F(QZ%^Lfm-X{JR z{UkIf_IZtdz)WdI4#+g~djdkEOxEG(dgSV1jb+rBhRDolcM*CTm?OYo#>{GWv8j0m z7*lhUVTv$yjA0lv$1sdJ&M=IbXP8l7PB08(78r&x&oazt9k`PWQ~>5v48)i+12JZi zff(~?hA9E_2MoiQQw+nH&oB&QPBY9HFlQKsF%^bkOqF36b5=8k_5!`68TFyGaR~Iw zOmB<;S2K$Ogr`6_ry0Y0@bgSC(JLm$(5oiLpcgdbz#jA>6HMru$ua1<$ua09%{bVC z)-%QilT7TU$uaD6CdaT_+C2-r+qW*pV%m^u293{MW2agM9eE4=?R>d`@k{Wg@Rt(2 zHZN^95YH+Dr5JP1O0cxcIgrT-#kb+j4SvyrRxD1wjS9O0MdOV)zI7a~_FLr!T^?^F mnDn-E1AgBYZY{yp36Mqj+_MvGPrZeke{67n+92>IhyDjJHoBGo diff --git a/public/fonts/fontello.svg b/public/fonts/fontello.svg index 4ec01c2..1f30ccc 100644 --- a/public/fonts/fontello.svg +++ b/public/fonts/fontello.svg @@ -1,14 +1,14 @@ -Copyright (C) 2019 by original authors @ fontello.com +Copyright (C) 2020 by original authors @ fontello.com - + - + @@ -22,31 +22,25 @@ - - - + - - - - - - - + - + + + \ No newline at end of file diff --git a/public/fonts/fontello.ttf b/public/fonts/fontello.ttf index b13e72b6370f770315e70c0752e07effb40181e5..29f1ec6d6ee124b4f25d2cad015933efaf7f982b 100644 GIT binary patch delta 5425 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 IWMbmK0S-6r&Hw-a delta 5388 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 IxWA$Q0ghs`{r~^~ diff --git a/public/fonts/fontello.woff b/public/fonts/fontello.woff index 06ab1462372a76ec922cb0a9cfa259adb8a7a616..8428cf8cf6b3362734cae51568f5c293ef1e9eb8 100644 GIT binary patch delta 5655 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%0A({_WHdG0 zg!H6S<51)DKQp7EoK1)EaKR^6-R4LyMW_8b8Avrj?EGjBvxTLHTh9U|YjOWDa$mo8h(J$YPkvL$`;x`ElLQW3) KO3jWA0{uS=HI5em delta 5726 zcmX|_cQjmGxWwK$uCJ>^E_C{=UrUeFB=1qs0tae86<{eC38_g&+`i5(q@#84ph~dj<1B z_u>koJ-GiT(pRp5j_6Vn?V$vLh;=f!o9dh#VD{*v^w1t*w8W|5V-ZeH4gd@dBhi2v zEq0u6Fv7{r_YInrplcEYuG0#VkXJr!u3QT`ZW@bq>-_fnaHK=_~_G>qO-;B8Ma z#ZbVUfTiSMumZ$SY2?Q2iEj%ANC)W01R1!;aFfBHV=2OCpf|Zk$=|*D1PQS+(yJxw z?_(+bid+nmx@MH6+jRqMm`Zs2GRTsmLWHK%@eTe_|$*m?JxaKn7dJ<=6 zP-k}Y;RdVTLG5C>VLNZ~cW2;w1h_yBu>aMcMPSm|Dg>PM9oB$PXkI(nIr?1sB5rHf z^NaO5DMqstTMa!=^y{!G4#C(t3Ptq1C@TC*X>2;>9s&J2BZ@<6>>Sme3H`bdihGj# z2=PqoOLlP+5PE1k8z}e@=`j7hJb5I>BTw)TG^;Uo4wzM?UCvujzB0GU*+o zS+;%fuD&X=xx_?!lwWpFz+zLO!)Ps(R(ceumnkZ76!CSEZQwAXF)CIslQozrbEvrG z)!=RK>K!u~*XxbdVRdeQJUFGkO82U9)Jd#)lRMtEVTId(J^QBuMPTauqn%&zc!Z-k z<4NbECo`OG4VWG75tS~xMM28rZPB+lvloJ>>rC6f3EILvKqp?0Zy)P;GlD; zDHp!58O!4}PGdIpV;YZa?r*XP;h#)7#{08Xo^%3o%s2GNAT^F$Tyh?mkEq77ptlW& z!}}+dm!C5wxBSfeEqX(bmZvi&oHq4<0NZC4Bn%c(`Xgsf2IW~=dCMB(2p*#1RA0_F zW3^yz`C<(#H#@PoG__et$H7QtR!sgC%@+!MGW8`qSmTJt9j$a_t^WMxB_rU=6~xu= zZR3{K*%!;izrUyg#^tusD1zBN=U-3HoR_y)RrYT89*1geC@f$K!}-PgQX_BxkH5q- z$i;N}s6`0s_~?SSB4k1Nv;^ahZi-QNo(E4WD$^*|7;0Pd+AMu!zM86XcrHLG+qkoO z7AxMHo_eS=!RxQJh)8KzLoB_XU8 zSILwLhKuB&={>ij>GggbUDsaiFhBP~V{id;x{Kl7p441 z?rDY;lU0C2q1ChVXsJ3X^^DMAfb91xkJoS{ak>`h5?kkAI|qGlPZqQS#Ui z^9zO?9k%0rDW6X1qVrw3s>Cbb_-bcN8p*c(voiZwD(IxpI# zFimO9b?jN=fgduvpzp7QkRp}d-)jj9T7s1b9WxEHqxI_f#qSL(G7;XA3dJG4(Q+fD34b0{3s!{|d3+>`4U_B5-H8T~d^iZCA#N9U?Ry2SzeclpESC~iH2WtIp-U1p)as%^IzYM-f-~@OQY~HOc2451 zNWKq1TLBOT2;<=aMDixr(!|4+eCIJxaMc0G$?VA71@E9f+7%pq*_71TN9~B(_muKP zik6CMBPbLE`Bcnip>oxh^9udOk)~ozlyBghkZ!bVn&|wtn0Ry*n7>vq1VsMm@VWByk57wL@mwLMl#|21q=V}A9dnNrAs2lxKk){pJY>35^4 zQedIWLd{%)1NWsy+nn|cRww6bf~?FucLLs>Ux)>CF)ggLima;yZxSy#jr$9$TS)Ui zAxdIJC;mOoWOu3piov{@<`Gjb1yb9%3TIU%V<_He{LdF-FcsY0GDdIQZ*Q-T15mn4 z%tGoCdn_RzY@ew<4(E>)^ag$EB~J3^7zU`LhV2aejY(^)5Yo?&o+mrc@w})@v9ZY1 zts$h1)P7Ad8n&cc-QMx)>U+!(%yz4HKPn={lU*kTUZJ`9PQnU5JsR0qPS$MWE&-4u z06&-mrX7n9Z?X;FQXq0Tm9q9yuR)pM!#iiPV4Ixd&<`PsfYQrkC*Q$vkn0{u7>GXU z#vnvx_z4>({C-!dFgS7%r0L$d9V9>%%$6|oq2=4NW1ub>>(9t^V&c~OyDsX}OUe6uSzSkJ}|ZSv~T7+UBf9qG(L^&hlMb zuN*8=UAc`5>#^4(;JhVO|~nvG#@HZz}sR?qla?>g@W`P-TUFOq)$y zOGQIr*1GKs3(1C_PnQ%8I?t$t>|O0YMv&|8wHQ?sHIsQ|2YB@~KJi<@u>xRZKc0~E z-5OmutWO78X%W1vDJ(Y_D0+cZ;u0@7^_4v^EYs<)A{V;8o0`gs8<~zz=XOau6Nyu9 zgjeihk9$2?J*$14ox)GZUqCA@L{+tauL&vpIK;^-)aJ1}H;VD-Yh34pU$NH zbb1=kb=HQLdFSjOSsJUo5euvkI*a?`iFU{8o{>55>@H^NVn^MiN|DjP?K#K&!U&ml ze`;*|CBcN#dKpy0ON1*EQgnQ|+EOg1--t3EC|5-*MSs3we|I!1h2%Bv7cA9UcK-Sb z%nZz46Vf@e(T}YAl?@sU{QSAGYznh4(UT*XSejWzEsYy4Y1OWu=K#T36I3xfXZ7Nc z+OO$m`~1Nx2OKNK5^>Rwi9~PN!-Oz$AV|VG4|`hO$O&8KytxSInCH}jTX8t&#%eDm zvP6NKps6Z`)zFXOaOEg!6Ne5_CGurNrc!_eJt7Dh)w4pj0C%fp49leUi-u}NsBO$IP=&6cPk_}# zkluK`QtK13Th+a?EbU&;gFi-4(gsNu|nPlAxU4`z14{foq8!)+!&SX~ERE zZO)|UNhjFOl6Op3#uk#rK-cyqf$9<6a@&Q;AI2jVPGHZ~l)>$%2BnBZKbGZ-{C+P4Y+(%a8rW2!7uwzMDg2YCoJ#wBflSeu~!)y1%)Kb+t z9&{H^0}=wVW#Np!oK1;pWf~qr)tVW2Sj{4Kkw(U6`+=!KTAUHg^&LIc$NX9*Gl4NF(><6Vb}IWVvPyqnfoV0Ms3=Lb7kg1f8*^s>5@r>AiPu^(WifN zxb>sk8fZinS`T%x1#bA<$QaM#bO}xqym^w&t&KfPn?_AYclC?@hO3O9vz_xO-9-%5 z04+hXq%EI0wORyZxkBfPtWI`YJ`dI$oEM|Q{|qZv)h%$iFSJv2ITCk-i>M}~(#k?Q z`Mr$3zmv4Dz|&@&{lle0_MEfNU-D_}^eVkXX{fv0=i}1r>r^E*mjgQTu z&2PW1^TTb)_53JFuA@u;A_xre-ZfrLnqDmhnZVOGPqj?yQAPz(Ti@fWp4@L`WCPeW zx(?V!VongIC6bX1PqODq98MvP4_5q7XI}F`S=lwbiDF`z8KI_l>Mto~!7I$m6vW@7 zVJ7TCgGICAHT&FOrYF3t?8^EBvay2PF2FU1;GB6UuSSo9rnn7GiK2G@(;pd;9$g{7 z;P9m-c=%ox95W&D8)8<()6d^w3&`uk-ER(k*)PQv_C>7?E_ysm;%;~shJq8zYd{sD z((x6nH^NFjz1HR8$6(D!(J+hbEalWCU32bGmTXGE zg?H!i_Q3(o+n}F=vY;D29T~L9wi)vHKfo4ZY%iP+m)$NbpnzL`ZI|_e@lQaZ8 z08=BAT`unSLAL{srB$x)fpNOfw11d>B8uK6s}=EX{RR!n_PyAVNC;SN{U@uIooX%= z%1I>mDY8Y4Gw6V`;GjL8!?8+$_(Y6;!!ejVt+D-Gz3w17^k`7vw_L&dwE) z2bO>JOKFiV&-Jt>*^AYPZ!6|Rc2?Opp&n}lP0RUFh&$@-$<*6UK&;DWu_$9v=#0sq z@YQ+fxv5?8%O_F?4c zdtn#Im1tl!WLaC#iJ5L0?ZOZ;?PiDkv!8reZ`W$>wLKtlb-%7B+13!yH=!p<^T9pW zTeH<*2Q}|-wiGu6ytY1LrK|Go%J}-VGt{?Jp`b9a$1zcZ;jP3p?$OEupPbZF)iE{d z^&V&yJnbKWlup2Fbd2*~%3*I~1G0^v971f|xOED9igbbE1y>CGc_ODD9_}aYg=~l+ z-cmG~&|;7dJ;CAs_xu<2baxj&JWM`J@<9MXC>aGa1eEp*!izpMw5PlK+2#Y&cG|;( zNCb+R54Rs5y3*U-eH|4ZK7y7ClLli&z6z82d(5ruuxkoK`q(UD&>l7+AxH#+(j7e- zdL@I7F{CjJFg!7iF^w_PF+0JM;E&*bEIF)xY+P&??9bT85F1Df4i^aY-~T^4p8_d^ zu>Q9d6CH60f_%_>9|Cl6_21NfNl2YuC`I%G{5^ggt@esEFIXsDa|83yqeq0UzDk4^ zFP=MVK9AADd1TcWa0&~?D;Oy77lhd6>;>=Sh`iFl=@#o`Ns`y4mm#*yPEwsMQgisJqcrQgJhW-1SntP2 zHcpw-YfHu(A)fVrnMS{-_hHXijwWJ-pDtze9TR_1En!Fcipbm@$qq!9H#rjp9JS4v znLO$PB50GZ>Mbm$-u%|_=Z$WD4_O2Lo!}h4i8MlgdN(aI;&*}+hfui63Z-sOkxQVu zlCy?|VtWT^U%`c#%zG3G_FW=AnXM-~ibW-w9{UfsS2r0~u2&DG#L5{oii=lf#*RNN zB|H0NB$Si;wSjXCtO$N|Q!xishNQ!2gN{s1pz;=7Bh56vqE!x4(7+vX_lzU2AThlyo zAwglMaGIRfOd2U>J~@cs`*COLS&TwauB7qf#`irKy^fBaOBKB+GMf6HA~st#pLnFI v7^w%f8W_y>UP;Yc9ZOwnga?vbM}H`;Ed`_!&P*R`dX+&yp$DD^INt5~3xd_{dmhH>QBxt;p>w@9y@wm%nL zhzFP_CUDadq!MakKt+r}fQmxL-!q}JUXMxAdNK#^#Jv8du#zwnf#=g^hM)ve;443s zJ=y>rpiBw-9Fl_C^PcOJE^2kv(>mabS<6gvNKsX?7VI=Zs~Lw7XD<}D0Wx$(I6dd@ z|2J2keYcW2Qw^U$Vm_fTOOl;SS2{VVN~Zq+rDth4|8ug04a+DLsySaWbuR#^we1#- zS*2FUwQ_~=JB(e_L_Wr5yG1pi+fd2DDt!6qPl5mmhAhza8@KN#bG3H&I?Gs!l2kdl zwOqYauMrkTuvkD?@`$sVv+_k8=wtm2@WJ4Zm;W=Ig5nI#ceVS%hI9O(I{zs$dtdfB zYWDFBdJYJOFob>V^vW-h>c^2l3bPD}8J4G?q#(zj9p^hwHUddm#gCg$(aTU>Q$^AW zRhxrCA-DVru{IsvVbVKZ{vRG85ebr{NRuH;PF?}xfozI=gVF_M7aIb}cfLS*LtuDA zV0lB}cthZMLlE$WAj~%q$Tw~v-?)Q(LlLC%4OO!kYM_CTfCfSUK`#GsBgp4JMS?;_ zzGdAs^a&gYgDCQ9N#^Jk{^UzwY>}?3G?RSb61Dm;q&{j+b>CPEM_`@yTZBA$hk!WG z9168+9R|`Y%+#eLzDLm|C0}%^=SzF1qyAwoq;!8fy}H33&Rgy1@Z@Q3->`^eo0&dZ z-H4u3F%~CZ zLt)b7!@};vx2ozcrbgSRuA&qesvEknJ7eeAkRI|yf7nfClHaRON~rYFFYgMC-8PY^DLFtGfj2qOC#wnmTO}d@gh}e4PY!A_Ba1{ z(yMmT)&Xi}DI>XQe32fa&NL3zsEr-#$f9UR;#|#;BL|rhA?q(!F6>*?M{+aRi`Ds)M>0Vip!T!DELRe zu-pl$J^2v%*{bGCwv62EkQo(>8C_(T#+uLXNsvRi(rSx02@Q#~FgevYlJ$|WQ6W-A zQ}yWYj0G-eA8}at73Rv<)`TMkO&Qd?p zydM_tL`NBgrr@Y-OlS#HTFMM9W0saPM=O}8l`NoDETq*ey1o~x`orS$s}Dh?LhkmI zmpl3}ZDsTEqWx_h=F=XFafECTaTKZllq6J$hGxWQfuI$FHVE1w=zyRTf-VTUA?SgO z3_v!Fl?IcEC0TlU4|@6>mdt>?#zSB*jC-ea3`1ljTXI%iDPue><{p`V zY{-c90a(ZXLXJsPS2i3|-i8pLmY!xBMQO&Qk`c7-De;T^-i8iaYYF@2h}(qvc8YoW zV#hH9D1TQ(r?t`Xa`KX*illcB@_>qLoo+eNR${3GchAPDi@p8R-z#Q=>Sq8|B+|tHF7ySM?v&DwU@wbXcz#CE-KV zuoJ>_Cdq0ArBR(U5jm@;svgSNA_B~mS=^)O{lXcKjyW}~AtJb9KsQ$Y+vdATko+N( z0m>~{T0lFT6qRg$HrO93*-&e|(hY*sLxi`-BVJs$6g61W(%mhk)!a*q4M*{A)i$ph z=UL9v@75|*Dg`z&q~c+0CNaoHtjZ8ibu$-VbIpkvKla-7>h}GX*MXT3*zW7WY{;>e z_VqmTl(z)lD~76RLpNpH3=5@iuSu!rTN>%ajJ1_s8(E}H*E16oqBcKl-D@=`1*za4Tf(MYzN=;L_AkW5M0r`Z#@kSkTPKrb zXgio*X~*#>CzVQuxwTeQ*G?F7Cp*r>F0?RY*v&YCtSrE0X@`sr=1L$h3-DRV01F~= ziqHT>IY4Zr6F-bu%9v%0Sdd%<+36D7=ro_vXc$*R*7wF4DKaP=q zAbyiqweKIl*xHWH6x13Uqwf;7F>B-biTW^ZOaytEEX{0@=x~%a=tp3#kWzgYejW+x zA+r=47=S{597S@;WM`0C89SV{*(eHfIh0K_wPXaPT6<8G&gF*w8<7(TPduAM1v5B@ z!_~j4#g>AY_#kfPLkr8koP9_Wgt1J#9Vtq+8>rT(-Q6|r(VG1u-u@)XN6n#i7&t*t z1+WBO#FxvIyFg2Hw`->g5ovJOgE5%~j6}HtvzenpT+XEb$K&lmjCi!vh}7~-5H?GV z?#EsK6$tjDQTu+2s8wQa6FJ-&LXH~&`-%aw!_I?rbcVqI?qVx9Y@*sxz(N2-~O6I7_$gae)A3G$cY?cumCLwx7WOZQ$F`xZC3@S67t^ z&?LTBelQ~QOcdV)VPvm)6#=}$YextXes&3nsxc)1qQW(8$R0OHs8qT@m|H!B?Q=uT z3@SFUZ8F>zA4kT*C^#YKX{h!Q#5O`cRSDQm(|i>J7yL#hsqk=;1i`aR5=7$(Sl@SY z+%h=7SC}e)Pi*fi$~jY%Cn+23#g>1koQuakE>v7R;^cUsrh4ViKWAWmV=oFcU5~Ar z{qnQX=C=OrcUy+S6?0qHhwe^ZdpQzxWIG2cjmtjA?Z!6sgc!G$*R=BY7)c_u~+NBtUNwwxQ==;gZ_y~j~=TN z`uO;6S!SuT++{ghyV2PrTIp&XcZDYBE(?LFsUIA8ae`o2U55C2W|&_L*M7T zNS~DvXo!K+IzUcFju)ZM%;WV*v+_5#8Rf zos`VCE*AcnVylyR&^S&ZpgXl%Y6s^h=>Uuno-Ks_H(b za67A4#_lzVkE^DdIncoAW0yE_t*EVKWn0@YDCz(QTSSGY8^gqvg_XRD4qEpzK2KR3 zRT{%zvRIVTk&@P$Eur)e&5M;pi#Bc)MN4Alqu3WwYlEnfxiqzhJ)|74zAR&zt5$@Z zWb{a(-|Nnnb!Bs|+d|i0t!Q=9+AFS%v)+C(DbXQhMONnzkfo@;Xt6(AsMr@<7g&-O z3ro{_mNG{?db*x}-nnB7$~6Y`b<`MJN<0-wi}P%`l0r)IYi^o2VWV#Ju_ec&dhXn9 zb)%Ecc|=#y-Zakt0GKc6FW}{UlXh?ZW+lwZ6+r)>f2ALFTK`!@wD% z-qcYMJ){(WN$^t~mxhT+$8_XZc9+w#?^7ubmnwwa)WBj3P3&JXpCs^s_*WwFHt_a& zC`uq2)Um)$gVda0*|WA26QI#WucO!brii+;)?}Hs1*>0L)d`)ZG+w#Eo1S8!Yu5IZo zp_*(a?Va_g*^U@_6FVf^jSBejdVA)n+xjhuUEWuEA7f5b5aksDO8SyvF_|xlbcsZl zE4y;jQZ-dCBpW`srtxK>&?9}M4<<(A4FGOF-ef%TU zsI$~ZRU!Bly^poson^>4>z0;5=ZuX+#B%n9!oA2{gbI14z-+3t0&rGsz>Q;jf2{BS z*|!R9?sF+?8UX+LzkfCGhvhEWA+wL|Aqu{o__GK*n4wQ!1tFu0G&;?3k8kq^@`&k; z9{Frd51p}t)YPM|`4{?!jLytVk3q+QS1!5E_TDm znJ;mj8dr(cxW`>CBGnzFsz_bn>Uu<-$Li`e`2lCS!8MfHi=sOB(5u$CO{hLQc#!k- zgG;E%$A%3U@_|jkbzeaZvH2X^(H-tHHG*s&TwpM`&CsjGHWmhBH___yN1crY0}4@h zO*CV0s7tgSrFl6Ld~?NAj978vC6G`eNk~#sl9r5QB`0|)NKs0-#07zKNN5k72!{2> z6&q8pt@}VJjI}R?asKUrqky(a7_@!q-VbgAcORVhp?3xFP4Y0;&Dk6E@b;ZM{Z0ki zCNt31(c`SZHi{+xutO34ir?}W@9w_}K~FNbHT y#k#IthLlTDKbq26*zJG#d_=lx`p%v%mCb_}GUZbKKk51`9pCiAwN8nB%=XPqG8yUs literal 4880 zcmV+r6YuPIPew8T0RR91022@Z4*&oF03&b!01~+X0RR9100000000000000000000 z0000SR0dW6g%AiJ36^jX2nw7~m=y~y00A}vBm-CkAO(d@2Z3=6fd(7=AF~lr()p@n z|K)*AhRzPF9}^rjS>w2jcOAEED8@+e{V!YGFn2QPd&W1{Ymo}Y@GarQXpsu-@s(pO zG7MvcB(u;z?@y~b_ucndY|GuO24YQHZ5T$miR77CU<#LG#1MjTIsD;L?s;%qzY)e} zVSpHz7>HM3RKgf0=JD>E!SUVhdi&*;E;wEK?=$PThuAa9Cy{#gcr8Cfyac0Vqy=aoS1RY zd4L0>2?R!O+SGK+Y1tV*f_i#@io&-4|8u3i|Ly#+Y=^OJvn190x3`Oc19Hcl8A#*t_gEz-OkPUjO2d42&4) zUDo5*FI{C=1OHy0TzP;O!&7`6Ujm4T2v~dh8KI9L<@-)dRXYU=&3RHw@WWZ%`}Yh` zGaUweR_;CS>8HQ{=aG?9P*TyLNsBfey7ZW08kEpe6=0Eok#v(BZY9%WFZ8*Mg}w|6X3E zf!3J8Hc9>;BS&xS%=4MLXCkKU|126)Pi^A7hZkVh z1`7mps1O(wXB7s`#2@x>`?%QI>2f$79(;=4yz8D9kMBj#FgbB@KK^8$R6I1cGj?uM zYtcJ8s1EwVA12e8x=$@lC}iHL0a_JvI*#LZPO-ru_nyJtn45=Q5ul-PZD%5KFA^n? zNO0aKR8%<3o7b$wDhQb*93OkAP>qDlpLtZ5F6;;La&R!gZ9nEc*B+#3=_Wfoj8Zv) zQdAFD5kbmF3rsFZj1(G7AaX5MoiSOf5HYJrAqGPwr~f>v6xwH)lk>1VfXB+PNM{j; z;h~o_@)qL|YyK{qv~qwv>N* zFsmCI%}dz++Sojb#hXF8{k%hK-;K_$c|UF*)*a_nQLkbbh1Tq`(P~4e475B6GuAYe zs=*oobTkpvsv2#-%%4@x~)}D^*OP(0f!djiM_0 zWSF6VRpeMr5o;*HT1v5wGOVZE+kkVpzMToSk!@guIK(D0Y^H!MpuuG%9nmu5*vpcKU3u!D_`_?YmX=>?RJ?E3j>{I`o zILcPTcA4LL@AXbl`CLVZ|{( zA6Jub-ak1X&Aa^~HQmW89On#I9p1+!_^1-&Jvlhsk3a2wv2yKLyJ%B5x{b@IZi~+r z+9=~ZL{vV)Bv0Z8Fy@&N*v_)n!kIKRPNtJJ4S7IXYOf`@YYEV;*7n0yys7;N57-mb#O03Y;~2o@Iu{#Z1?~ z22&%EUW%&WfnLe<`VM;dONIDA`)T^7_x+fv=zcK5^@cgWd#XkD}+@f z)EaPsH6*mH5Y~}K_q{hk#%fq`-V|9hG8K~xeZVx#8PO+}h=?^JstqPO*o!3`5ea8R z!WEHl7t44eGTw-cFCx$M>wWTWH$@koz2}X)_JgqXdGrUG-q}P#D`-J%)yLXf7ojbD zR|3ebGdnATDN@#OA|+U;4j7DYk-gV>a~B;JJ6hHHN+<5EywgeBxYH`8J7qrv+Nrk4 z&iZ*LZ?t#T_D|pZ-hx0a`i>g!+OjCwv&#EAI0NMw( zAva)0uwd2!@fyLCXmFM} z4MCw0)K~|$ZL#5Y>rNlwArz6fdJrma8m4A3NG+3&YY-Z?E%YFEgXs8P0)yP4;-7!` z=^LMX@EPJtg+QEh)n>Es=Me}7=gg7tvXKp}+f)Seum)$LTGFRo&gv00mLSJR2m>&E z4<^kZUQgOZJOlTFP&?k1rIh_TOa_Q8J(!B=MrfE!jRvMd#KtTO4L)|w8v+{hQ?+8= zVim!ZXmA}2gD!=~p=G&~Y9Al98laTqy5dSy>Rq110ui?3_J^$iCT_v3;=dd@h-(NH z0AOlT+l;L-A*o8`4H3**h}dA_c9=?-E}0`;Nh4;6ppe!c%mTR(@|)cL^y_g}65Wn{ z(rT^6Ov11ap=N@4n5lW{DaY9H^}TA0)|p?o$B|Y{+@_*}==uE;6wxQ3Fmfvi`x0LX zL;&$Tzc0yMp%{|fPHsl8a!|f(iv@z)#4f%^?leQo$t5-jBoS+h*(gmGm9;#D;)zlK zv%~{P2+1-`qR-h5b%+dt;Jvu}HhjPJfjP@d;Z!|ea=rBVfL5Lnba$jHoEZu_!BESCk4}NfRK`6-_7$bbx8opuAFK%EwVCORgLb_50cT?d<*r-@X7C zhZ+hTZ@HN``bm4x>C7-BHXUzlKDqd*>`dfTSJUI%Rl#F#M}v$6uTYcl)i`;|-z{IF z2U{lrQBlS5<1&3h+nG;gCl>=~7cVX^{{8Rb;`#Fz7aa~{m3=bz9NRtK&Hs5;5Z(^l zfp??+{qbk*$ZSu~?8wwqUd|Ll^#5GO1yxl|P0o}aES~wgePniIVWFs?G@bEol#%yt zP(i`MoWA(Z*q`?p|3bqV!Qx-o2=OZ5P@?%K>Bbj~O0= zsKFcg8&1syHvReS&B@7K1tSAV6U_x8$FnBlmb149kRMO1sOYUI>n+p4iUWe>FW+bI z8DjGP4?%{W)=PT`nfB8*kJxu>z_ct0Iqw?kn<@0aXvgMOjWi%2@Pg8D#&N|_U+Ho0 zkWMp|j1{gRQyGp>3(t`ohcv#<<<5bTA=HaOA&X!j_xFq+lB-ifw)sd>J6M%c`V&}F zdOd~XwMBb!1WpkoZ$7#(Kg*ewV>USJ^>w3+jJb_~`*n4=Cbn+;9)48w-uLql3XXU? zIQd2ur$ZoM{p{@gswBazO*XOaF9hU?{Gu1 z4`i0_DBjKZ-)Jm~uExxT0XJ>|W+NtzE&6<2diwNrrE=@^$!0)4-1C>yjK_@A{U0{C zA=}>vxH@PnL3a+%?L&8gTOQh#zzLjTzj>iOa4vD~2~GmqC3rD6H4i=b&Ot1&)C0~U z7BXjlqOjnlq5@tPx4~cJh&*DJDwH?Jl+Se4H! zZ;}Sb0qA!a{3|oZo{J|FkyMwbsWSO+1#6c&s}wpH&q7C~|V7 zbv2_2)E=!2@qMtl^g>;pPpG@^&^J}h*%a|+VN6-m*_>)~YY#2gyX1(x2&gE0Syr(a zR|XWi001_kZ~(OOdALo9Uf2FWxqqF%hclF?Gm*sjkdH#_fd!i<@#smsM+^=eQu<`4((p+4GpM}R z8W?Oz-9zom?nSQM$*qxsGfMCX4PkHqWnXa+0P zR5Mn_x|HIQkWLr)1G}kS&m)DFP_t3xZmgS*+~C6RSLExXqCj&=1HAO_2jgkM8A`XTo$k~itIivexDF<+On(NAG zw{NWqXZS)a@G$Rnd-_6UE+c>^^khLwlT^vQT#2Vi#D_9cSvtl+-1Fr5D4d5c4*T^) z*HX+`H?Ef_k0xLt5oYs5{F_bdSqse7KHYS8d zSlqY4_6ZOBLPULlP!ts>L2@^Tn@=!ILcyLQMD1m9joO$)q~`>&gNd2xLCHF;OGF%# z)4`*rzYxy?(^G(3*fws0vqlFe%#%YJ!R}$gbSJrzDHS@fwOW>iO-!YOFjWW{_efEZ z8Xp9t?lR;`v4y7UNI^I?2CVz(#rrpwRTN{g8a(!C6ugwo=l80555BkVX%hsdr?pke zhJ<-5u3aGkg2DIyM`f+E|4wkI0sgXO)Hglt%0DYd{9ybPkYV6EVTH=#2X63l9wd6I zkHZe%KtHUnSSE(7!v^?>(EnWCxHMAov`m1%R$8!!8)q)*@g)NC9JtN* zK&fb}RcbV~Q3l}qqys-!8tLm1nE=01TJWsi+^uB0{$!W*=l9XoANba-w5dGi>gH2j z@%Iek*{?cC{qBlh*QcpGS9QBvJDZEVLqGM)@QuT-gV%FTrJr2&AJ$9dS6PJC17ns6 z%e<2}xWx@_@)ic{WR_hFILtu~af$(#p?1K;$Ej~|pC#@xV2QW#7H%Ttn<$4UuM2tq zL|!BE?%eYITw%gJlzbAiH+U=NUE&Rw#jjUC%QgJwEmX?~9AZBQeXx1+zAtkLk-5ru z_D$Z#bGJA6ISM~=) zE|9iixPOw-54Y+QPsAS#e>^X6m9|gztLy{Fx6YL#k!AEkJo%3+Q?>gKS04ZD4~-EI CWld86 diff --git a/src/parser.nim b/src/parser.nim index 417a4fb..0270af7 100644 --- a/src/parser.nim +++ b/src/parser.nim @@ -230,6 +230,7 @@ proc parseTweet(js: JsonNode): Tweet = replies: js{"reply_count"}.getInt, retweets: js{"retweet_count"}.getInt, likes: js{"favorite_count"}.getInt, + quotes: js{"quote_count"}.getInt ) ) diff --git a/src/sass/navbar.scss b/src/sass/navbar.scss index d20646d..af83301 100644 --- a/src/sass/navbar.scss +++ b/src/sass/navbar.scss @@ -10,6 +10,7 @@ nav { width: 100%; height: 50px; z-index: 1000; + font-size: 16px; a, .icon-button button { color: var(--fg_nav); @@ -67,7 +68,8 @@ nav { } .lp { - height: 13px; + height: 14px; + margin-top: 2px; display: block; fill: var(--fg_nav); @@ -75,3 +77,11 @@ nav { fill: var(--accent_light); } } + +.icon-info:before { + margin: 0 -3px; +} + +.icon-cog { + font-size: 15px; +} diff --git a/src/types.nim b/src/types.nim index 1e86fc2..cafb228 100644 --- a/src/types.nim +++ b/src/types.nim @@ -140,6 +140,7 @@ type replies*: int retweets*: int likes*: int + quotes*: int Tweet* = ref object id*: int64 diff --git a/src/views/general.nim b/src/views/general.nim index 8ed76cb..350d580 100644 --- a/src/views/general.nim +++ b/src/views/general.nim @@ -28,7 +28,7 @@ proc renderNavbar*(title, rss: string; req: Request): VNode = icon "rss-feed", title="RSS Feed", href=rss icon "bird", title="Open in Twitter", href=twitterPath a(href="https://liberapay.com/zedeus"): verbatim lp - icon "info-circled", title="About", href="/about" + icon "info", title="About", href="/about" iconReferer "cog", "/settings", path, title="Preferences" proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video=""; diff --git a/src/views/renderutils.nim b/src/views/renderutils.nim index 1d428ac..b57cfef 100644 --- a/src/views/renderutils.nim +++ b/src/views/renderutils.nim @@ -27,7 +27,7 @@ proc linkUser*(profile: Profile, class=""): VNode = icon "ok", class="verified-icon", title="Verified account" if isName and profile.protected: text " " - icon "lock-circled", title="Protected account" + icon "lock", title="Protected account" proc linkText*(text: string; class=""): VNode = let url = if "http" notin text: "http://" & text else: text diff --git a/src/views/tweet.nim b/src/views/tweet.nim index c5d973c..953e959 100644 --- a/src/views/tweet.nim +++ b/src/views/tweet.nim @@ -186,6 +186,7 @@ proc renderStats(stats: TweetStats; views: string): VNode = span(class="tweet-stat"): icon "comment", insertSep($stats.replies, ',') span(class="tweet-stat"): icon "retweet", insertSep($stats.retweets, ',') span(class="tweet-stat"): icon "heart", insertSep($stats.likes, ',') + span(class="tweet-stat"): icon "quote", insertSep($stats.quotes, ',') if views.len > 0: span(class="tweet-stat"): icon "play", insertSep(views, ',')