diff --git a/apps/common/main/resources/img/controls/toolbar-menu-ru.png b/apps/common/main/resources/img/controls/toolbar-menu-ru.png new file mode 100644 index 000000000..a098b6666 Binary files /dev/null and b/apps/common/main/resources/img/controls/toolbar-menu-ru.png differ diff --git a/apps/common/main/resources/img/controls/toolbar-menu-ru@2x.png b/apps/common/main/resources/img/controls/toolbar-menu-ru@2x.png new file mode 100644 index 000000000..5a28943e8 Binary files /dev/null and b/apps/common/main/resources/img/controls/toolbar-menu-ru@2x.png differ diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png index 38de26838..16aaf8a45 100644 Binary files a/apps/common/main/resources/img/controls/toolbarbig.png and b/apps/common/main/resources/img/controls/toolbarbig.png differ diff --git a/apps/common/main/resources/img/controls/toolbarbig@2x.png b/apps/common/main/resources/img/controls/toolbarbig@2x.png index 4d2d6765e..f68309906 100644 Binary files a/apps/common/main/resources/img/controls/toolbarbig@2x.png and b/apps/common/main/resources/img/controls/toolbarbig@2x.png differ diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 5f9ac5689..1d6cc32fc 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -531,6 +531,31 @@ .button-normal-icon(btn-more, 74, @toolbar-big-icon-size); .button-normal-icon(btn-pagenum, 75, @toolbar-big-icon-size); +[applang=ru] { + .btn-toolbar { + &:not(.x-huge) { + .icon:not(svg) { + &.btn-bold, &.btn-italic, &.btn-strikeout, &.btn-underline, &.btn-ic-docspell, &.btn-sort-down, &.btn-sort-up, &.btn-currency-style { + .background-ximage('@{common-image-path}/controls/toolbar-menu-ru.png', '@{common-image-path}/controls/toolbar-menu-ru@2x.png', 60px); + } + } + } + } + + .button-normal-icon(btn-notes, 77, @toolbar-big-icon-size); + .button-normal-icon(btn-controls, 78, @toolbar-big-icon-size); + + .button-normal-icon(btn-bold, 0, @toolbar-icon-size); + .button-normal-icon(btn-italic, 1, @toolbar-icon-size); + .button-normal-icon(btn-strikeout, 2, @toolbar-icon-size); + .button-normal-icon(btn-underline, 3, @toolbar-icon-size); + .button-normal-icon(btn-ic-docspell, 4, @toolbar-icon-size); + .button-normal-icon(btn-sort-down, 5, @toolbar-icon-size); + .button-normal-icon(btn-sort-up, 6, @toolbar-icon-size); + .button-normal-icon(btn-currency-style, 7, @toolbar-icon-size); +} + + .item-shape { .icon { width: 20px; diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index 17a0fd5d9..eef6af3e7 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -154,6 +154,8 @@ define([ var $filemenu = $('.toolbar-fullview-panel'); $filemenu.css('top', _intvars.get('toolbar-height-tabs')); + me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]); + if ( !config.isEdit || ( !Common.localStorage.itemExists("de-compact-toolbar") && config.customization && config.customization.compactToolbar )) { diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index 0891b2991..36aa2aab6 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -158,6 +158,8 @@ define([ var $filemenu = $('.toolbar-fullview-panel'); $filemenu.css('top', _intvars.get('toolbar-height-tabs')); + me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]); + if ( !config.isEdit || ( !Common.localStorage.itemExists("pe-compact-toolbar") && config.customization && config.customization.compactToolbar )) diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index 01d76b624..191521268 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -138,6 +138,8 @@ define([ var $filemenu = $('.toolbar-fullview-panel'); $filemenu.css('top', _intvars.get('toolbar-height-tabs')); + me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]); + if ( !config.isEdit || ( !Common.localStorage.itemExists("sse-compact-toolbar") && config.customization && config.customization.compactToolbar ))