From 3d07dec8fdd42e00f659f7c606562e3a51a58a55 Mon Sep 17 00:00:00 2001 From: John Meow Date: Mon, 7 Dec 2020 07:25:11 +0300 Subject: [PATCH] Use Briles/gruvbox .tmTheme files instead of peaceant's port --- .gitmodules | 7 ++++--- CHANGELOG.md | 1 + assets/themes.bin | Bin 18366 -> 20629 bytes assets/themes/gruvbox | 2 +- tests/assets.rs | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3e71c7bd..09ccaed3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -185,9 +185,6 @@ [submodule "assets/syntaxes/02_Extra/AsciiDoc"] path = assets/syntaxes/02_Extra/AsciiDoc url = https://github.com/asciidoctor/sublimetext-asciidoc.git -[submodule "assets/themes/gruvbox"] - path = assets/themes/gruvbox - url = https://github.com/peaceant/gruvbox.git [submodule "assets/syntaxes/02_Extra/GLSL"] path = assets/syntaxes/02_Extra/GLSL url = https://github.com/euler0/sublime-glsl @@ -206,3 +203,7 @@ [submodule "assets/themes/Coldark"] path = assets/themes/Coldark url = https://github.com/ArmandPhilippot/coldark-bat.git +[submodule "assets/themes/gruvbox"] + path = assets/themes/gruvbox + url = https://github.com/subnut/gruvbox-tmTheme.git + branch = bat-source diff --git a/CHANGELOG.md b/CHANGELOG.md index 07b8ce95..cae2d69b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ ## New themes - Coldark, see #1329 (@armandphilippot) +- Gruvbox, see #1291 (@j0hnmeow) # v0.16.0 diff --git a/assets/themes.bin b/assets/themes.bin index 78906ba3266efaeed56bf369afa6dbd73017be3e..ae04c566123d6d5d75dd507e31c6096f3f839de6 100644 GIT binary patch literal 20629 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

