From 134001162c5a5a267ca68f847d3dcade42cf8c95 Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Wed, 28 Apr 2021 14:10:39 +0300
Subject: [PATCH] [web-apps] fix bug 50030

---
 .../main/resources/less/colors-table.less     |   2 ++
 apps/common/main/resources/less/combobox.less |  22 ++++++++--------
 .../resources/img/toolbar/BorderSize@1.5x.png | Bin 0 -> 207 bytes
 .../main/resources/less/rightmenu.less        |   4 +--
 .../main/resources/less/toolbar.less          |  24 ++++++------------
 5 files changed, 22 insertions(+), 30 deletions(-)
 create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png

diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less
index 799715513..573027e92 100644
--- a/apps/common/main/resources/less/colors-table.less
+++ b/apps/common/main/resources/less/colors-table.less
@@ -224,6 +224,8 @@
 @header-component-active-hover-icon-opacity: var(--header-component-active-hover-icon-opacity, 1);
 
 @menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0);
+@img-border-type-filter: var(--image-border-types-filter, none);
+@img-border-type-filter-selected: var(--image-border-types-filter-selected, none);
 
 // Canvas
 // ---------------------------
diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less
index 5e81105ed..166449139 100644
--- a/apps/common/main/resources/less/combobox.less
+++ b/apps/common/main/resources/less/combobox.less
@@ -1,5 +1,3 @@
-@img-borders-filter: var(--image-border-types-filter);
-@img-borders-filter-selected: var(--image-border-types-filter-selected);
 
 .combobox {
     display: block;
@@ -33,8 +31,8 @@
         float: none;
 
         .image {
-            -webkit-filter: @img-borders-filter;
-            filter: @img-borders-filter;
+            -webkit-filter: @img-border-type-filter;
+            filter: @img-border-type-filter;
         }
     }
 
@@ -136,22 +134,22 @@
     // ------------------------
     li {
         img {
-            -webkit-filter: @img-borders-filter;
-            filter: @img-borders-filter;
+            -webkit-filter: @img-border-type-filter;
+            filter: @img-border-type-filter;
         }
         canvas {
-            -webkit-filter: @img-borders-filter;
-            filter: @img-borders-filter;
+            -webkit-filter: @img-border-type-filter;
+            filter: @img-border-type-filter;
         }
 
         &.selected {
             img {
-                -webkit-filter: @img-borders-filter-selected;
-                filter: @img-borders-filter-selected;
+                -webkit-filter: @img-border-type-filter-selected;
+                filter: @img-border-type-filter-selected;
             }
             canvas {
-                -webkit-filter: @img-borders-filter-selected;
-                filter: @img-borders-filter-selected;
+                -webkit-filter: @img-border-type-filter-selected;
+                filter: @img-border-type-filter-selected;
             }
         }
 
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png b/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png
new file mode 100644
index 0000000000000000000000000000000000000000..18d70bd1405976184115eaea0abac988ec7aea48
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^Q49=>UW`Bn!`7nG1|Y>$666=mz{oh|?>Zo_!_&nv
zq~ccckA4RB84?o?C_GJQV*GSSqg_#iQHD)R%*|4b!ysX!!6`wf2FC8zKt6B#$CKSo
zxBr=@Bh0oTPNJ99TSDqAck|+2lYq6$FGeKfC)geM(eRMjnRS-YucL=DbUqk<IB9Sq
z!XQHA!L)^?Iz7jj?CqJWtE-tmKRnEyF-P3(aMh6zRt7Gg<*5=AckKkaiNVv=&t;uc
GLK6V1bw{@V

literal 0
HcmV?d00001

diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
index f211f3567..d0138063a 100644
--- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
@@ -211,11 +211,11 @@
         background-size: 60px auto;
 
         .pixel-ratio__1_5 & {
-            background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)";
+            background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
         }
 
         .pixel-ratio__2 & {
-            background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)";
+            background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
         }
     }
 }
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index ba430eecf..c9aa87531 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -77,27 +77,19 @@
 #id-toolbar-mnu-item-border-width {
     .border-size-item {
         background: ~"url(@{app-image-const-path}/toolbar/BorderSize.png) no-repeat scroll 0 0";
+        background-size: 60px auto;
         width: 60px;
         height: 20px;
         margin: -3px 10px -2px;
-        filter: @component-normal-icon-filter;
+        filter: @img-border-type-filter;
 
-        @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;
-            //}
+        .pixel-ratio__1_5 & {
+            background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
+            //background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
+        }
 
-            @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;
-            }
+        .pixel-ratio__2 & {
+            background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
         }
     }
 }