From 263cc0c27da555e2bda98b345dd38d99ec1e2f3c Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Tue, 22 Jun 2021 14:08:01 +0300
Subject: [PATCH] [all] fix bug 50735

---
 .../img/right-panels/rowscols_icon.png        | Bin 213 -> 367 bytes
 .../img/right-panels/rowscols_icon@1.5x.png   | Bin 577 -> 546 bytes
 .../img/right-panels/rowscols_icon@2x.png     | Bin 513 -> 977 bytes
 apps/common/main/resources/less/common.less   |  39 ++++++------------
 4 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon.png b/apps/common/main/resources/img/right-panels/rowscols_icon.png
index 4936930c443d1dac21ec6dbd2678021171e7bfec..61ad3eb8fa9e0a6b1470ecfb0c9f8694e7486b90 100644
GIT binary patch
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^7C@}P!3HGVnRmYcQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtah8*NBqf{Irtt#G+J&g2c?c61}|C5(N`I
z13g2_E7vxG6y5i9aSVxYe>*vl@2~=ggYBI7d;jgE4SsBlxa$(6uCFM#p>g^#kvD$l
zem<4FH$h>yo;!<W>^aM(c@NKCkl(V$+1Yx=Jx<4jYRB^*p7q$DsGKaoBB%R8^4^AQ
zft>DdeNhMJ`yBL7=lGY>ck!q$>(2^rjy|ELGxxcp61V-(n5A%q>)KR}ny2X|jvAtC
zw0+L+=2+wsE3BhZm~AJd5qO<t4Ri6Nt_4;;FTPekI98+bYR|Ik?~7U%v^=?zk)WvI
z;n&Ny_uut~1DDJrn18RYZI)76+49$bLDf!AeA*fAdCp$>*?Q4Uj~1r_1B-#d)78&q
Iol`;+0GRfS)&Kwi

literal 213
zcmV;`04o29P)<h;3K|Lk000e1NJLTq002|~001Be1ONa4CefFj0001-Nkl<ZcmeH}
zQ3^sa5CeO-{o4EACsF}hD9AGG6Dpbg3j{|@!C|@y{q`s$#J(Qw3H9z0z4fOrCbXv`
zD<&507i~Fj)Eo6ijrsbw@3|gcWT=*P^`u(1V^NC|Xm3g34~z_bE_tsis?;LOqLHCJ
zjeMpjEzLbuRz-E@yjKv_ng5IEJR-_^dILl!WNW+!H##A&m-oP{Hx0Z1+4Nt+%T#h=
P00000NkvXXu0mjfhH_Q)

diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png
index ed7943a0bb337369810fcc3484e7872c1f573358..b00e33d9f519cbfae87344f8cf09f024c54533a3 100644
GIT binary patch
literal 546
zcmeAS@N?(olHy`uVBq!ia0vp^AwX=v!3HGz`C@y46k~CayA#8@b22Z19F}xPUq=Rp
zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*AeOHKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ
zK+n+f%C${EMU0a?T^vIy;@(c{?rnD9anXF}wIfNRL1^8S5+_bgRn;X^cF)WZn!Dvs
zQ+Z<eO!Y{n+efZlcDo>%Y}d8#eSLICSOv$_+gX)dS97;UWTfes7>muCIsJmzBGIz>
z7i`bFrrA!rdvM-!r_DMhswStMf{_?Ia=0&Y*)0@qNsG+z%9z%=42e;A6KKMdYZA#m
znakqD-nY~(v#7Fv<7OW`uVc#M)>of$bxN4H&-S#Y9dj~HUO02(g)=oR7nChSyjpaf
zE*dMWd*gaXWKUXNKy=_X4%gESJ2r{m5oy`!{4GYb>sQAP<+>?V2j^rh4m!F(G}f=_
z6HsK5?abh{Kjw8i1@2a;klH`RE5X-Rd}$Yh<mT!{C5|6V&b>Q1tE%hWPPHk^-$!rX
zyrF&XE?p)U9nPmOqwh|(eRDNe@>z@0`N`WWe?&S>e0K7-&21;wV5j9yTUY)26uctr
ze0&|J$Es&bx3H*O{Tvj<ylB;r93c7XN6sy#mbw2D_p@?X|37?BBKeH{u6O);-=9o7
T60Ery7=;X;u6{1-oD!M<YVqh>

literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq004df001xu1^@s6*Ky920000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz<4Ht8RCwC#o9%IeKoEw3NdcB%39$rc
zC?Hl4O0g4S1@a$yNIEbjq=RJFS^befKt4QHo@eI9ncFqKxtHbkB#9yb0C;fXG)=!*
zhVdxN(uYtF#;ZmzI+eNWRE-HWx=b)0<ALT5Xzs>*-;mGpqO)&v*XMmhK8ssDdpuw~
zU_8*(16@5`JzYJp#{<R##sghFT|EE*0Kl}(-7U#O8^Nlo;(Pp3UUUxq!^~KS=Dwi!
zJUw{PImGy(7Y*n5g@W-I4;T*^4;T+i#mfU7FFHg1gXPl%i~b@nuQK%Y!=|5Q6fzD~
zRTVS2I9%wIYvW&?aU2)HD@o$HjFXJ4CYD(&M`yQ+mvAoQBqOVdWftqDGZ}HQ_jV<2
zq*~s7$8Bz-IhGr$(p~5jL$5les{iP;xwB5o4c6T0?Pw<p_tlhOv7P0H!j(=jxKXFY
zdg)9?s-l%G*k@aAmz)W!-Gxr6;FTHMs-a5`$2sWV)z>vn`WRE@HMVZ66wL{Bq?@D8
zx&}`lx9YTvbz4Pi&g90oJf}X$ILd-;oAyt;)gCQ(GQ8+)d7ggODaLM__IcY9dg)9?
zT<pD_GvAwzNgC4}%MF4TonrP?XVY=+qSJD3`}ur<!xuOJ008hf{0J}rh7Na)0#C*C
P00000NkvXXu0mjf8@~qP

diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png
index 113f8835b42e3505723eb2504ed34ee418e3849b..a2a69e6bd11aeb5a5d923d6a0d32ab8be6ce5029 100644
GIT binary patch
literal 977
zcmeAS@N?(olHy`uVBq!ia0vp^1wib;!3HD`&HDTdNHG=%xjQkeJ16rJ$YDu$^mSxl
z*x1kgCy^D%=PdAuEM{QfI}E~%$MaXD00kvWTq8<?^V3So6N^$A3KBE(O7!wlOB77>
z4D<{wuUy*%RK)D)>Eakt5%+e6Z=RAPPiy2swVt%|r523e8)PQCig}iKu5%QdEc#jQ
zFW1?WU+j0n!b^MYPX?WOS~cmflk-<4jwS_;f8pD1zuoz4#ax4eXED52*f&Y-lU`9`
zx?-(C!8&B(hoEu!p#w7?f8)>%RbRM8^5m4|k8KTf&sMxvnPR3q^Ha$l_GL>Y^XIl)
zN>d4**Z2Lv7L&(oCkNc>NjY`-quh*XX?seAyk<}IskFMseECw(c0Z>~<4KzS>ZVcI
zSNtR_io0sRWM-<pq{y)2)d^9vK3?<G$aOP%`f`a|cJD1t=JY<h3626RAY`C^t8Q0y
z%ahHE<6pn?u(QuS{GH=uy8Guc_fJ1R%2ljn%d(U@+1ePqu(G{zyAYe7k3@z1ByQ&A
zPM`Uh^Hq7~%rN+1ry|bg*ZNGB?VRY@-M9W7I<V6?Md91D4(3N478}bHA`VB*i}X^H
z{<MCxeU7dm`w_uHC!T{+*FO1t`&Y&5QrBGJXWI7QX77_t2Remy|1-Vhee^RZp*el?
zx9gb-MSq^Cezp^^KEj_{en{%-C!X{B6vA%Jo0E3#zf^~aedWnL{73i<Z^&ndoHl;K
zI&tlOJLd1Vs@?yD{7S1}`>58t_tNCcXLejYP`kOf&i&3^`SS|*G#EC0y`HYH|M-sW
z!LRZv!lc}ns<|`g8Be&MeB_S&c{8EsIe))O{#d&A;BhZ;i`~<X=|ki{tiCB(ms8fb
z`L)}lIUtLoKYxF;G}#rX^+VING?mF~_Zt+bOgee(e(8bx?7jPK<reZ^vd}cOob_IG
z>CEpHEp{dlqa&{N&uF=H=K4qFW!yY-^MfpE;#iNxDf4-WGq;^H*K7%I+<3j?(XYjf
z+AR7HO%!6ET)*|M#dOuvzZ28r1%K-8l1+F4l2M6$!u~tCH><K<Wj#>&?uLW?wNsDP
zH|$wItLngm<NLfG+dFLh8{5EGv-Dd>g;R~vt)5@TpvXA+e^WVw#DVav{topc>PZ~e
nHcU(Jdan;k`KMAg{^0$@bi2XlZA=F+$1!-i`njxgN@xNAep<k(

literal 513
zcmeAS@N?(olHy`uVBq!ia0vp^D}dO6g9S*cgnqfez`%II)5S5Qg7NJv!@NTdBCIRl
zs3}y%KcAcMzR_|SH<z_+0dKI%)g=p)S|eSxyXWt@`ORC|&FHsoWpZ7=;jxbWwbzb0
zu9Tm$b$**^?SZU)|0S+C%3g77mcRdL-_zCSLcWGpJ;^@1Cq96^6oM{%?f)LY{#EYP
ze}quE-92a7D-y{)hU-6GuN17E(%if+`@*H29s4c?@V#09MZeVS*h??Wso19z@<;x~
zf~+gq7j)##t#RBtD`KCG2Cpr%asL^fFD6r)S6$W+JGVlwPoLlG_z5B9*rN-wOt@mF
zZaMv|%xf2yZ&vb;PYX<X4or1<mhAqB%V*2iCb<^9TlRDBzSb$>cyzj1u7TUX_KhWT
zdzB;m!YvkaTiO)%*}P!T`Q>pSK>x+|3wecA+FwMEPG|kgCRUr%xW39!@abp68irE)
zlZ6+)Hgg63;Hcv`JF(`DX3Z1(hMjR2K6xwk^jmAkcv-$`J*R(thTW=uIg9-<vwu}N
zM*Dtut)6{<yVov`+Eu-;7N_pg|2DH<x0CyWr)m7j)en~B3118U@XGRH?yE&^?sH2{
z*WL0}m%W<P^gF|%=+QA{b3d7rHD3*mNqlDBU%G$RkpjP4z^G;LboFyt=akR{0I)6W
AMgRZ+

diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less
index d732bc597..b4a0128b6 100644
--- a/apps/common/main/resources/less/common.less
+++ b/apps/common/main/resources/less/common.less
@@ -222,49 +222,34 @@ textarea {
 
 .btn-edit-table,
 .btn-change-shape {
-    .background-ximage-v2('right-panels/rowscols_icon.png', 84px);
+    .background-ximage-v2('right-panels/rowscols_icon.png', 56px);
     margin-right: 2px !important;
     margin-bottom: 1px !important;
+
+    background-position-x: calc(@button-small-normal-icon-offset-x - 8px);
+
+    .btn-group.open &,
+        button.active:not(.disabled) &,
+        button:active:not(.disabled) &
+    {
+        background-position-x: calc(@button-small-active-icon-offset-x - 8px);
+    }
 }
 
 .btn-edit-table {
-    background-position: 0 0;
+    background-position-y: 0;
 
     button.over & {
         //background-position: -28px 0;
     }
-
-    .btn-group.open &,
-        button.active:not(.disabled) &,
-        button:active:not(.disabled) &
-    {
-        //background-position: -56px 0;
-    }
-
-    // TODO: not good, must be controled by variable
-    .theme-dark & {
-        background-position-x: -56px;
-    }
 }
 
 .btn-change-shape {
-    background-position: 0 -16px;
+    background-position-y: -16px;
 
     button.over & {
         //background-position: -28px -16px;
     }
-
-    .btn-group.open &,
-        button.active:not(.disabled) &,
-        button:active:not(.disabled) &
-    {
-        //background-position: -56px -16px;
-    }
-
-    // TODO: not good, must be controled by variable
-    .theme-dark & {
-        background-position-x: -56px;
-    }
 }
 
 .doc-content-color {