diff --git a/apps/common/main/lib/view/ExternalOleEditor.js b/apps/common/main/lib/view/ExternalOleEditor.js index 35f3a30e0c..b9aa1d707d 100644 --- a/apps/common/main/lib/view/ExternalOleEditor.js +++ b/apps/common/main/lib/view/ExternalOleEditor.js @@ -51,7 +51,7 @@ define([ sdkplaceholder: 'id-ole-editor-placeholder', initwidth: 900, initheight: 700, - minwidth: 860, + minwidth: 875, minheight: 275 }, options); diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 45fc95c695..62bedf0142 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -335,6 +335,9 @@ &.small { .padding-left-10(); + &.padding-right-10 { + .padding-right-10(); + } + .separator:not(.invisible) { .margin-left-10(); diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index ee5e5e2cba..53d335337e 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -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); diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index 8059447270..337ea5e75e 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -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; } diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 78e62847b9..7fd11603da 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -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; }