diff --git a/apps/common/locale.js b/apps/common/locale.js index e7ce8cd71..9cf5cbf96 100644 --- a/apps/common/locale.js +++ b/apps/common/locale.js @@ -121,7 +121,7 @@ Common.Locale = new(function() { /* use fetch polifill if native method isn't supported */ var polyfills = ['../vendor/fetch/fetch.umd']; if ( !window.Promise ) { - require(['../vendor/es6-promise/es6-promise.auto.min.js'], + require(['../vendor/es6-promise/es6-promise.auto.min'], function () { require(polyfills, _requireLang); }); diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index 8e30b2c8e..878fc7fa8 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -214,7 +214,7 @@ - + diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 675be6f5b..bde3c9680 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -171,7 +171,7 @@ -
+
- + diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 62f21f6b3..e6ee7b7e6 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -330,7 +330,7 @@ define([ Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); if (!this.editorConfig.customization || !(this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) - $('#editor_sdk').append('
'); + $('#editor_sdk').append('
'); Common.Controllers.Desktop.init(this.appOptions); }, diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 21189a452..7c9f49799 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -96,7 +96,6 @@ width: 100%; background: #fbfbfb; border: 1px solid #dfdfdf; - display: grid; -webkit-animation: flickerAnimation 2s infinite ease-in-out; -moz-animation: flickerAnimation 2s infinite ease-in-out; @@ -105,15 +104,19 @@ } .loadmask > .placeholder .slide-container > .line { - height: 30%; - margin: auto 120px; + height: 20%; + margin: 0 120px; border-radius: 6px; background: #f5f5f5; } + .loadmask > .placeholder .slide-container > .line.empty { + background: transparent; + } + .loadmask > .placeholder .slide-container > .line:nth-child(1) { - height: 40%; - margin: auto 80px; + height: 30%; + margin: 120px 80px 0; } @keyframes flickerAnimation { @@ -192,7 +195,7 @@ -
+
- + diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index 12a41bcb5..21bbdf094 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -188,7 +188,7 @@ -
+