From d016f2709831e490d79b50ec858b54006d257987 Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Fri, 2 Apr 2021 00:02:05 +0300
Subject: [PATCH] [all] changed icon name
---
apps/documenteditor/main/app/view/DocumentHolder.js | 2 +-
apps/presentationeditor/main/app/view/DocumentHolder.js | 2 +-
apps/spreadsheeteditor/main/app/view/Toolbar.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 00b77361d..db0d192d8 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -2707,7 +2707,7 @@ define([
}).on('click', _.bind(me.onInsertCaption, me));
var mnuTableMerge = new Common.UI.MenuItem({
- iconCls: 'menu__icon btn-merge',
+ iconCls: 'menu__icon btn-merge-cells',
caption : me.mergeCellsText
}).on('click', function(item) {
if (me.api)
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index b1376eb81..6085cf146 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -2165,7 +2165,7 @@ define([
});
var mnuTableMerge = new Common.UI.MenuItem({
- iconCls: 'menu__icon btn-merge',
+ iconCls: 'menu__icon btn-merge-cells',
caption : me.mergeCellsText
}).on('click', function(item) {
if (me.api)
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index b020bb5e8..9f9d107dc 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -568,7 +568,7 @@ define([
me.btnMerge = new Common.UI.Button({
id : 'id-toolbar-rtn-merge',
cls : 'btn-toolbar',
- iconCls : 'toolbar__icon btn-merge',
+ iconCls : 'toolbar__icon btn-merge-cells',
enableToggle: true,
allowDepress: true,
split : true,