diff --git a/apps/documenteditor/main/app/view/NoteSettingsDialog.js b/apps/documenteditor/main/app/view/NoteSettingsDialog.js index 9d596ef33..10e7f6f6a 100644 --- a/apps/documenteditor/main/app/view/NoteSettingsDialog.js +++ b/apps/documenteditor/main/app/view/NoteSettingsDialog.js @@ -85,10 +85,10 @@ define([ '', '', '', - '
', + '
', '', '
', - '
','
', + '
','
', '', '
', '
', diff --git a/apps/documenteditor/main/resources/img/toolbar-menu.png b/apps/documenteditor/main/resources/img/toolbar-menu.png index 1fbee3e23..e3cd0769a 100644 Binary files a/apps/documenteditor/main/resources/img/toolbar-menu.png and b/apps/documenteditor/main/resources/img/toolbar-menu.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png index 01244430f..830362bd1 100644 Binary files a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png and b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png differ diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index 4c23b4571..45fd75699 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/apps/documenteditor/main/resources/less/statusbar.less @@ -287,6 +287,7 @@ &.sl, &.sl-SI {background-position: 0 -1756px;} &.sr, &.sr-Cyrl-RS, &.sr-Latn-RS {background-position: -16px -1756px;} &.sk, &.sk-SK {background-position: -32px -1756px;} + &.kk, &.kk-KZ {background-position: 0 -1768px;} } .button-normal-icon(btn-ic-zoomtowidth, 55, @toolbar-icon-size); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index c04c20e1c..ba215c995 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1741,6 +1741,7 @@ define([ toolbar.lockToolbar(SSE.enumLock.cantHyperlink, (selectionType == Asc.c_oAscSelectionType.RangeShapeText) && (this.api.asc_canAddShapeHyperlink()===false), { array: [toolbar.btnInsertHyperlink]}); + /* need_disable = selectionType != Asc.c_oAscSelectionType.RangeCells && selectionType != Asc.c_oAscSelectionType.RangeCol && selectionType != Asc.c_oAscSelectionType.RangeRow && selectionType != Asc.c_oAscSelectionType.RangeMax; if (this._state.sparklines_disabled !== need_disable) { @@ -1750,6 +1751,7 @@ define([ this._state.sparklines_disabled = need_disable; } } + */ if (editOptionsDisabled) return;