diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-merge.png b/apps/common/main/resources/img/toolbar/1.25x/btn-merge.png index 4820d5e80..0af489b53 100644 Binary files a/apps/common/main/resources/img/toolbar/1.25x/btn-merge.png and b/apps/common/main/resources/img/toolbar/1.25x/btn-merge.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-merge.png b/apps/common/main/resources/img/toolbar/1.5x/btn-merge.png index 2bf10dae5..2af6a99f5 100644 Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-merge.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-merge.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-merge.png b/apps/common/main/resources/img/toolbar/1.75x/btn-merge.png index 898a5b705..127ff4e70 100644 Binary files a/apps/common/main/resources/img/toolbar/1.75x/btn-merge.png and b/apps/common/main/resources/img/toolbar/1.75x/btn-merge.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/btn-merge.png b/apps/common/main/resources/img/toolbar/1x/btn-merge.png index c6b96351c..fa27681ab 100644 Binary files a/apps/common/main/resources/img/toolbar/1x/btn-merge.png and b/apps/common/main/resources/img/toolbar/1x/btn-merge.png differ diff --git a/apps/common/main/resources/img/toolbar/2x/btn-merge.png b/apps/common/main/resources/img/toolbar/2x/btn-merge.png index 545195021..fd9a45bff 100644 Binary files a/apps/common/main/resources/img/toolbar/2x/btn-merge.png and b/apps/common/main/resources/img/toolbar/2x/btn-merge.png differ diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index db0cfc733..e751ea8fa 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-and-center', enableToggle: true, allowDepress: true, split : true, @@ -577,18 +577,22 @@ define([ items: [ { caption : me.txtMergeCenter, + iconCls : 'menu__icon btn-merge-and-center', value : Asc.c_oAscMergeOptions.MergeCenter }, { caption : me.txtMergeAcross, + iconCls : 'menu__icon btn-merge-across', value : Asc.c_oAscMergeOptions.MergeAcross }, { caption : me.txtMergeCells, + iconCls : 'menu__icon btn-merge', value : Asc.c_oAscMergeOptions.Merge }, { caption : me.txtUnmerge, + iconCls : 'menu__icon btn-unmerge-cells', value : Asc.c_oAscMergeOptions.None } ] diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-merge-across.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-merge-across.png new file mode 100644 index 000000000..89b89723b Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-merge-across.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-merge-and-center.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-merge-and-center.png new file mode 100644 index 000000000..cd51bf064 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-merge-and-center.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-unmerge-cells.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-unmerge-cells.png new file mode 100644 index 000000000..f520337fa Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-unmerge-cells.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge-across.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge-across.png new file mode 100644 index 000000000..f31ced299 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge-across.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge-and-center.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge-and-center.png new file mode 100644 index 000000000..b80b94e11 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-merge-and-center.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-unmerge-cells.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-unmerge-cells.png new file mode 100644 index 000000000..29ca5d3f6 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-unmerge-cells.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge-across.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge-across.png new file mode 100644 index 000000000..7e7932207 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge-across.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge-and-center.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge-and-center.png new file mode 100644 index 000000000..4e6781c36 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-merge-and-center.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-unmerge-cells.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-unmerge-cells.png new file mode 100644 index 000000000..0d6d86ad1 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-unmerge-cells.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge-across.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge-across.png new file mode 100644 index 000000000..46a010c35 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge-across.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge-and-center.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge-and-center.png new file mode 100644 index 000000000..d91bbed3d Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-merge-and-center.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-unmerge-cells.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-unmerge-cells.png new file mode 100644 index 000000000..7a891a309 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-unmerge-cells.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-across.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-across.png new file mode 100644 index 000000000..eb7f45175 Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-across.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-and-center.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-and-center.png new file mode 100644 index 000000000..469d9ec6d Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-merge-and-center.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-unmerge-cells.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-unmerge-cells.png new file mode 100644 index 000000000..caed6edda Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-unmerge-cells.png differ