IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'grafana-loading-page'

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-08-31 07:38:42 -07:00
parent d668a922e6 2996c54b72
commit eef41cbccd
2 changed files with 152 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/grafana_app.ts
View File

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

155
public/views/index.template.html
View File

File diff suppressed because one or more lines are too long