diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts index 17aecb68d32f..286c3f743c78 100644 --- a/public/app/core/components/grafana_app.ts +++ b/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); diff --git a/public/views/index.template.html b/public/views/index.template.html index f4c5d183fc80..0a6af5992802 100644 --- a/public/views/index.template.html +++ b/public/views/index.template.html @@ -11,8 +11,6 @@ - - @@ -22,9 +20,148 @@ - - + + + + +
+
+
+ +
+
+
Loading Grafana
+
+ +
@@ -91,6 +228,14 @@ settings: [[.Settings]], navTree: [[.NavTree]] }; + + // load css async + var myCSS = document.createElement("link"); + myCSS.rel = "stylesheet"; + myCSS.href = "public/build/grafana.[[ .Theme ]].css?v[[ .BuildVersion ]]+[[ .BuildCommit ]]"; + + // insert it at the end of the head in a legacy-friendly manner + document.head.insertBefore(myCSS, document.head.childNodes[document.head.childNodes.length - 1].nextSibling); [[if .GoogleTagManagerId]]