Browse Source

Merge branch 'grafana-loading-page'

Torkel Ödegaard 7 years ago
parent
commit
eef41cbccd
2 changed files with 53 additions and 4 deletions
  1. 2 0
      public/app/core/components/grafana_app.ts
  2. 51 4
      public/views/index.template.html

+ 2 - 0
public/app/core/components/grafana_app.ts

@@ -105,6 +105,8 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
       // see https://github.com/zenorocha/clipboard.js/issues/155
       $.fn.modal.Constructor.prototype.enforceFocus = function() {};
 
+      $('.preloader').remove();
+
       sidemenuOpen = scope.contextSrv.sidemenu;
       body.toggleClass('sidemenu-open', sidemenuOpen);
 

File diff suppressed because it is too large
+ 51 - 4
public/views/index.template.html


Some files were not shown because too many files changed in this diff