From 50dec941497c39f775b2ec6dd330b0ccadd418e3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 18 Aug 2020 14:50:10 +0300 Subject: [PATCH] [DE] Shift text in menu items with icons ( + all context menu). --- apps/common/main/lib/component/ColorButton.js | 1 - apps/common/main/lib/component/Menu.js | 10 ++--- .../main/resources/less/dropdown-menu.less | 1 + .../main/app/view/DocumentHolder.js | 39 ++++++++++++++++--- apps/documenteditor/main/app/view/Links.js | 2 - apps/documenteditor/main/app/view/Toolbar.js | 29 +++++++------- .../main/app/view/WatermarkSettingsDialog.js | 1 - .../main/resources/less/toolbar.less | 2 +- 8 files changed, 53 insertions(+), 32 deletions(-) diff --git a/apps/common/main/lib/component/ColorButton.js b/apps/common/main/lib/component/ColorButton.js index 75a7205a4..15b02c0bb 100644 --- a/apps/common/main/lib/component/ColorButton.js +++ b/apps/common/main/lib/component/ColorButton.js @@ -108,7 +108,6 @@ define([ menu = new Common.UI.Menu({ id: id, cls: 'shifted-left', - custom: true, additionalAlign: options.additionalAlign, items: (options.additionalItems ? options.additionalItems : []).concat([ { template: _.template('
') }, diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js index e232b8bf8..e528612c6 100644 --- a/apps/common/main/lib/component/Menu.js +++ b/apps/common/main/lib/component/Menu.js @@ -150,12 +150,11 @@ define([ offset : [0, 0], cyclic : true, search : false, - scrollAlwaysVisible: true, - custom : false + scrollAlwaysVisible: true }, template: _.template([ - '' + '' ].join('')), initialize : function(options) { @@ -621,12 +620,11 @@ define([ offset : [0, 0], cyclic : true, search : false, - scrollAlwaysVisible: true, - custom : false + scrollAlwaysVisible: true }, template: _.template([ - '