From a1122a8a22ba5cd79eb47002ad2e442aa04165ac Mon Sep 17 00:00:00 2001 From: Kirill Volkov Date: Thu, 3 Nov 2022 12:06:17 +0300 Subject: [PATCH] Changed merge icons --- .../img/toolbar/1.25x/btn-merge-cells.png | Bin 207 -> 135 bytes .../img/toolbar/1.5x/btn-merge-cells.png | Bin 214 -> 141 bytes .../img/toolbar/1.75x/btn-merge-cells.png | Bin 229 -> 139 bytes .../img/toolbar/1x/btn-merge-cells.png | Bin 198 -> 125 bytes .../img/toolbar/2x/btn-merge-cells.png | Bin 253 -> 145 bytes .../img/toolbar/1.25x/btn-merge-across.png | Bin 182 -> 186 bytes .../img/toolbar/1.25x/btn-merge-and-center.png | Bin 216 -> 220 bytes .../img/toolbar/1.25x/btn-unmerge-cells.png | Bin 122 -> 126 bytes .../img/toolbar/1.5x/btn-merge-across.png | Bin 183 -> 186 bytes .../img/toolbar/1.5x/btn-merge-and-center.png | Bin 212 -> 210 bytes .../img/toolbar/1.5x/btn-unmerge-cells.png | Bin 126 -> 131 bytes .../img/toolbar/1.75x/btn-merge-across.png | Bin 210 -> 215 bytes .../img/toolbar/1.75x/btn-merge-and-center.png | Bin 241 -> 264 bytes .../img/toolbar/1.75x/btn-unmerge-cells.png | Bin 137 -> 133 bytes .../img/toolbar/1x/btn-merge-across.png | Bin 167 -> 171 bytes .../img/toolbar/1x/btn-merge-and-center.png | Bin 201 -> 198 bytes .../img/toolbar/1x/btn-unmerge-cells.png | Bin 114 -> 118 bytes .../img/toolbar/2x/btn-merge-across.png | Bin 235 -> 239 bytes .../img/toolbar/2x/btn-merge-and-center.png | Bin 280 -> 285 bytes .../img/toolbar/2x/btn-unmerge-cells.png | Bin 133 -> 140 bytes 20 files changed, 0 insertions(+), 0 deletions(-) diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-merge-cells.png b/apps/common/main/resources/img/toolbar/1.25x/btn-merge-cells.png index ac6fa48f96ebf2b8cc11387e34c6354ce357b924..16327491ba43e07fa3f09c785897dbd0cbbef1da 100644 GIT binary patch delta 106 zcmV-w0G0pG0fzyQBx6oVL_t(|+U?ar3IHJt1VR7*X+3*cGN9mUHRKWkp_xEh1AxEN z7u5HH1yn^Uy>xaGsr1s>rxHm|GfpI0K!gYpBG-!e>^}R3L;&Di21OXaPP6*)YybcN M07*qoM6N<$f-2W5$N&HU delta 179 zcmZo?JkK~mrJl3EBeIx*fm;}a85w5Hkzin8U@Q)DcVbv~PUa<$!;&U>cv7h@- zA}f%e;_2cTQo;E4sv}>60*}kZixvO1m93MTu0_le`H}CbdA7w>l|ka>AsKtcO&S_|-E62T8M;6)I5D7&@>0Nkc; z9&4L!77dQfXV*-@k@@Tz!LD@udr&&z)TV+33l=Q+vta*WPfJhBcds-6954WaIwSe7 SC=|;80000&U>cv7h@- zA}f%e?djqeQo;E4nj_Z%1s<1+8^8Pu-}WxYJhU*t;D4?xPoskpBSS;%rSs9(W?9`| z)anytIO#mMvFV+QAAFt#8T5SFz0Ky0vh8R89TS&5G`@WC!^=aaHRku`?%pxGSe*ZA m?2MI(e%|_i-V6-iDj77ztzX~HuBZXp%i!ti=d#Wzp$P!6jYu~D diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-merge-cells.png b/apps/common/main/resources/img/toolbar/1.75x/btn-merge-cells.png index 6a9bb9adce41719449373104a2e0af3c7ccf667f..dc298f6a4dcc9313c8cc997db62d85de4c4fbcb0 100644 GIT binary patch delta 122 zcmaFL*v&XWqL_)9fq@~Ua>_p-#Tnoe;>rkQFfjc8|9{G|+Y^B-#*!evU7`P;*7EFjxT$5(#aDvSs*?{|^g$kQG1A~65 V;mN7h{vab6JYD@<);T3K0RUw@B6l*8o|0J>k`Bk1Sjv*C{Z*O>WH9H8nUNlPiA8qE;_Dprkl7NSEGPld?eOa)Y zi{Zh%Y5LjOb3fmmTN>;<&DXTFE-mZ*??$&7^?q+_MdU5L4!dW5*&CcFvy{1o6CKX8 wzo!1)TX*vJrFzNi-+E;EdSn?G*1chESY!S9?9>=TpfeaeUHx3vIVCg!0QNCTbN~PV diff --git a/apps/common/main/resources/img/toolbar/1x/btn-merge-cells.png b/apps/common/main/resources/img/toolbar/1x/btn-merge-cells.png index 67872ed2c8a07f0d1e84911094c4dfe0cb26dfd7..c2fed157c2be6c49c34a75808c045ea7b09532ec 100644 GIT binary patch delta 95 zcmX@cSUW)_(#6xoF{I*Fa)Jcw;slWiEdM5VZj^RYQ+VP~QEakt!T5H{MJ@+L4(D?HzyI~aA4D&i;_33%CeNsC0fXX^C$BRk4K0Pj4(3E0 z{Zu?bZ&^@5$o{P6bw6)5z5UaFIPqX;pZ*MyyTvD!wdQ%7eQqi-jQ`Wz@@5HxWSsS5 UZOKmpKzkTGUHx3vIVCg!0M6Mzvj6}9 diff --git a/apps/common/main/resources/img/toolbar/2x/btn-merge-cells.png b/apps/common/main/resources/img/toolbar/2x/btn-merge-cells.png index 4541351172eb7b78a9163c048609928efda8e7a8..4a560c10ab30863e35bf98e1cd4df53deabaa89b 100644 GIT binary patch delta 128 zcmey%IFWIJL?sh50|SEy-_%J!iZj3`#FY`qU|{(F|NoR_w*8o|0J>k`I9_d978G?-`;TKI&8qh;;{V7|M;@v7b{mDJa^3MtW2{)njq6k zQwD~Htm7`e`KD?2iZ1%EJy7`T``@b_d&INSt<#p=U(?@X_2kp${NwAc^}jeULDJ$R z&z+RxJTakG%;7T|XLA~;9GJl1%)|p{tj$phwf?9J#QL%lMf`Kt$X{$!{C>dmT_Xd- bhXwp1uXJ_Yg#W$+I*-BA)z4*}Q$iB}wToCW diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-merge-across.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-merge-across.png index 89b89723b25c6d4135d27e3239ffa8f49414521a..ccfc8d46838c40dabf5804b6744ddffe2bee02bf 100644 GIT binary patch delta 158 zcmV;P0Ac^O0lEQ@B!7WPL_t(|+U=E53cw%?Lp^G5*4}ih;9&b1MvOR?2mO&s2{E=5 zA%yrk$Ao$xFo9knJ!fd|LrBjV+WRX<(5DGI0u3Muu`Fi_$#%cTWdHyG M07*qoM6N<$fHW0k#2dy|*C_@T~>l$TfAq~HXfjAN^eu~Ko>B)v> zgmlJ3k&f8m3epj4uAnpG6Efm6GP3Ni#m&ym4se7JLe^ym(-W>6#U~DuCX9Y#~U=TKu>voxv z5JG&N>4xeba05{xku|n=CnU1Q_WsHdb~I^6r~?LsMF zBKVQehzSc>L?Gw_RxykabLRi-oe>$a-u!psVXPxKj7*Q#Jvqh^v?Jr}+1wk+2!a{G ug^VDW5nKuT=l@!|*>$r&;D``Hyq6hS#zkMJbB9L&0000}$) delta 188 zcmV;t07L)W0oVbMB!8btL_t(|+U=E%3V!33;AR@Q@dkkR_@90{u(nYF)eifM_`FQu03C_VbYn(o>91)&6;x_+m+&zmJZbEV_&L8!y7qKky9g{&5~v}z$4!dFp!NUsnU z3%yH6ggrB>QDNuUDjl9I+>&OvWzF!`uQdNKt0k-DzE>Im02d&E6Fhy6&oeCbUH||9 M07*qoM6N<$f`PL}h5!Hn delta 155 zcmV;M0A&BV0k;8=B!7NML_t(|+U=IX4Zt7>03C_V9l=o;rKOK1?XN+En%pJ)RB};} z)&Kwi;Ex=E@jYoE9^tGtFX5~;2=k=O(q9SS<9G zo)z}gt^FZ{4N&hZ!vyE%$xW0002VoD`%$XceJ1TXg^c002ov JPDHLkV1jT=M1TMQ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge-and-center.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge-and-center.png index b80b94e112530b4d049f52ccb9ecf0770116e6b7..f283000d2659396baf364585a0349edc7c2b8f1c 100644 GIT binary patch delta 182 zcmV;n07?JU0n!1GB!8JnL_t(|+U=Ix4S*mF03C_V=*AsIA>m6vdDNisF6oEZN-j`j z+W-In;BD;2(Ke|uy}~`?qcxdu&-iE!!ffgJ^I&R)hbEmAb|Ivp&Zk@x;qd4}NJE{E zxmLpQLs}3iQOX?>PO^Fysnlh;Gs1e)m!)@VAgot?S!r8kg)blOVOi9}V%fvLIi>jz kbG77Z`Q0rI006Ln1Ay_V_r7DoF8}}l07*qoM6N<$f|=}BIsgCw delta 184 zcmV;p07w7Q0n`DIB!8PpL_t(|+U=H63VC1kD(O zj=60B008htcEh3ns39YPS81xit26{=OOKxgrYro^Jf*?K;g!CS_0xglql?2UeIe;B z0;fr&32{fO9}1kqN*SW#tMoI0MbXQ%_c9q+dcC};uCT&`9Wf3{pEvGsQ2M-8hktcS m^B?AF$<^|^TN(fWU@-@S$b?x>>U0SJ0000IKuz%R3O}aH{00_JI&mR6M_NVv&00001N-{#amCJ-6-_(-ke&AG8%7D(Rn; zU;u*ZLX|7KdsRM!`aJ#R>hshpNkCZK`Iw8JiNHH=HMKnxl?*p`OXM5x?hw@fd@0ND zp3|N)-n)Hz>`ttlA+dL|u&6L^RJ3ZE<25Pa$p(h?&D*_?nViX!RPN1FeOVHl|FiGm n)6?;sh8+*f=gu(%*>~5Hk@KVXLe+;S8bMr7S3j3^P6ijC%)}$Wt-uwU-$6TEtLFYf8zgWXy{1zCFwq(JF|E?OQ~vBIZ1Z59BDs zvfDlQEMshA$q&RN@|E+` k2c8{1R7wB<005Oa099cjOm`SL9smFU07*qoM6N<$g2*OJy8r+H diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge-and-center.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge-and-center.png index 4e6781c36ae0d75381b108c3518dd0296a33c65f..0421e289bc1c0762d6f57caca403b03cb16b74f3 100644 GIT binary patch delta 236 zcmV`hk)Z1j4m>^6{sF0W-OiZv$3^k_Gs^lKDD!JM_-&gNr*!gl+ mLJVR!T{o^V00000PiF#z%X<)N0000UjEZ?W_7d}SEMh37J*DK{vSW74TT1eAgvR`k<4wfGPd<*&m>*KS zm6$ZKD2sK9#8UjUm@Gv~i&gTA@himiN~z^diRqP6%bOK5Do#a{Gc0CQiY8}PjC6FE zTAVBpBds0grWpx4#&E}Q#?Y0x$838m{qE+=TZz{-Vkjl6QUU+~0C+PewMT12yz!JV P00000NkvXXu0mjf4kTb~ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-unmerge-cells.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-unmerge-cells.png index 0d6d86ad1fceceebf8899dad13b5fe8c1e3d5e10..405f78eddf750f86ad543af3d29687b7b2f0c72f 100644 GIT binary patch delta 116 zcmeBVY-OAvk;}x)z`zhvIprUa;tcQ!ab*ND7#RNl|378f?TJ7ZV@Z%-FoVOh8)-m} zmZytjNX4z>1c@~cCL%0M5)xsJj?4ib3|x{@3noM;X3cV~SCnc$@_>cG*u(mz)cL+J OkZGQ-elF{r5}E*va3Vwi delta 120 zcmZo=>|~rEQOLo@z`&p>UXu%?0z6$DLn>~)y>7_Gpuod&@X!Ct%Ql+}2&J&S(Mfs8 zrOd$auUP8*ZD*;_!#?--CN6u=mF%@F#p@7Ppq0D z9fH_^0J$NELyZ8bA&3ts0P%ewHlT(Bfzk>@Dn$Z;UPD7{ar0|~_HeQJfE0F^^f xfRYfz7tPd6g9^hs7mt>Mq=w)q7zOkO02j!$8W_@06951J00>D%PDHLkV1oV&Hz)uA delta 139 zcmV;60CfMW0jB|wB!6y6L_t(|+GAiC1*2dTkPQBlfpHr~1|Y_P)DVX|kQ(B{A_S3v z0Hq;_rbd9&5F`Zpfp|U@9oP@V^GS7J0})Z1K&%6SR09#Qn?S7)1UY^I6+;l@_yyFA tVg)LvL4^^Ki$}{rVnc8gi~@QB0Ho}hI1*THc>n+a07*qoL;GT6;Y=ptbgTKARvJz8+1GZ^`iWNP?FJ4;By!j_Gj$@@4Qq zf=KZBZbSgFsZc&c01#S*OS8x%NSk`I36fTCCc(C;S395HGb7jyAN}$xuK!>r!BXjM Yox2#(zH`9Ks{jB107*qoM6N<$f-O5o^#A|> delta 173 zcmV;e08;823-5j{wW!G<5m zLLVVdTS`F?n7JH*FLSWd;EDXx;EDWa9V|eTJr2sT08O?!s5A)%nmX#+4a%oUFwj)3 zTN)%V#yLluBc|0D7t?WpV2Q$!=-@fAb4|*I7 bf;YJVz-q7JNNVhJ00000NkvXXu0mjf_Yq89 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-unmerge-cells.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-unmerge-cells.png index 7a891a3093aed246e5610e6bbbfc6a03a9c9b4c3..b02da1c687f3ae11fcbf260e05f3fc8bb0b0c547 100644 GIT binary patch delta 87 zcmXRao1hY8>*?YcQgJIeL4tL0g2)7xf0H{mO1r5kJaMS0NxFJKwxi#F&8&+8OUgL< qtO~9)F5X#T!jdV`1XO!Lnt>tTVNuRqZ=)j&K;Y@>=d#Wzp$Py6j3MU$ delta 83 zcmXRbnxNum>FMGaQgJIeL4tL0g2)7(f0G*vrQO&Rjx}BpXt$mq^=Pr8$6EoJ(g!P; n-HShFa9lEAaX+ZBK%IdhtuTA>c@y1B3_#%N>gTe~DWM4fF!vtB diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-across.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-across.png index eb7f4517574864d10f9d96709e40a387d3723c75..0246692c24f4862f9325db58e56f5593e9915aed 100644 GIT binary patch delta 211 zcmV;^04)FO0q+5jB!9L^L_t(|+U?lE4TCTYKv71?hGb(#X>$mt0#d;cw|ZalDZ+}r z}CcO-G7z|!UIN=&>%;FU(PB{5Xs#a{6t zk-&rkm9QrAJ56Mjn0bt;na3D|v|l*_?E~!t?E{rCfdd2r007{Bc>_hT!Ic5mY)JqB N002ovPDHLkV1g{_TzLQh delta 207 zcmV;=05JdW0qX&fB!99=L_t(|+U?ju3d1lA1<@SEH;iwbqqJT)(1y}QaLiBp2DCH6 z8IYxDSpWb403eaaq&RoENe~zyFy;J5fhp$+yilMLCh#6_;MDvhJ}~VK{Knd%qzY_l z))pmIVC{LfgTx4dEk*6AwpWQs0!x>7l$av0ba`(QuM#+-X-Mo6hYK9kH?}U7z(j#c zSQEKl6WJvuk1;iQjQRUP+OHge_JQ_+_JK;6z}W%;008iNJOL)SUHS87vI+nI002ov JPDHLkV1ln4TTB1| diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-and-center.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-and-center.png index 469d9ec6d0e64c923ed150765d25ea66a5c6652d..509e80cecc2a394c34bf1d52dd920b7521968d4c 100644 GIT binary patch delta 257 zcmV+c0sj7&0-XYoB!A>dL_t(|+U=NO4uc>JMm>r*q&MzSHcZGu2%>Za+45e(AF-e2 zMJ&2)00000001lTnmqb$ZZZgbP@r|*JEtnpI`5r>z<~l;!U$aR9q8TdU6-)i%?%K^ z#}N#9A=M5Q7!U1n1VdgpYDWt^E}-eSbYw}Y(TYSjfk~dGDSGM1l2oImL{EXaJUw}u z&S=%T2rT4j?P+Rcoz{8@%mv(S00+<4jB!AyYL_t(|+U=NO3d0}_MthXr(A+pj*(_ub#LZTswc|bT$BOy3 zJ*u(YHUIzs004j$c}*I9KW-8TTtMI|^Q!_^nUBDM0$IWce8wI)H9z7H-mwSnd8Cf4 zWVJ&D=8t(vc+-k1^7b zB{PmO9He=a<5`&ZfxHhyAWN7%@F4;L0002s|9AuZl)alz;jCu>0000|vbX=4R;W;uunKD>*@;uEA71FEIdtr>mdKI;Vst0N73$hyVZp delta 70 zcmeBSY-OC_X0PSx;uunKD>*@;O+kc*sbNiM!Ul%r2@E`jIt_|4O! ZFkDHC+Zg+O-%AD{@O1TaS?83{1OOOS7VrQ7