From 6977ca9cbfd05d2b25fe96143c56da53ea7577d9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 23 Apr 2018 14:32:28 +0300 Subject: [PATCH 1/4] [Common] tooltip appeared under toolbar tabs --- apps/common/main/resources/less/toolbar.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 4d9c22a4d..ea398d339 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -242,13 +242,13 @@ position: absolute; bottom: 0; width: 100%; - z-index: 1041; + z-index: 101; } .toolbar { &.cover { ul { - z-index: 1042; + z-index: 102; } } } From d7f4d9047e2afb9ad7afd6e400229758cd5424f3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 23 Apr 2018 15:06:58 +0300 Subject: [PATCH 2/4] [PE] Fix Bug 37545 --- apps/presentationeditor/main/app/controller/Viewport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index 2eb345869..87aee107b 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -209,7 +209,7 @@ define([ var mnuitemHideRulers = new Common.UI.MenuItem({ caption: me.header.textHideLines, - checked: Common.localStorage.getBool("pe-hidden-rulers"), + checked: Common.localStorage.getBool("pe-hidden-rulers", true), checkable: true, value: 'rulers' }); From 6565b7b7e989b9b2621bb7e6ab2d1bbbb7fe17b8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 23 Apr 2018 15:21:52 +0300 Subject: [PATCH 3/4] [PE] Fix Bug 37549 --- apps/presentationeditor/main/app/controller/Toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index ad53ac5bb..39a0e4602 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -890,7 +890,7 @@ define([ this.api.asc_Save(); } - toolbar.btnsSave.setDisabled(!toolbar.mode.forcesave); + toolbar.btnSave.setDisabled(!toolbar.mode.forcesave); Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.component.Analytics.trackEvent('Save'); From 15a7771a6fee0f3b2846fb6ec4c1c3cc5fa7e708 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 23 Apr 2018 15:29:41 +0300 Subject: [PATCH 4/4] [Common] correct index for SSE --- apps/common/main/resources/less/toolbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index ea398d339..6b4dfe3b3 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -242,7 +242,7 @@ position: absolute; bottom: 0; width: 100%; - z-index: 101; + z-index: 102; } .toolbar {