xqDSei)WCkE_Nq4g$^8v;EqNFxb>{AeTl|CW z{rqa`syLbSg7+Gr?31jc-sR+a8uvb!np^O>EbEMa;N>pYeiV+9q*fB9s}%Jcc+Aq} zq=E89E9CJ4mg3VKZiE_9<|_6x1-yMmi-)n%lXixA3e&Vo;M24y@mtFIm1-tNlV1iV zVtC!9QupHd6l+SE$X2%ta$lOygrR$fBXlBf)A$sBIB@mfRU-c2bpb60E%hjUH)o$h zUbHUWuRYBWhV$$nazw-fJfHW%S=jDg_AYC(7q9-0XVsTNX5E5}ut&f@Ub((~u4mOm6HD0Q zMhlzIwg#HYbcJm9u*g4AwBKSqB0tjRuP$ZPyDWE}&u7xTjEa|7DqtwTOyb}zsPAr% zRpxBk86uZ{CqX{Z4V-b`N4%TSJEd2WKnNKR#o%JZ#pAcaUBIGog4hL;ok~^l`77)j z@tYU!R1ubStXx`hp^pSGSH{Ha=4Px6G+lcU@QJrgmQLlS&qU9#hj_+q(5ou2JF#Xq zZ(s`@o+P*C^RSJgDygs_EzL)TZZsXQ7GSpx)I(s7hqAo|_fN@+S?Uzan5sJxT;|#` z`0B7wzpC;M#t+NlyVwnp2cuLWRn0>#NDC+;#qZq=EH>5Bk8MATU@WFzDs3hk?RUtC za^;}ZAF5&>{>}!1H1~>jxsr>h6pifRV z?7t(lYS;IrPfVT0^;OBKD5W&M)3NpY1Pi;<v@&RQ$M>%c)F`4f}UP zTSUXk$yW#89w$Hd34P}@Il||-uXx8+nEj&|W{Jv@~OpkuDtrTr-8RKKGbo#Ny z+h?*p>LD(}2_Gb0!u{yScMeAmJ4nbnRZ4K^2yRcdYFf?> z<_X~o#1%q@N^TBeb#FCG4Au{JcKFcnc_F~=WtM?0vkPsQG07!%x3;t77KTQ-*F`Rt zdA47V{llE)rqH)jYC(-$qFukmW>eTFyvoaL%4rAs-I;p7%LGNK8+3wx9W!F=IbdlW z(vt%9a*KJn)Q8@oRUwnx!^Tel2B@UT)SLVokjeF#ss;7*rZ_o$5=_^mn8s5yrbBuY z%()z1Y75_jo9LgrYo7&zF%&rV_1n-gZC{Esuatnh~|M8osO|Wi)f_A1=qp271fA9**HZtQnXTrP>P<|dhElv1)j8j(>71lM>Ci1+yE==-(OP?WZb?MCMz{6r9qI zuK^BTh&!%%k1|$cvorHM?9c|VdEh+-LLaI;hQuOLA5Zqp!s#b>F%*%GR2h>;5zQJ{ zj}ap20xpHi`V_1NS3KqSfGXNokgPVEmrBlRx!r2a+dGG?i>0L!bRsZrf%rHNU_H=qxjE=7i4M4~bh^fdg_s8o{ic~F zgqrpv8o&ChM*X4THJlEel3KsIC@FH1NQ1oJV? zI+DNJtl>d{g+frl^Q}<@2CGgoJs3E8y6#}TQLXrN8ZCgHp?`jg`Z@9?l+W;j@0oTyDp=5t6A36fiV`(TUb)LcCHKR>|pk6O^x6xd)9W zR;P40?E08CC&fsVe;1SX#C!nd0y1ir;%3v0O$Z^;ra8w;q&b(g#7*2f)cO$X^-^6! z>n3*^XR*axxPk*a)U#ch%O;!)c5u(r#7A5>q*NLJ?d!R0O8r9A_g)rFIXZZnd1)R~ zXctl*H)VF>J4|0{+{>?I%g9IxFS~|@aZ>X0q`wx=$x*6lg*zW=0LG7z77wISrCT6$ zDE?v9@B7deNOi=KAK|CNp!Grv2s)ib{q9h&H6f&I3O_J<#FL{K%A(v%zGw zSOx@~BZ_yhi(DUW($fiH&VZIgyjvN+lHceg$5F~u7&A%Po8$4+(Ga$3A0^Y2!qOQ2 z`l+@Xp@Rnx&;B~nc^1hDkcn6h7oH5mP~ez}x6MV|vWHyMYm5U|rVcuJwliyw%Bj7|jBI2doY-7L-46aE@J)>p*OW11Zvgjf&t ztKU}H;7K1u5K(7_o6xILeG=6+&^A(>uKjkU!~-$>j$&HsfWs`u1ZF3TrKFP;KgyEh zp|RA{%VBb=v1>BO1F_m}!HQ?zk23fPoyn-Pu@zF(EDr{w~la!?@+Djdac#&>JS+uifc&BJSj|B*>6oA*#I+wsy|n+%{AEn zxf3m^_~P<&J=(arHuf)m<6F?-#c%u^MMr_>L$vBM-2P;mfpv+4fxOW^XiXj|Ds#c11NDH>mE$#v zKNY}$Vi4417`T*~GMJQSf|*R80hmQWj#^{BGgoFFUuKopf>Jl=54xjB6bEOcg_Gpb z3J#W(L=~J^hiQquoRKn8Z7bs0yYk8_ha{eOtIZvZ3b8ypkoF!~xdMZT(>Y`nk-Xe8 zgI?CIT1aDQ-}i&2XrbI;I&Jb8;2V(uE}0oL*rgotRHqR?s25o=uCzHEC)=nhYg}=$ zWF5grsjP7^6-Xn1aY`+kkRvjF1VW^og@u!yec|&$I9dKD1x{9|Gy+amTyYXkR&ILnoBT6B6+7k8V82|I!^s{S zaIykHIERzX;bc=^FH1OCxt()3+2aIG_QvaeK8KUl=yEvO3B$<>g=sm#$$t32Svj1n z_%DZ(h2dncdFe0aaI!g^Yz`+o893Ry3M+Fs+2adNR!YzuPBw>=od}$)lpr~rZ1kP9 z<(Dy>tdtKqoNNv!do01po;Z6bhm+0WWX+8neK=WpYb+5sS#xI=4o+6KHzu6yeE;+u zPBw>=HB-`XvTypi+m3BGS?OLqe&J-Lo#F~7E3ym(>2iXT#RV!3Cu`>sS_n8oEN*olD{!)M3+HgM;bpee;bf&JRuuWRGDuS*Zl&aI%FQPF80_z{$#+=9q+&HTx$V;ADm3v~1vHWp9r=I9dGG%i(0P zQ5_d>vUt9A4kxP$)Z-OS7I!%w3vjaX9OQ7aCQdn=tZBFBaI%GE4ks(^!pXqN;$Hqq z!O7w|Ig@~sl@`x&0VgXhpd3zinZU{7@$O|0Cu@$TB@#$TEUi|z8^+u!aH;dPni#G&=rr&CLU;p~ohu#%eTru<>c;JDd zcgZD}3=64|z4Dc>{Eg9HpQ;U5p8x>Q&U?)VZNi|TH6Ad79M8Adf$s_v3-3FB^6M5h zjtSc={`TfKUY|WTcB1Hc-rZlk$3m^MfqL@pyz@?riHVA5Sa>bX;>cUyW|6z7fu2Z| zn*`hh-;anG*@3e$S;~xfib{q_2m0eLhj-k8thZf3)GAeu4q9pfocF-1Uu`jU8Z}dO zm@Svsnfw65J=N2yY%5@?idpY94}2AA*0nGfs%T}S`yk&KQ<+y%r@%{lEw?jOl_`1+ zrkO1a_Lw3`qvV@%#W7?GBa0~=`!^76-xB|ulm^Q{F`6hgd8d((%yi%G)qELfnAg4P?b_5G5lr$L5p&oFS|@P zo$5SVoQ3-Xk%>+v4P*+R_mjJe7CE^vhDO1?w0(Hw`%K84NQH&4SxO>3dJp`~y_nD> zGW#SsxF=1e$-1&yo(XF876vkWt_>IFok;Q^R9`(37-zx6wK4_uDuWogB1uSYD=6_w zWak@?u9A-gQP?Euc*DnDW8wA$%QrsvvGoW!3?c6w`ofVr;LSu>hM^uUb`v!EZB{IT zMC5>p?>pf2IuGZ^9U^jfW8kVgXeNAfV=R<{Re|gpBQ5x?dG)~m?5iJqD{|n^G9UQz zyr1Op04g+yd=-vnIboQ|TAh^HZyc&wn-_KMDd9i5ez(3q$S61_}~jH^=>_lOKpsj+>POFTy;a*Y{x<#X+;EixVuNQb%#3gP|F zeYYYE2_O%YGuv7(rt?oxu#A}K^KX0w(#vd^E<^`6s;fDw0#DZ(ry)=G%>SZGzUt<)@5tI?g<(FWU9ElHdHU8ZoZm<$O3AsLc1>5rft!gHn{ z!k?16_WCWFV3MKXv>9<~lT}U}wr(P3Rk!>I#n%RLP;L9c9YVze$kwe`v~o>sNaJ!? z0OR8Unstrk`6TE2z!+2q^2++RU@NCKoWO>MPHBm%{)hQ-?J_l2Y`;PT~VPL;@>Sg21Z09nT9g2o9uZvfam9_ZNDAk)v0x5NL3MR>i6L$HK6!fL&Ff zy@o!db1)##-oiQ0z%Kc2R7dUUl$z-mZAz!=IyGa7O6|k8%9R)wk#KyAIHjl3qNs{E zxCFf3BQ_EUrxnYaR8Tu$Zjt^_c7vuq6WCG=fy)G)t4qhCAZGyijZ^1n)1WrKjIa-pk@7R4Yy7- zEw|`PfmZc$7u&xNZT5{y+NB6N(M&mj!hX3Cu>m=%_ud86hGt+kqAr_aY_Vk-|xZM&2TC8e1mIyHV8Sx*~IHreZ6rXkt+n~MG3 z+9lg!{gd26?e1eS!GPDpNzHU`wHsg8hHng{y*Zan>!kZ-X*Ej~7f6?ER5QNzYp-L^ z3HaV`r-v0+eiFIkA!4mpdd_2P`0ru%Z0lpasqVKDe#ocH@A1h!Ep|VD7uq9Z^FD`L zW%u1gtEYdlI1ujUIm}g-YnMG@pH3!fZ5MmggM68_&XrldtMunqBaFePAhiP6H0)Bm z-!x7{^j*e|?a!yc1{1>RVwK zdAGE+iG_4i)+QBhxMQZ*LS6pk@jbZyUdZDlU#?SbAuu{7kfH;bdSv4c-f?AN>zX}W z8_F3YP{=>{2~f3YhTf|dJqNM=ok3iYHsjt~`m1rJ>+E!#Scv+B@UglX;F-Df? zJUa)9FVxrVRA%}bqYlC0coGde%G&f&N0hM=U3W5HlxPVP2+v2+0h8k&Q#gW;yUK{mrH`7=Fn`A@7uIG@t;HO$_Cjv2@w5 zX21D6-)lX5JkacIad9gzG>`Bs3v_d98hI;BVj`Bo}Y z9(l4FN1$`?w@4WzNj7>2H>Ep2S8)mbqs|eob!!*t41;!m1_#>q^-}qQWlDlsc7)K= zCL$;%bAO$zBNCVHj&FnxYfD}*_%5Afz=M&gx^!v8wJje1n@xM)<6N&dnKF(zlWp%T zC7>0mDp5$c(8}MSG=@SawH46-r;pV$ z@B1XCWX4EZnAW)pIgdjoM^bUMa7ZyS28L>eB)@Y+rwOoZHj-N`+6)2`qcEc?F!1$5 zk46K3P$;f_BuH^wgk?0RG`Uni6k?%d)wNiA$5DviMQ3}4u<*8fwZ<4ra6ASFJ3H7w zc8t+3HO5@9xqPKjJ`jt{_T{;Gh8DivL%BWFrU{)a}iH*qbT+}qhwI{CZ7D=;KBLLmfP68}k znZrivudsfpwsYJow9@v8;yv#0u}Pum`aPaq?oB~*i}XRAwZ)W?4=BDVjlykIF}TAue@X=%D-oj<(u**0vdr>On`i=XI-6V%6mbzFG%RhRbHkRk6O*5^W~<11(G12#Y4fc57-_ zF;6!$uD1Fvk9AtKA=M1nPn8ZOrduAdFqaQE3QQ-odwuL1z9C9xVVKNca?`e-t>@aF zH@`QlK2ozB&&HT-UGTnVkv}TnA<1t;KlFTby*v#|W^s6*HaVpVUuQjiSlSS(n&?^esDEm%B^);XfVz{%&#Kjt};Sg^7xm9e7za?V+>$b9QcX1#WA z3Nh!*bsy8GVJM@)%z!Icuw+r+Su(y|9mz$oCfTpt?2mp{MGXDWVi84?5v&2r7S7V! zmRYd0z@#0sV0k&1TCjX1(Z;Y~easQfnNL*X5JZEaqkvhkyvSyh%*mcD_p1X1GZgx~3+ zh2&E+bLJ0gUkvl+4>581#j`5~dK*8lI~d0oJ(MEzL-=6m+VTU~8l70MG#S^47yc8m zP7&=d8n65@ZI0R*D|%%~0c(<`Xjc6y%^fS6v^QS|=0`TO0fcy;Ip{G~sW z$|c2Z^4Z|O{Go|7Stk{9@QU)^D%s$V_cx8zUXvMNi5S)HEGLtI;5m38LH5b~m< z=eo~rUG>)MY(?LziWWMva=C7Mkd^6V2R9j95l_TAWP!ofpVGal)H_{xMDC>5?bm!D zdZAQph1YMN{6lT+IV9t-zbDo(-wx@&+7!Cy^5U&KHL7J*jH+P+)XAyUBp&XG#bWjC z{Lr7weaDQO^v5K-?^#j|?ErTe!~Atu;vcWwZbL* zcE@jhkMMqiWEatw)J#&O{>&H`@K@jSiP^gcZXM4<1y^I3YR%cx0;a&97g=KX-pXS8 zkd{$xe0~5HliDZGtJ!F-5)-`}gkS1W1yEDZe5~b+in9>@_H`MEO^Zmc5tmyB(gE_K zVNK^>@uxwFi#F@l(z$HM`f4DmjAQCIwiDlNfFUnbu3`s^O)ZDjofA57Tg-ntk1Ve`coS z0H1aZDlouOV8|T73lH%@Z@Rhq|aAb%4ODFrBFa zw0EfTHpj9SDi>$%WoG?qD;2<)0#wbt_1Rt?@-KEl<_qXAYz6K?pnw}fsDxA8u?PMM z@B+AF3vgWiDsN17U~$hC&+AJ2KiZXFx@k7eGgpf|tRCo31^ zN!`?cil|6C1vXz~a=n>{XcL~vBwubUkXn#Pq3-Khz;&X$LxUZMo}l0CHeut7#u&9- zhA2N9DC=-~Bk6fNbKCHlhV7Q7ZLSkT!r3_0F~}Hz;yMm~E#xPuv1(|x{u-Jy4&eTN zY2-iUp62<;q|Od!WS*mLeW6-D?*_X%F#Fo2f0Hd|@aGt1DZiULFvy*+Hy%-c>%Jf3 zzPd&R>#9s7V|vxS@9p$9JD$q+zN1WI5IuawJy~b&YIpt%)lFH;2I|79G<(GG%%;tRfq3BTCESJTXV#9wk;&MwZoe6n##VqiYym;$#-0^b6QKS>n6m{ zBg+5r>)80KG)o_#aDD9cO@&56-d_r>ag+vbmkEqKD86||xDA^^<9*@VQBp711I)3g z1k&{xw>E6FXWeg*e?O>3SwRZf3RL%~X*`jsV@`eF zan;5`2;Rl>u66*bpx8;|I{ch7WV70cr5-&ftglhtPh|OM2#cv(kF12j>~PhvaYX=| z&A-fAWOg$^QpX$UI;m7M`2v%J0Ck$%+rK(GR877l=t20Kcixlm`TKs}@g62epXd!E z{(46N3gQ+Hj}`I3p3--}o}X^8Mq~tH6Nx{hZ{@6!*A(>D+f4UuuWKsrL2pWin%$GH z`yF4H*ynXTHyt@L>RiZz8qB_2c2(g6rkHjA>+t#?S(gE@?j9nWUO#OZPxzj4qXL~W z_HVuEOM$c$;rWx4639t$>fe|S5)M1au{2^wJva0y)lu*(amUyK(ugH(`88hQ#*$N( z%IR1WV|^mTx0W~WbcLKR$!`4_{%Ve^QYzPn#;Gq$9fWO2L)p4a-(fi0KGgbu$_f*dJ4 z7LWu4ZdYdztCuS0X~PK;cU$8FloiPA){U5|72@u(6?obJ=?u_PR+Sq%zkTDJnZs#y z@nZMuYL>}UGT8r6Ow#{8>_Z=9oh~h0K{EO0;VQP4p`EqhBtvIY7R2VdA#c#dhX$RT z?frsUD5Z<>fEc;oYldtRU+#RC*a@f_k3wAqT4i?!R=r*_VwCH@)TzAb3&H6qKAMTn-6}$XCw|xk-ayWkee$(sU4j}0I-nKCbI19>m8*bnF zq!ad2YF(Ro&eJ<QOFi4Xr)3kCx2WUle>C7Y(|6;O8ff9u>7N^Q+j=&D$3S7cX z`wtm$+g}kW9<$96xs6%@@4vLjhXtcbN}L>)WypQ1 zz(N65O{TyofzK=DMI0!Ah2)8gV6g4K0>G;cAPm~W98&oJJJN;@#l#SeO%E2ic+HJ2XzAZ~?nmr~C}pU+qK_Z8Eml1~>bs~93n`}e2IKTC$nC()*~ z4%B?;#;mIy>aSzF9z{5-DZ`0KYIxbUix=Qi9Pqk+gZ)g*kl;(o)+gmg*e$}Q7D zG#04o;s{HThC&@Do)_tEc9F}$cefrF;9)}kgOWJ6VK%jf`$8jZb_4%D-(?z z$QUB{l>lCU?owH*LYWNy;gfD+>sJXX6jZwrHCX6a zccL<3JRc!W3;f_4i9(BQix6FD$aZ zQIVZw53*1Q#RrtoGgePj3i6i?_t)lYBi@x_4E5IOV?N^~-|edws_(SqfEEeMqF)sLN=0dGB;X}Ryg_% zTBewXQO#V=LX>fLBQhJ0Fdc`uHbK2#3_CqIQrMnu=Jon2`|mGY1#%A7mob|&ANVCqzNzC8Jpi>1<=0i{5wCuKTMJ_*gP3D4V_zj?|VlvxP3(-SU6X`%!r@S7vX z%IhaOtcSju%*I%h{8}X6**tSU&)6fmhwzk!cv@>rx3eM@MV?5X49j1!ar2(Irb*tr z&?PQI{o9(TJ86i_e!dW;UqtZ9+?q^)4p>(~-~S2(DwWjjdWiyxJxH63s!9>rGz^US z`Ug7aZOnUN2cr?ziUc(9a^O^&ezQkzxMbjN3^N$Iy`#5C4usKEmg=2kh~G#hHqa-E zka3y6EK0!c7q@u|AV(#bcP>$!Ob+k0LH3^rjPqda$r|!97MfBHB>iY{fKZ}eD@RNsxrr*QQ zqCSL2QpN~^UR~yp*}8?2;Iyn81q)*5H<54z#)$r+{F_l8g^VO+%`hEB#GhImh>L0+ zn>nDF2TgC^lc3CS4}i2Ug?=E9Pj_8I=c~iuxk8;seK5yF5i@cJfclq_sfMcoMtBo! zkX8r%1gt~yS1iuQh9`hIW*R34uK<^rCO0$y3~wpWkAmzlyw7kIOtSt^(^vMjE5oA}e+R;Kc5$MCPQqvCq&x z8-Eh7;-xI(jC>f}2#K*FwSDTnDoI1Cb^D!iwtFqg`QB^CDhoUn+VYm5li(uKTaPz_ zl%vMc5r&meh9b@Yqewh(?nf^+=@0!Gca;Z`X3P4ii8R14xfD!}e8-Z&b9_)gjXr1> zDe3MWFqjRHB{Kiei7_63im4fz2e2pq*vQvz-#tQl(g;xOgrm;2NbLpHf?ct++pbss z8nFWTAHmT@=@+cTEs3ZW3h`Hdz3FjVUH}nuIn*&C_5nX8U;ciCJC*EE&!A56j z97DhP_x;H9g-o!!%!hWW=i^({i7dxxL;N4t+)#Y)kpW`togmF>`1(KGitH6c>ZKwG z3OlPDw&l5Ek%*A5lP1FJ=qh3F(4IE{>qK7TKVR6Jx@ z3dd);Z@VIq?>-V{bTBGjqS`KThS01fLy>%)WKDXPet&FYTW7*AY+gCVkG`BZZsa14 zef2mwNxi$*FZYvH#yqk>mR&Apf`c=E1AHv0Y<*XZ!uemRrKq&7T?$vLnb$Rjf--a3 zTti8R#7J_IdrRIf7fy1yf4eMOohZ zIHrhzB?G`wpF?%4Lf_w~HdZ8`RttUdbg4=XRiUCOdh^!qEatw2eBq=X9xly1nkCH3Nk%Y= zEJMkyWfv=c@ngYB-kTl-VTi0i*>>s|GkHj_%{?)B$Y$@r8`a~O8aHC@7NR|P$5_nA zDdUBm$4OWWEd;0mk~C^ubWq?m?(?>9?|L2zz3LnlOn6+A3thiYyz3J#__p1HBQI6j z6wnF<@paJlDX`#b7gY+)IZmixX0_vl2Xq{l!sw)l-kR6hiv=3k!%r-0w&Q?j9TURv zIBMyB7vxG1z3JG>KnbIhB6gmqs+CL|>_{{h;(#4AL^)vW%}c~vGJG_IabI`30`ZX^ zO#@aqVRFCcQfV+I*gyz9p@MYa`YBr2u6r9-J*LtmVm(j5H=U+2#|tqXqI9Ad9%#r7 z{pfcI1@?yXOR&ywHd|Yl|9VU%(|i2cc0VgGeVbZPF2DX5cjZG5f?S0UV95U_=a6=L zpyxmMb~#?xo7VEA|2!G%x=)9H@$T9#rBNsCk?#)_+j7xOx!HM85j$$?WarzN*$+28 z$5!>U%`I1Kc%IsfBP%%(DvqK&vgzj6lKyv>*_uCy^1IrKQN*8EO8R!ZO1mVDs0*8o zQN)n;Vcx8HJD0Kqqi5PjI)0~*Gm`SoeZou{5gohfveVv5fJ?Z?sj$VE?4s~#>whf; zIgQ@rgTD>>r zTVwY@vibyd{PX~PhAKPKKDbVu#b6@C#Ai39uHM-fnQ1&!9;$c`KC66!+O%=Jt}{Edy$2zoCY5_fR^} z8p2z~o=4PMMr43UOHZjo4r+5b2_c7ETu&)0BE?%qrt?nz=dnKOJ!4G+RkZX7^uiKg zT8;5U!U~P`x3!-KaH++W?hwkEvR^<>iA7vo=Wbt3Ugs_n3t_DZhE15Ry~$0I?PVPBJQDWc{{4t-ZlD8DQ$~nz1W}h# zv0HbQ4L&U>*|VrB;lC7ZI8@YaySe@|TGq?KmPJ*4Y;Ao#B^m$OLp6in8ZGzQ;vyW- zvw~E>Z1^8G+Tx@)v>m3kEokZBCBIY9LoI9^R|PG=#?2d-zfHa}d-r0Bg12Cn zq|@0gz#`W_%$ZjRxOloJ^~0sM3NWqo6KGaUYe8F&OE78vTvh(SL4gX)>J6AQx=)77 zFewZ(u$jF`A+;i%Q~(Oig^Ild$J?a}QO3wE<0{Q(jGFf=>E>B;7tX>VDADeF&hEoA zZ*LG+ZydGyOgJ&AS>?mbu)`9#eAaG2tXvnUS$oC3)Vj)3>yOJTGORRx*Zk&vvD9Y!Zd)JO+T~Qg ze7Zb$KXsW|eC7R*e~W74nzmOn`z!ZdCU*b7hVx*K_sE!a%@^X-^mW0?VEm+>xY>w550_fI&d+HIfY90jEG8VP$X7D<8Kdxs5syitGqcab)7os%!a_G zOeDw1UrM9oE8TyUHTL)_J!rD!Ld9;EZo=#49cOWO??Y^1_e|rOqr4yW)VBXG#XzFP z|^HOUagg85}zMbkw<>JxfZdD8dP7 zW&hy+-QNz62ogj|`qY>1_K-8Ezh6&Ga(>@3O_!yp!Dp4Epm$DR0^IFq+kxWUao~j$ z7-soP;45-3{OsW+F$O7ur14d7EN9YHa57)j(1iy7rI)%W+rwOCIuA1Xuw$y??613M zE8{?udg4*V+``tDbCA{XMN!4T)|*!w-jJEl?TYB_=mH2LUu{cz5lwt7FNqcs49FYJ9rT z(UVSYiGoHO3u4gGfg|G|XjsUu?IQX1`r$Myf<^%wj!Ndzaom>qjEEE1s91%;LvCmt zI{AzSsn|b~PuC~zoBNg8tJPzS4T3eMZ0*FKqzwu5*33hchcz_rua@nd4vnW?`&!%Q z+=Iv3bLhTpAEY%tt@nQI^e^)@-e-Swhbg`Y&MJkO zvCr?hc#pp6W4E^3NYYRVwF36UBt>?V2!C3m^~MzsU&L%b8(G3yV40G+CPuWSIA=%nI_X*9ZY(S1`$Waf+(s2=2+7<~+$pC*xrh ztViTid#0>7tsj2RS&%l3M~H@>$#@MrX{$Msclzf%ow0x9{4xFObjFjZQvhXg`?|g` zyEg!Hj7U~iM$7pUeXQrAp{UJ)L?>KsL1B+6TXSt;y#2iusy>m!e!#Kr727&Xg`O( zt?$w1A~~^rK}u^u%<9?vDdT*cSVVSc49mbNiW8cl!)7KG39j0ft!Lj2a@>eDrcRvR z_P0JBcYV8q%asxBBUNk%Dl{jIJ&e8r(tctq1r8d7_-q0eTG6~s)%n+?{1k-olt_UO z@E%LuDJW5tn3dkz?gsrd6-|tELZDX!zXvQ}@pyPPlM=smq>LUmVw8Vp&Vt6-bo6DH zDrs7?@+Wby5)&63wfIogu{rsE%tKLXKADh&I`k;OD7Mi=`k~6qZVn&!{r@g(wbg@@ z;&B6J2+kYz;Om$RuWvIwsHf7xQ>0qTK)f<2qf3OvClR*t-VtPzSl>(*K8=aAe5Hc= z@3K~&Wy9sHphUg8APu+7ehb7-bBo-gG7ls3%j^WOy7L>2*~9F)DJ-KAbat%m_)i(` zxy6FK6rCxQpNm-V@+ljJ*^NyrhOE?^weJ=^U-*|~543{iyyWm=hnK^HL1|+cg&e4P z`iZN?!%DF2gc%~Ez}<)23oQhS5}DF+DtncVy>ML=tV$AJv@nSFW8xV@fkrabS7rUh zOKD>dLuN9K@@c0c5&WZjpJ}K}wmXCcfyj0q4>vO?fxz)R`Fz0%B?4yS$#*K`DHY6M zk?<`=xMzjkcI_t`&c+OD;(}$E3{lh#x?4`oI70vh)Bq0|RLA++40K0ie%Vhq?XcKb z*f`}O)z(ZS(HWjrD!d22y--JV8w|!X@}=vte&`2@eChpCO(rF3PPHo&OHcyZ9l|>XQ zZ}AtlAE{L}+0;sioCbT(fK@0Uu?V1UP%8K&-`9uf1V(@52;au}D`o^0wDy;ojts%< ztAAQ-A@x2|2;OEl=axCMbVDM->8qLcG(X=#j5)Y)SM-P<6}waijzz826Mc}|qBX{p zRmLes@QmG|a3Cup$PQ={T6!jG!X;CCd_c{-1Q0%lf*G?pBE=f+EKh*`GFz>ZClN^~ z1KPEHK?n(@Cyce0d{jC@fp;`h#MV0}5X_tf+XU8{6?wN|VuPi3;gq$CgUw)G`CG>% z<4z=Gf1tj!Y^EV4?j)03PsbP(Hs5^;Y$RMdc|r_cFYa&37dy%&$D7@c7R7RnCn%mz zUUmMYG`U!p{6+IGqWphDqyLB;;E9YGH+I#`%DH6Ya&TWLf^D+I-23KQwNMhotO@DX8ick3FIphO_KV5H`i6=Mk;H-HofQ96LoDzBvcBHRxE~e zh#0K4V-VPRVL;h>2#+@Qg;EF#odgP}rw5GYv~3efqxgVOOR=RuTo*Gy(6j-+02D0S ze!noe5FX$*ydZUIBz%s|MYYTu3pdsm@%cIt^#?F=tFwsR`$~}v4rY`}AP?yL=$|}LVN!-&fV950~mRx(VhD?UH z$RO26Eya4)SC&F~0yoY#S+)doGc#&hN z`D;u%o+StF=a{fmx4F?>?Ji_dEU(H%lpJ=elfSZIN~E^ zBr|2)dYAkS<*xSV;x0JMzE z#eUNwHipLg*m|G_m1eUqqAqD$KJq#&=v3u_@xhzbIk6tn&eCkqxN()7U6P?(Ys({Alqna79m%~x4_^|R z^X9RMa00i(uLz%DYXED5eNPZh+FKzgTo|T1-3Ae9T1%HY=7^2wef`_tCCj8m)3Bnq zcB6Z+R8p-kn(3JFVM|}GTGB2{0a9(vc9)9wQ&rji_%ZFQnd+1gjrPvW-AHfuwY$E3 z$=yEfExYah{VDc7^&4Gh4j#kJmTadA4j zI7Mc;%m18Jf&Gv^1W(V}=jOE^o=~2gdS8s+w`EC4_l)7Rpr9`c4L#EOTA*ePOiHKM zN~f6-xxpt!U?bKGKb=zZtIS9G2}%)YNwB$I+vIgR*MqhWd|FalAjA(K*zVuYsv z*}USlK+U*OfGi3@iBGD(@zxFI9t8(3Mk5lw#wcKKlh7lYda#?8Z4e9d5zFtWbpyBL zrG?>+Qn${VbH+wTbh7mNXpxeWdzBClu`>@vyanAbX)bc{Xx&T$!uKP^*B6x)=!?_NUGOWkd6@0wP2=94^@w z#fI#$g8*W|kyZt`sMQ|`mt_+TFy3mIUQ0)tiZ$Q+)5a&rBQhGYAQ7O1A)_vi-Q=0E z0dSaDuyf)|6yhGyWfu~I{jA_s*12mtzE}73=iG9k<->lDFERnsj^U{``@VKBXFZK*$JLsVf7+~FL!-5Pi_7OW^ z-8)mkrZ=rAmShFj~Dw;SRWiX)|bb;di|U8nhOo4m)l;`@tx)IqI`^x zl(Oh(MJYkp^{)kb%O{vGgQ(Q_rhChq={_H9%#W0PxY3>Eb8R7}7kg}Dd#sNa5hI(M zT!-aPOc)=VOjE`e&VWiV{^)^;onyC_UVL4lWj4zTn$3&k`}T1w_-U6s{DUm5?c3_E z#C1o7ZTE|x$_Q7sPZ?j6o1Y4W{6sp#jg|Cw$%U}AcuD}w#Qxg|Y~+;i+Pxw7x%S`fvso~*$L{+6sr7BfRV zamf^Y7*`#n=de7=L_+aS&U7JR&yME4qrZD`FsWqLcoJ!o^p zG)at${Luo{on2SC{&Qwszp`>^S_AaACgWPF)5V%h3_@d4nJ^A^h8Hu* zwg|JeZ-l9KBxp>mQ@X@92{!tRC;i*V#iO#9EmGAY)5=wHNHb}`#^6TeY>rly{f||- z=8JYfWB1}O@!<|z*GcRLH?>C1E#YD4wrZ@sd(RvJc=d-5izP!J*sQ#@n0iU=Nzuv1 z$obzRd7E6rzcgmZ`11%F!bL!&JIX^5n>LT`1z{r{FHMW<5oLinz|0p&I>Yt~(TvWN zF@WcxP!reFBm&KfBg9%ZFq^c8ihp0?Try^t8)C7z$+V6*-@R@wV>-e1H;8$!|C8T0 zB!^<+*)QcNo#V+9bgXykd(ww;kEzbyEX4{$R( zqd}!2?nJ(Q%xC$p0`z9N3&=O#DMZz6plV zaFwz)*_-C)Yct^mHCxX#$_^XZXp$_eB-QZ`Ey3u%5jruZ~sIzZW~Ui%!f&ix?Vt4R+*wWGBC zYrCJ}nn{F2pWuudV1o>zU#3_#i!VrCn>aUpCz?;U-ztiDwn#Yfp0EbGc_!Q^I{rge zS}6|Nqwgx}#e2*L(NVLs8&!GZ45#_5mr6H~^Tx6s)~5uDFKm!BEMVJ&?Hzs;HIvMC zq+r6ciS*ekiXaK#5gsD6MjTlmc{qf)z>m$xdF!$~I*OF==W>kk#PpQX&F&IS8nOw1&> z$``m**6_jUe@Sf%l&qhmjKgw`3T3RBw2dHta}pwQazJ5-A{P9kC-V<8AbS)vW16YawivOo`&()2iUz~of6a^+!$bYo&6wai-+D~ zOa2(^RQq5wP{(%l6Jw4e?R)rF^0MHb2yNBwK19y|F1HyTUI zkCSjU2*0-`6|S5sk4h&fi(~R8R(#o1l4v`5bH84(Y&L+s{Bh}*MFU!fppU?kQLS2H z>4TbMi#l{bMklV=5gx6?+`qqLSfWf7|HtJY6d;2VcGDZon^z=`;Q?~^j`%et>(Y-O z@k{df^!r0L*G!Cy-}lzBu{_a7*W|`>>UH6mkMX%Y@#T|GG8?B@Hb#-${zl=<_-H}G zULs17T&z6tZU28$LxiH`i6P~QEiUYm*$a^etJ2wC2e{3#isa71_{Fl4|MdyQvVaxq zB(8Mq|57#LF#nfTQ<}lHC%kY$0`{-M*#U*K!~d7~;s1f(KYs{*RR4_bG=H=(k)AF{ zASz^SFG%o6m?d#xe#c2?4-jJ(E{y(f{cNdhgcGO!)_=?)&=4ilSgeLl)G!};Vt&LYowG1y-9o)Ymsu5RC2e-^tuMsjpNM1T9|t5Ybgkj?a< zIq>k%;JvmVo72H9HMR@ybJOyN1X>!?-sYvIdCCMW7y~YYE{X8e_m6c*M$St2Z8D|9 z6h~4bUHT4hEZ@A?0Z%$28UaROB|_l=oxdez@mRiuJTUmGJ(~qE+(_&7JcdMBCFT_E zl)U0XSYw<9^+#GpKlxS+#Lh6q&{)<-$T%|V4V`()Q3s_2g*L+Nz7R9aT)_(Zz#c-# ze#f4CVmEf>7cY!fXU8aAyA88%^13DaeS7-Y>Eb89t|IMX2Jd!Hb?)WI6+RzA2kyrm z_sTC%I=8MPq?VUEOT%xEVkY;nS82TO+tBGOS2<$~i*2fq*qkRF6h^s-;l(IDp_|#l zp{LT-H#q;PcPm~%lAKGDt`XwDplNXaxtm1AmwyUR?W&hfuwugA0WW!GBWA24I7?5sYE+d)QpXUE=XuBo0Nr?RdF$F+t;r1Sj+;@- zFV7HHlblX7+wIrg{7j{8Y9$Jkx2Z&1Uy~A7lNXw?y zp#q#Shh*Et^_*Qj>$p}4s(>AQgi=GIb5NHAy>J?-_R+KH?}XN@i;WrI(>|>^?JM(< zZ-W7&ICU+ffXh5JBL!2m)eRb@Qr1nZqF?tbaqvh!MJZU~X%L+J6R&0ISd4m&uR&xB zTErOfTCT95pZR0aXlO%-$6i4-NqG$$&7_ErVhPKk)I%i-{AaYe8eA2{Uxv_R#@-SJl0aa29q*-?RS z8VNnjyR_T=$_j#v0mH196q@D4eO8wT`G&g}$=k$i3wGsH3;Ee9(v}>keBHun+l}(# zwq*`=Yj$^X==i;nZeFdfSfkcL!!COYI091FQ)HZZGvTxBvi%dl^0}Iptqe7PY&(`A zf2u1FCi$;)PjZ@gIF;^b=Pv=|-;o#B6Cu3pzSb5QuTD9+-GA3; zU)=}4EY%ZzU6Z_uedxRKWqLCCnJl>FqKF%ny zinJ-#J`(NZ@D(;Xf}Ni(Wd@=#T{sYUqNS1?cp?V27E6D~BvirAy*&P84m{0X{r)E^ z{jf3p$Im@{_6r2)NFRRwcPhvh^dj03)dOA22;{d%`imtXbFat_Z%>Z=80njH8p?Mk zi|TVn+XOQ%j8)>27jkoZ^`G*9W@-uYLd%o+>Z((jk!`>K>6KHu=ynju{Sn((wH75C z2SmD7bm0C{xwB29fGZJ3qgfs`FIpc!pKvd08}lpx5t7)^!${WBp(Xve33GWi5VG0G z@=-kph>&4Q&E&1!A>o2xaI{{_jTxOopD&V&&(?S8YQv*i2)~`G1V6^=8?n~5xNMY_ z_l2Q4Ow$*XQ}GWFHbJb#-&xhYp_>4M3)=8#U)x&$ILIR_przM+v%kGG% zR=~LBzF+2_Ion;YuekZW@3_5>k8?cZ&Fc?8hN?Dwre5EUuW%bS9jaUJ&;xScwmG{U z52C%z&W6-#eLcIFY@Knj?Qc<*Rc$_d+W#F9xd8gqY(42iV3b=RIPM+qZsjie5D;-O zSFiME^3SSh-l}pvvf-VfekJcp7>;p;oFrjLo_yXkcEN!PS4FkDGhrsEO9U9I9s?jE zK0!e1@d6+L{)N}MttNrfz%xn|AvNBCN>RLzP&)hxbLqqb4Rdzh-h~3nxf(vQ>z_Z5O@?_6P4Izp%^}@^p7~H0y@G1E;Vom* z1mko{-679UDf#;3gj>mS3_|3$2>MGkEs`RLCyy%HCq(tOL6^cGZnT<7;d@0>@znTm zS`7T^FsBlOkPJ9o@Hakq%O~Ihk|qWNlSj0QWb}M%ss;_*t@864iM$S|E$?vd!faR>yHh8kiEf(}WTLs{cga5`cP3DniP@7`T z`^v&H!sA%T$_-!-Bt^2932i_NQseVFjI(qus8;SHHRXMm%RG@w%YXipRhYB|{@Io0 zA!ElV)RD~i(9C%wCLstZtx@!r7rSr+tmh&q0r&1QP`xeiO_b{|*MX@}P^c<#T|F?r zkwCh=B2;AoiBGqUM7oxLhe|&?ls?k}4pbdvy`<-%P6ZNb#3(iEGXDywH`h6X`Gm#&Zp*j;&W6T4G8gwRd zO=n2XL^12xcP8?SAh2`vC7;W-!Y_ijt&TqNMk?e6!yuSE>_-K8#xz8&c#LG zTzqiPt~AcY0BkWj7YTU+IT!D|wKt2-MLsEO=i)c-dd|qXDDT6fbuJQYi!pn8=OV#i zxN|YMMAJGK1^8S!7x`$zaxQWOZ1~PaE|llZxu|EQS#U1mJZtG()bH!ios0aS4Ar@q z8e<+f)N|ro6tkWq=VD;z=uwzB7XvNF2!YnQ7|2Ilz@g5?KuGE_EHLL{Ad!dQT*RfV zk#kY#WAou$s-Y77IiKPQIXEMh;s<; zT*SGRbS~PhSaL4nOi4Qzad^_XXm%z@=OT^==JS`9-4;8gdACu{Gu+jwD*MaiO#X7_^=af^QM|O6e_`95;Xi+6wN|UT z_52mZ{MBBs?lv0Ex4!kQzVp22J+JQ^J9ez^oPYlL{ak|gZ@u-_-yHn)1 zn?8J-sa_h_v7nQ<1DBvW6wbf>*>7aMP_BRLReidLj9CXZ6KL*a7Oz;U1ik0W_x9<= zOeReXoZD}|-GDH`18D8uxRE^t>B|}HEt`gORfiZj$EzqQSkh(1jEjB4ihqD6U9d!c?2=K zPm`r(v*gxm=K?5$_za`VRP}Iis@7z3x=|^#n$`GGNeVD*tO79>yBYDpp#D(NU@_&H zJkPN&foCnrMFaZ0=b zO;6FI8-?29H@ga9(w*1oKm8_)xKRT93xB%4Z`hKSKSmvWarjF|Z-JSKungnP1fkV$ zGeW^wDK5Tmf%oey93ML<0e8oboaMTFBtCOvD9()2)CUke+-rM&S7iCXKlAkuzXLh& ztMv!IIOE1~97BZ$(JY&xj=5NH`zCBPCtHSBT=kN;dk_+WiaE)=iv_=JU#0D@EbdVfmuEYek zZd1nfn)}~O;aZo#)%L?qeh|X<|3#m_<-xB8`#_yyCHf?jDw+|9W|fR42&2hZA{wRa z{rQFFrO0iuT?fmekCWAIn>lI=%pJ&tigf+_uYETm2>0N!3B}A<>(z9GM4oEouuzow zFTV8+$Sil^vxJc16Wl28=Ae;qviB}-zps-K1(8Cs8?asLX?~Io1XVBz$zI{^Mg!$< zvR18oHQvgV&%SubZ8zd`c<5s}0~1w7ROxm7o$>L>YoSAQ$q9MwcFaTZVBVk3{|AN& F7+HGBU6ud< diff --git a/assets/themes/gruvbox b/assets/themes/gruvbox index e3db74d0..64c47250 160000 --- a/assets/themes/gruvbox +++ b/assets/themes/gruvbox @@ -1 +1 @@ -Subproject commit e3db74d0e5de7bc09cab76377723ccf6bcc64e8c +Subproject commit 64c47250e54298b91e2cf8d401320009aba9f991 diff --git a/tests/assets.rs b/tests/assets.rs index 435ddf85..d5de9015 100644 --- a/tests/assets.rs +++ b/tests/assets.rs @@ -33,9 +33,8 @@ fn all_themes_are_present() { "ansi", "base16", "base16-256", - "gruvbox", + "gruvbox-dark", "gruvbox-light", - "gruvbox-white", "zenburn" ] );