diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 3f71c87d7..7ead3bd59 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/FormatRulesManagerDlg.template b/apps/spreadsheeteditor/main/app/template/FormatRulesManagerDlg.template
index 2b2429c8e..9dae14490 100644
--- a/apps/spreadsheeteditor/main/app/template/FormatRulesManagerDlg.template
+++ b/apps/spreadsheeteditor/main/app/template/FormatRulesManagerDlg.template
@@ -23,8 +23,8 @@
-
-
+
+
|
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 @@
-
-
+
+
|
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([
'',
'',
'',
- '
',
- '
',
+ '
',
+ '
',
'
',
'',
'',
@@ -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/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
index 9738c323b..0c924c2ca 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
@@ -186,7 +186,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
this.btnUp = new Common.UI.Button({
parentEl: $('#format-manager-btn-up'),
- cls: 'btn-toolbar',
+ cls: 'btn-toolbar bg-white',
iconCls: 'caret-up',
hint: this.textUp
});
@@ -194,7 +194,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
this.btnDown = new Common.UI.Button({
parentEl: $('#format-manager-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 5fb7bb08d..be4347fbb 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;
}