From 5e38c59787f0b732649bd1c1fecf405f5bb4197b Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 3 Apr 2020 20:21:00 +0300
Subject: [PATCH] Fix Bug 43986

---
 .../main/lib/component/ComboBorderSize.js     |   6 ++---
 .../img/combo-border-size/BorderSize.png      | Bin 216 -> 254 bytes
 .../img/combo-border-size/BorderSize@2x.png   | Bin 0 -> 275 bytes
 .../resources/less/combo-border-size.less     |  20 ++++++++++++++-
 .../main/resources/img/toolbar/BorderSize.png | Bin 2446 -> 214 bytes
 .../resources/img/toolbar/BorderSize@2x.png   | Bin 107 -> 234 bytes
 .../main/resources/less/rightmenu.less        |  18 ++++++++++++++
 .../main/resources/less/toolbar.less          |  23 +++++++++++++++---
 8 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 apps/common/main/resources/img/combo-border-size/BorderSize@2x.png

diff --git a/apps/common/main/lib/component/ComboBorderSize.js b/apps/common/main/lib/component/ComboBorderSize.js
index 8f01b7071..f7c7ef6b4 100644
--- a/apps/common/main/lib/component/ComboBorderSize.js
+++ b/apps/common/main/lib/component/ComboBorderSize.js
@@ -142,7 +142,7 @@ define([
             if (record.get('value')>0) {
                 formcontrol[0].innerHTML = '';
                 formcontrol.removeClass('text').addClass('image');
-                formcontrol.css('background-position', '0 -' + record.get('offsety') + 'px');
+                formcontrol.css('background-position', '10px -' + record.get('offsety') + 'px');
             } else {
                 formcontrol[0].innerHTML = this.txtNoBorders;
                 formcontrol.removeClass('image').addClass('text');
@@ -229,7 +229,7 @@ define([
                 '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
                 '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
                     '<% _.each(items, function(item) { %>',
-                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem" style="padding: 2px 0;">',
+                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem" style="padding: 2px 0 2px 10px;">',
                             '<span style="margin-top: 0;"></span>',
                             '<% if (item.offsety!==undefined) { %>',
                                 '<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="left" style="background-position: 0 -<%= item.offsety %>px;">',
@@ -265,7 +265,7 @@ define([
             var formcontrol = $(this.el).find('.form-control');
             formcontrol[0].innerHTML = '';
             formcontrol.removeClass('text').addClass('image');
-            formcontrol.css('background-position', '0 -' + record.get('offsety') + 'px');
+            formcontrol.css('background-position', '10px -' + record.get('offsety') + 'px');
         }
     }, Common.UI.ComboBorderType || {}));
 
diff --git a/apps/common/main/resources/img/combo-border-size/BorderSize.png b/apps/common/main/resources/img/combo-border-size/BorderSize.png
index cc8dcdf9462aff23f5013a399f20e67a4c1976fe..b0312414f92e53f3848027d55b485ae8f82bceef 100644
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^HVh1mIvmVE){16@d?3Y=?&#~tz_78O`%fY(kk42g
z<nF|<?wrg^Acr%+C&bmgzz4_#0<mn)$v}#!B*-tAA?=bAXDE=@>gnPbQgQ3;b!)B$
z0|5ueum9S`a#&nH-%N^}tJxGNrg+qOI&0K5hUM%jx0&Y11?);>;s`l6p^b5W?hJ+|
zp3rj>fTX0D!-P0hMy_z3O>&kqqm%R5I?^@rB_8~lK4;GfX|^4vIVH0#cxrT=r|VBW
tm;1=zfb(Ityl1@3d(7564}4^><&D-Jq2DJ?cufa6)6><@Wt~$(69DZ2QG@^h

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^t_%!}IvgxOmOaO|79cg>)5S5Qg7NJQLoOyqp0<l?
zD#G5^H+M`unjo59f1_6a>;sLKm3B5<55nRWGO95&EDnohW?)#5D=*5#(6HdjHU@@_
z=+z7i9H%T-N3b#oOo=<H73RsrFyW>aA43D*T=Bm%5A6K3o{8Z=jE2Vif7@9Z9^C(B
zonE&nmyy9@ZLazKtZ0UY)i2~X{|pOYVi3r@&3hkY=8@ZF|Fm<t3*7Vfv$)7f^>VrZ
Poyy?p>gTe~DWM4f*wac&

diff --git a/apps/common/main/resources/img/combo-border-size/BorderSize@2x.png b/apps/common/main/resources/img/combo-border-size/BorderSize@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c59d606eef2d78a7826ba2d945a0f581a8a73ed9
GIT binary patch
literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^6$}ha5lqZL))mWBaX^YC-O<;Pfnj4m_n$;oAfK@~
z$lZxy-8q?;Kn`bsPl&5~fe(-g1Y+5olYtadNswPKL)s-L&QKt4mZytjNX4zUHw^ij
z4Fp^ruiw%CUi>zA*+!1eLwZ84Vdr`@9QH4$Hrm2A-PY+QPr!MORO16#vB9nhTa8{y
zEy!NQacWD^%n-pTC)ac}>@Pkb|LWn?Gq*d|<?Q>O*YN(`)R)tZ54<eTxP9z}x_N7Q
z!;0+9Vt+qx{KTUZyR5QL^0P*9%^DkKmDuX9k0(qxW$bWo>-M@g^($AME4V4VcBlR0
Tw+n9Og52)u>gTe~DWM4far$gu

literal 0
HcmV?d00001

diff --git a/apps/common/main/resources/less/combo-border-size.less b/apps/common/main/resources/less/combo-border-size.less
index 35445b6fa..51df24ed9 100644
--- a/apps/common/main/resources/less/combo-border-size.less
+++ b/apps/common/main/resources/less/combo-border-size.less
@@ -16,7 +16,7 @@
         }
 
         img {
-            width:69px;
+            width:60px;
             height:20px;
             background-color: transparent;
         }
@@ -24,5 +24,23 @@
 
     img, .image {
         background: ~"url(@{common-image-const-path}/combo-border-size/BorderSize.png) no-repeat 0 0 #fff";
+
+        @media only screen {
+            //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
+            //        (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
+            //        (min-resolution: 144dpi) and (max-resolution: 191dpi)
+            //{
+            //    background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)";
+            //    background-size: 60px auto;
+            //}
+
+            @media (-webkit-min-device-pixel-ratio: 2),
+            (min-resolution: 2dppx),
+            (min-resolution: 192dpi)
+            {
+                background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)";
+                background-size: 60px auto;
+            }
+        }
     }
 }
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize.png b/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize.png
index 9cd1ceddd199427a911c0a3377f02f68b046ec43..640f0a1b639d3f3eeecd6877ef2519bd6203ef4e 100644
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^Hb8ubkr_yel?7}DQY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D$|*aCb)T-^(NfXw+?ErB5Ek|4ie28U-i(tw;qPZ!4!i_^&o3(S7-Gs;V}
z2}H0ma<@&Iecs_f<H9G;$^||oXzcv?(Z2hC?YDmEwkflJ*Ed|4P-ML4j)W8IiU0rP
z6|OWS@YH?y<NvUJ=C8xN9LFY{Xjb^bcu>OW<czeJk__Rwg(ZqkcXk0SWAJqKb6Mw<
G&;$Sje@k2d

literal 2446
zcmb_ee{2&~952KHE&(Ji!I>E^2P2!ay}SOn_AV=|?OnGTJ4@TJWh3hC?ybG8y}RAr
z)@~}v&;(uJ4-%6lh7n*YA<Cls7%_`6f<Iym5d^0h#6)9s0d*0LKS<ns*IkbR8zpMf
z-o1PG`TqQT-g|v1*4((d{K0aY&9*wy#Khs9g}=+IR>13~?=pwrtx{)O^@QB1=QtJE
z0)pHDkVuwGfjHoV{+>@jz0I~VCMH|;*68CjFJ~Q`fpO%s3beM_>bK+-j_(FK(g9MU
z<VR;F-a`>l@S`oBC>~WpAT2fxs30-Woa6_(c}hUHY)0zyG<1*!I)~)58A+q_ezf41
zhGSzILy-bR@AjkfNwr2}NJv%z;&Hg_JWdb@NjeC(ha`zd5hqSKF&utLJK?51B<=Jf
z<_Cq*RH2iOGhs6peDb4dT~}xf%jI&8oXa7rDU6^f%JAWI+9ATO^-DUJw@ccFq6Y?O
zyecZXC`*Xpk?W9qbw3I-oi8D)SZ*cFY!hr4mgf|VaNtHs1)#uNIHgz36oLyp1~MQE
zBwd48!otEXMWYscQMcKwh1PVo4`yW6wkTRl_A3C315NH#dBFC;h#QKDX?h&oXw6-i
zLwLbhp+hR*bXiTxa;8XFEG_G@mX;MHlpv9s7Eu!9oK|ZDGx31obl^uJd88dO=kz5Z
zd4!jC6Lq+Y#_@S*R2Ia}ehccg<Aj}XB_R&SA^IjLRF1&uTuHFN)19)K<zTZ!L+qF$
zr3%raQ92@NIw$cU!uU~`szVe7nqoYJGtBxJit-TzO9mMq8z6ll${TbuEEy`=GBV$5
zkXW=8ZrD<#Y@bj?xPZ9KVm`tYi!(kdfO}mq96<yFArIva;@&Xf@eyvPA<=?V=q6Ev
zJoKBQPk<hClo64FI%tkJ1nft7gE1hW=Crs-)g_~vwz)Kb4(~wYd}PhsWdbSKp;9Wr
zmdsn0`hdD1bA?kmxMcuU^P`=roJA}~5nV<&MahUfXVi@KNrJg7m7+G$CF5vZUy1Gn
zN^o+A?l_&a+g()dzvzzXnoo053c$S<`ww*lDHq{kNtSXml%Xvj%LYSKhzj_^fgnzV
ziwdz=wpJiXyKvfRE!O|74$RnH=cS9?s_OY?2B;#WCv4DN*tO`z^m{jz!7Ypy7Fo3=
zwQmTgkm!PAp*RK48e?c3a`3@ACV>R`QsE)^#v|23Hruj`5hjq#PyKi~&~*mCuk73^
zb*`@Nm(%ZWdV6#)7_FHJ)jF=6c&_RA1KVHQ_iJ=A5<Ac^xV)^qqGsg#CpQkq#}i*~
zt$Mg-08UtM;9wnmsyh3^wV(Jl5}Vug*++X%e!OzXw6uWB%N}zNR%Z8qxpr>*i^qah
zv((Tv@$jDC-#nZ?VS$VR3NO^YS0>iH-cr45$9MupT=?FI)-b4UJ>;5N-|@{uC)=-1
zjNLzbYW73#`XlnunRnK_+*Yw?TQTvX<>0a5ZLX=~sj=b7Q%ia5`k8(!aUe4~T^n<^
z-4xTv$=z66*|_=YtK4Mh2-EZIJ-0Vu=e_SXUh3NT)iWd0yGecBndzEOPs>kT`m4IH
z`?t0qF8+~j|C=}(zpi<1cmBcWU+f+qzJ9RMUg2lE28Kqy{qvUojXpneey}}!u;F~d
fs%;0gcG(Ks=#{e<;^!_*8UK(XY%?<!e0t|UN{Js1

diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@2x.png b/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@2x.png
index e65b9ba73a3982bb9fd509eeb811cbb26431a180..be0b87b627c748dd019cf88db89aaa5c68a0b0a7 100644
GIT binary patch
delta 219
zcmd0P#W+E%o^b~wGXn#|7SoLrffP%+qpu?a!^VE@KZ&eBK4Wo^yA#8@b22Z19JT<T
z5LfpCA0TtSR!bmAx+KUin8D%MjWi&q)YHW=B;xSf>l--_C<wSE3bPlegqJt)6f<+w
zb2)p=S|adH=U#iqwoeYeobhIRzgxRAo&Oig_scn<-mRYF&HBsoOkWqp&AM`|>EDAp
z_dDLtddaW-xBmaP10pMJ+5aB={%`H3Sxa+5!(Q+U{_n3|X20gkzQy}3)$_kvf6ls|
RVgz&ngQu&X%Q~loCICE1SFZp7

delta 91
zcmaFGm_0!(l%ax=0SE-;x$A)xQ%R6tFasmwl)vkMJQYtD$B+uf<RAT99#8r|aWd@r
q<^FSVjTG~qZ~dR#e=>8qT~=rKv_QytddU4CkSU(7elF{r5}E+s6dr#7

diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
index ec2bebac0..02916f13e 100644
--- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
@@ -300,5 +300,23 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
 .combo-border-size.cell-border-type {
     img, .image {
         background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize.png)";
+
+        @media only screen {
+          //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
+          //        (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
+          //        (min-resolution: 144dpi) and (max-resolution: 191dpi)
+          //{
+          //    background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
+          //    background-size:  60px auto;
+          //}
+
+            @media (-webkit-min-device-pixel-ratio: 2),
+            (min-resolution: 2dppx),
+            (min-resolution: 192dpi)
+            {
+                background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
+                background-size: 60px auto;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index 95daeb707..ebc025adc 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -111,10 +111,27 @@
 #id-toolbar-mnu-item-border-width {
     .border-size-item {
         background: ~"url(@{app-image-const-path}/toolbar/BorderSize.png) no-repeat scroll 0 0";
-        width: 80px;
+        width: 60px;
         height: 20px;
-        margin-top: -3px;
-        margin-bottom: -2px;
+        margin: -3px 10px -2px;
+
+        @media only screen {
+            //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
+            //        (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
+            //        (min-resolution: 144dpi) and (max-resolution: 191dpi)
+            //{
+            //    background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
+            //    background-size:  60px auto;
+            //}
+
+            @media (-webkit-min-device-pixel-ratio: 2),
+            (min-resolution: 2dppx),
+            (min-resolution: 192dpi)
+            {
+                background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
+                background-size: 60px auto;
+            }
+        }
     }
 }