From da687f3e785ca739c85243e014dd445ddc60aad2 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 15 Apr 2021 16:32:09 +0300
Subject: [PATCH] [SSE] Fix up/down buttons

---
 apps/common/main/resources/less/buttons.less           | 10 ++++++++--
 .../main/app/template/SortDialog.template              |  4 ++--
 .../spreadsheeteditor/main/app/view/ChartDataDialog.js |  8 ++++----
 apps/spreadsheeteditor/main/app/view/SortDialog.js     |  4 ++--
 apps/spreadsheeteditor/main/app/view/Spellcheck.js     |  2 +-
 .../main/resources/less/advanced-settings.less         |  7 -------
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index af3143e83..1ae6fecb2 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -186,8 +186,8 @@
     &.active:not(.disabled) {
         .caret-up, .caret-down {
             &::after {
-                border-color: @background-normal-ie;
-                border-color: @background-normal;
+                border-color: @text-normal-pressed-ie;
+                border-color: @text-normal-pressed;
             }
         }
 
@@ -331,8 +331,14 @@
     .btn.small;
 
     &.bg-white {
+        width: 22px;
+        height: 22px;
+
         background-color: @background-normal-ie;
         background-color: @background-normal;
+        border: @scaled-one-px-value-ie solid @border-regular-control-ie;
+        border: @scaled-one-px-value solid @border-regular-control;
+        .border-radius(@border-radius-small);
     }
 
     &:before,
diff --git a/apps/spreadsheeteditor/main/app/template/SortDialog.template b/apps/spreadsheeteditor/main/app/template/SortDialog.template
index 989f33250..d67a77507 100644
--- a/apps/spreadsheeteditor/main/app/template/SortDialog.template
+++ b/apps/spreadsheeteditor/main/app/template/SortDialog.template
@@ -6,8 +6,8 @@
                     <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>
+                    <div id="sort-dialog-btn-up" style="display: inline-block;"></div>
+                    <div id="sort-dialog-btn-down" style="display: inline-block;"></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/app/view/ChartDataDialog.js b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
index 2221f64db..3ea2a9cc1 100644
--- a/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
@@ -85,8 +85,8 @@ define([
                                         '<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-edit" style="min-width: 70px;margin-right:5px;">', me.textEdit, '</button>',
                                         '<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-delete" style="min-width: 70px;margin-right:5px;">', me.textDelete, '</button>',
                                         '<div style="display: inline-block; float: right;">',
-                                        '<div id="chart-dlg-btn-up" style="display: inline-block;border: 1px solid #cfcfcf;border-radius: 1px;margin-right: 2px;"></div>',
-                                        '<div id="chart-dlg-btn-down" style="display: inline-block;border: 1px solid #cfcfcf;border-radius: 1px;"></div>',
+                                        '<div id="chart-dlg-btn-up" style="display: inline-block;margin-right: 2px;"></div>',
+                                        '<div id="chart-dlg-btn-down" style="display: inline-block;"></div>',
                                         '</div>',
                                     '</td>',
                                 '</tr>',
@@ -175,7 +175,7 @@ define([
 
             this.btnUp = new Common.UI.Button({
                 parentEl: $('#chart-dlg-btn-up'),
-                cls: 'btn-toolbar',
+                cls: 'btn-toolbar bg-white',
                 iconCls: 'caret-up',
                 hint: this.textUp
             });
@@ -183,7 +183,7 @@ define([
 
             this.btnDown = new Common.UI.Button({
                 parentEl: $('#chart-dlg-btn-down'),
-                cls: 'btn-toolbar',
+                cls: 'btn-toolbar bg-white',
                 iconCls: 'caret-down',
                 hint: this.textDown
             });
diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js
index c54c77bd7..ac3253845 100644
--- a/apps/spreadsheeteditor/main/app/view/SortDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js
@@ -177,7 +177,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
 
             this.btnUp = new Common.UI.Button({
                 parentEl: $('#sort-dialog-btn-up'),
-                cls: 'btn-toolbar',
+                cls: 'btn-toolbar bg-white',
                 iconCls: 'caret-up',
                 hint: this.textUp
             });
@@ -185,7 +185,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
 
             this.btnDown = new Common.UI.Button({
                 parentEl: $('#sort-dialog-btn-down'),
-                cls: 'btn-toolbar',
+                cls: 'btn-toolbar bg-white',
                 iconCls: 'caret-down',
                 hint: this.textDown
             });
diff --git a/apps/spreadsheeteditor/main/app/view/Spellcheck.js b/apps/spreadsheeteditor/main/app/view/Spellcheck.js
index e32675a48..0abbe625c 100644
--- a/apps/spreadsheeteditor/main/app/view/Spellcheck.js
+++ b/apps/spreadsheeteditor/main/app/view/Spellcheck.js
@@ -89,7 +89,7 @@ define([
 
             this.buttonNext = new Common.UI.Button({
                 parentEl: $('#spellcheck-next'),
-                style: 'margin-left: 5px; width: 22px; height: 22px; border: 1px solid #cfcfcf;',
+                style: 'margin-left: 5px;',
                 cls: 'btn-toolbar bg-white',
                 iconCls: 'toolbar__icon btn-nextitem',
                 hint: this.txtNextTip
diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
index a0abb7a2a..9e852c645 100644
--- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
+++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
@@ -90,13 +90,6 @@
     }
 }
 
-.sort-dialog-btn-caret {
-    display: inline-block;
-    border: @scaled-one-px-value-ie solid #cfcfcf;
-    border: @scaled-one-px-value solid #cfcfcf;
-    border-radius: 1px;
-}
-
 #sort-dialog-btn-down {
     margin-right: 5px;
 }