diff --git a/framework/core/ember/app/app.js b/framework/core/ember/app/app.js index a1a2d02fb..a4a0917c5 100644 --- a/framework/core/ember/app/app.js +++ b/framework/core/ember/app/app.js @@ -13,4 +13,6 @@ var App = Ember.Application.extend({ loadInitializers(App, config.modulePrefix); -export default App; \ No newline at end of file +Ember.$('#assets-loading').remove(); + +export default App; diff --git a/framework/core/ember/app/styles/flarum/layout.less b/framework/core/ember/app/styles/flarum/layout.less index 349c1f4f3..acc6d2649 100644 --- a/framework/core/ember/app/styles/flarum/layout.less +++ b/framework/core/ember/app/styles/flarum/layout.less @@ -10,6 +10,11 @@ body { overflow-x: hidden; min-height: 100vh; } +#assets-loading { + color: @fl-body-muted-color; + font-size: 16px; + padding: 20px; +} // ------------------------------------ // Page Toolbar diff --git a/framework/core/views/ember.blade.php b/framework/core/views/ember.blade.php index f59b5e2d5..c5a658f00 100644 --- a/framework/core/views/ember.blade.php +++ b/framework/core/views/ember.blade.php @@ -11,7 +11,18 @@ {!! $styles !!}
+