pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 09:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2596 from ONLYOFFICE/fix/bugfix

Browse Source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova
2023-09-25 16:40:29 +03:00
committed by GitHub
parent ae09187e6e dad97e579a
commit 04c43e6cbf
5 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/main/lib/view/ExternalOleEditor.js
View File

@ -51,7 +51,7 @@ define([
sdkplaceholder: 'id-ole-editor-placeholder',
initwidth: 900,
initheight: 700,
minwidth: 860,
minwidth: 875,
minheight: 275
}, options);

3
apps/common/main/resources/less/toolbar.less
View File

@ -335,6 +335,9 @@
&.small {
.padding-left-10();
&.padding-right-10 {
.padding-right-10();
}
+ .separator:not(.invisible) {
.margin-left-10();

1
apps/documenteditor/main/app/controller/DocumentHolder.js
View File

@ -2574,6 +2574,7 @@ define([
if (!Common.Utils.InternalSettings.get("de-hidden-rulers")) {
showPoint = [showPoint[0] - 19, showPoint[1] - 26];
}
(showPoint[0]<0) && (showPoint[0] = 0);
if (showPoint[1]<0) {
showPoint[1] = bounds[3] + 10;
!Common.Utils.InternalSettings.get("de-hidden-rulers") && (showPoint[1] -= 26);

1
apps/presentationeditor/main/app/controller/DocumentHolder.js
View File

@ -2601,6 +2601,7 @@ define([
}
var showPoint = [(bounds[0] + bounds[2])/2 - eqContainer.outerWidth()/2, bounds[1] - eqContainer.outerHeight() - 10];
(showPoint[0]<0) && (showPoint[0] = 0);
if (showPoint[1]<0) {
showPoint[1] = bounds[3] + 10;
}

1
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View File

@ -4919,6 +4919,7 @@ define([
me.onDocumentResize();
var showPoint = [(bounds[0] + bounds[2])/2 - eqContainer.outerWidth()/2, bounds[1] - eqContainer.outerHeight() - 10];
(showPoint[0]<0) && (showPoint[0] = 0);
if (showPoint[1]<0) {
showPoint[1] = bounds[3] + 10;
}