From 08daab14b13f6c610b56ba2711b307b9d81c738f Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 29 Nov 2019 14:46:58 +0300
Subject: [PATCH] Fix toolbar icons
---
apps/common/main/lib/view/ReviewChanges.js | 4 ++--
apps/common/main/resources/less/toolbar.less | 3 ---
apps/documenteditor/main/app/view/Toolbar.js | 2 +-
apps/presentationeditor/main/app/view/Toolbar.js | 2 +-
apps/spreadsheeteditor/main/app/view/Toolbar.js | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js
index f1b38e56f..692efeb91 100644
--- a/apps/common/main/lib/view/ReviewChanges.js
+++ b/apps/common/main/lib/view/ReviewChanges.js
@@ -218,7 +218,7 @@ define([
cls : 'btn-toolbar x-huge icon-top',
caption : this.txtCompare,
split : true,
- iconCls: 'btn-compare'
+ iconCls: 'toolbar__icon btn-compare'
});
this.btnTurnOn = new Common.UI.Button({
@@ -329,7 +329,7 @@ define([
cls: 'btn-toolbar x-huge icon-top',
caption: this.txtCommentRemove,
split: true,
- iconCls: 'btn-rem-comment'
+ iconCls: 'toolbar__icon btn-rem-comment'
});
}
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 68ac5c873..f387c6bfa 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -467,9 +467,6 @@
&.borders--small {
border-radius: 2px;
background-color: #fff;
-.button-normal-icon(btn-compare, 82, @toolbar-big-icon-size);
-.button-normal-icon(btn-rem-comment, 83, @toolbar-big-icon-size);
-.button-normal-icon(btn-symbol, 84, @toolbar-big-icon-size);
&:not(:active) {
box-shadow: inset 0 0 0 1px #cbcbcb;
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index dee852233..ad593f4db 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -543,7 +543,7 @@ define([
this.btnInsertSymbol = new Common.UI.Button({
id: 'tlbtn-insertsymbol',
cls: 'btn-toolbar x-huge icon-top',
- iconCls: 'btn-symbol',
+ iconCls: 'toolbar__icon btn-symbol',
caption: me.capBtnInsSymbol
});
this.paragraphControls.push(this.btnInsertSymbol);
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index 335768ee0..ee7c56ce9 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -553,7 +553,7 @@ define([
me.btnInsertSymbol = new Common.UI.Button({
id: 'tlbtn-insertsymbol',
cls: 'btn-toolbar x-huge icon-top',
- iconCls: 'btn-symbol',
+ iconCls: 'toolbar__icon btn-symbol',
caption: me.capBtnInsSymbol,
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected]
});
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index d4061945d..638cf57c7 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -724,7 +724,7 @@ define([
me.btnInsertSymbol = new Common.UI.Button({
id: 'tlbtn-insertsymbol',
cls: 'btn-toolbar x-huge icon-top',
- iconCls: 'btn-symbol',
+ iconCls: 'toolbar__icon btn-symbol',
caption: me.capBtnInsSymbol,
lock: [_set.selImage, _set.selChart, _set.selShape, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect]
});