From acb17c9e08ba7cab54053a1729f8daa2a525b394 Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Sun, 31 Jan 2021 22:35:09 +0300
Subject: [PATCH] [multiscaling] correct some elements

---
 apps/common/main/resources/less/input.less          |  9 +++++++--
 apps/common/main/resources/less/listview.less       |  6 +++---
 .../main/resources/less/rightmenu.less              |  2 +-
 .../main/app/template/SortDialog.template           | 10 +++++-----
 .../main/resources/less/advanced-settings.less      | 13 +++++++++++++
 .../main/resources/less/rightmenu.less              |  2 +-
 6 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less
index b6220c3a2..6eb93f7ea 100644
--- a/apps/common/main/resources/less/input.less
+++ b/apps/common/main/resources/less/input.less
@@ -102,9 +102,14 @@ textarea.form-control:focus {
 
     .select-button {
         position: absolute;
-        top: 1px;
-        right: 1px;
+        right: @scaled-one-px-value;
+
+        > .btn-toolbar {
+            height: 22px;
+            padding-top: 1px;
+        }
     }
+
     .input-error {
         &:before {
             right: 22px;
diff --git a/apps/common/main/resources/less/listview.less b/apps/common/main/resources/less/listview.less
index 5bb144db8..f7693f7bb 100644
--- a/apps/common/main/resources/less/listview.less
+++ b/apps/common/main/resources/less/listview.less
@@ -36,7 +36,7 @@
     background-color: @list-group-bg;
     border-color: @list-group-border;
     border-style: solid;
-    border-width: 1px 0;
+    border-width: @scaled-one-px-value 0;
     border-top-color: #fafafa;
   }
 
@@ -45,7 +45,7 @@
       background-color: @secondary;
       border-color: @secondary;
       border-style: solid;
-      border-width: 1px 0;
+      border-width: @scaled-one-px-value 0;
     }
 
     &.selected {
@@ -53,7 +53,7 @@
       color: #fff;
       border-color: @primary;
       border-style: solid;
-      border-width: 1px 0;
+      border-width: @scaled-one-px-value 0;
     }
   }
 
diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less
index e15bd154c..126d589ed 100644
--- a/apps/presentationeditor/main/resources/less/rightmenu.less
+++ b/apps/presentationeditor/main/resources/less/rightmenu.less
@@ -16,7 +16,7 @@
 
 .btn-edit-table,
 .btn-change-shape {
-    .background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px);
+    .background-ximage-v2('right-panels/rowscols_icon.png', 84px);
     margin-right: 2px !important;
     margin-bottom: 1px !important;
 }
diff --git a/apps/spreadsheeteditor/main/app/template/SortDialog.template b/apps/spreadsheeteditor/main/app/template/SortDialog.template
index 77bbbd1e9..989f33250 100644
--- a/apps/spreadsheeteditor/main/app/template/SortDialog.template
+++ b/apps/spreadsheeteditor/main/app/template/SortDialog.template
@@ -3,11 +3,11 @@
         <table cols="1" style="width: 100%;">
             <tr>
                 <td class="padding-small">
-                    <button type="button" class="btn btn-text-default auto" id="sort-dialog-btn-add" style="min-width: 100px;margin-right:5px;"><%= scope.textAdd %></button>
-                    <button type="button" class="btn btn-text-default auto" id="sort-dialog-btn-delete" style="min-width: 100px;margin-right:5px;"><%= scope.textDelete %></button>
-                    <button type="button" class="btn btn-text-default auto" id="sort-dialog-btn-copy" style="min-width: 100px;margin-right:5px;"><%= scope.textCopy %></button>
-                    <div id="sort-dialog-btn-up" style="display: inline-block;border: 1px solid #cfcfcf;border-radius: 1px;"></div>
-                    <div id="sort-dialog-btn-down" style="display: inline-block;border: 1px solid #cfcfcf;border-radius: 1px;margin-right: 5px;"></div>
+                    <button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-add"><%= scope.textAdd %></button>
+                    <button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-delete"><%= scope.textDelete %></button>
+                    <button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-copy"><%= scope.textCopy %></button>
+                    <div id="sort-dialog-btn-up" class="sort-dialog-btn-caret"></div>
+                    <div id="sort-dialog-btn-down" class="sort-dialog-btn-caret"></div>
                     <button type="button" class="btn btn-text-default" id="sort-dialog-btn-options" style="min-width: 100px;"><%= scope.textOptions %></button>
                 </td>
             </tr>
diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
index d7a69c082..29b010977 100644
--- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
+++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
@@ -90,4 +90,17 @@
     }
 }
 
+.sort-dialog-btn-caret {
+    display: inline-block;
+    border: @scaled-one-px-value solid #cfcfcf;
+    border-radius: 1px;
+}
 
+#sort-dialog-btn-down {
+    margin-right: 5px;
+}
+
+.sort-dialog-btn-text {
+    min-width: 100px;
+    margin-right: 5px;
+}
diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
index 87bc54fc7..8885b60ef 100644
--- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
@@ -10,7 +10,7 @@
 
 .btn-edit-table,
 .btn-change-shape {
-    .background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px);
+    .background-ximage-v2('right-panels/rowscols_icon.png', 84px);
     margin-right: 2px !important;
     margin-bottom: 1px !important;
 }