diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index c17bb472a..15cffe456 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -365,7 +365,7 @@ define([ if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs || (this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) { - $('#editor_sdk').append('
' + '
'.repeat(20) + '
'); + $('#editor-container').append('
' + '
'.repeat(20) + '
'); } Common.Controllers.Desktop.init(this.appOptions); diff --git a/apps/documenteditor/main/app/template/Viewport.template b/apps/documenteditor/main/app/template/Viewport.template index 40c1ea100..8d56d214c 100644 --- a/apps/documenteditor/main/app/template/Viewport.template +++ b/apps/documenteditor/main/app/template/Viewport.template @@ -9,7 +9,7 @@
-
+
diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index 4f7c8b1cc..b8a55eba2 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -150,12 +150,17 @@ .doc-placeholder { background: #fbfbfb; - width: 100%; max-width: 796px; margin: 40px auto; height: 100%; border: 1px solid #dfdfdf; padding-top: 50px; + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + z-index: 1; -webkit-animation: flickerAnimation 2s infinite ease-in-out; -moz-animation: flickerAnimation 2s infinite ease-in-out; diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less index 38e3d28a7..430037262 100644 --- a/apps/documenteditor/main/resources/less/layout.less +++ b/apps/documenteditor/main/resources/less/layout.less @@ -75,4 +75,9 @@ label { width: 300px; height: 100%; display: none; +} + +#editor_sdk { + width: 100%; + height: 100%; } \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 199a5a109..5864ff815 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -221,7 +221,7 @@ define([ me.api.asc_setLocale(me.editorConfig.lang); if (!me.editorConfig.customization || !(me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo)) - $('#editor_sdk').append('
'); + $('#editor-container').append('
'); // if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') // Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); diff --git a/apps/documenteditor/mobile/app/template/Editor.template b/apps/documenteditor/mobile/app/template/Editor.template index ba1d30dc5..5c1c00857 100644 --- a/apps/documenteditor/mobile/app/template/Editor.template +++ b/apps/documenteditor/mobile/app/template/Editor.template @@ -2,7 +2,7 @@
diff --git a/build/common.json b/build/common.json index d95ebafde..639be9511 100644 --- a/build/common.json +++ b/build/common.json @@ -1,7 +1,7 @@ { "name": "common", "version": "4.3.0", - "build": 37, + "build": 39, "homepage": "http://www.onlyoffice.com", "private": true, "sdk": { diff --git a/build/documenteditor.json b/build/documenteditor.json index 4576d80e6..98abaf31c 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -1,7 +1,7 @@ { "name": "documenteditor", "version": "4.3.0", - "build": 1146, + "build": 1148, "homepage": "http://www.onlyoffice.com", "private": true, "main": { diff --git a/build/presentationeditor.json b/build/presentationeditor.json index 64a0c8ce9..78f988361 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -1,7 +1,7 @@ { "name": "presentationeditor", "version": "4.3.0", - "build": 780, + "build": 782, "homepage": "http://www.onlyoffice.com", "private": true, "main": { diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 8dca7d52c..ecb9798a9 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -1,7 +1,7 @@ { "name": "spreadsheeteditor", "version": "4.3.0", - "build": 884, + "build": 886, "homepage": "http://www.onlyoffice.com", "private": true, "main": {