Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #99 from ONLYOFFICE/feature/bugfix5.1.3

Browse source 
Feature/bugfix5.1.3
This commit is contained in:
Alexey Golubev 2018-04-23 19:16:42 +03:00 committed by GitHub
parent 0755995c28 dd385f3595
commit 2281bc8b12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/resources/less/toolbar.less
View file

@ -242,13 +242,13 @@
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
z-index: 1041; z-index: 102;
} }
.toolbar { .toolbar {
&.cover { &.cover {
ul { ul {
z-index: 1042; z-index: 102;
} }
} }
} }

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -890,7 +890,7 @@ define([
this.api.asc_Save(); this.api.asc_Save();
} }
toolbar.btnsSave.setDisabled(!toolbar.mode.forcesave); toolbar.btnSave.setDisabled(!toolbar.mode.forcesave);
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('Save'); Common.component.Analytics.trackEvent('Save');

2
apps/presentationeditor/main/app/controller/Viewport.js
View file

@ -209,7 +209,7 @@ define([
var mnuitemHideRulers = new Common.UI.MenuItem({ var mnuitemHideRulers = new Common.UI.MenuItem({
caption: me.header.textHideLines, caption: me.header.textHideLines,
checked: Common.localStorage.getBool("pe-hidden-rulers"), checked: Common.localStorage.getBool("pe-hidden-rulers", true),
checkable: true, checkable: true,
value: 'rulers' value: 'rulers'
}); });