apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13872 from grafana/css-loading-sync

Browse Source 
Revert to sync loading of css, sometimes js loaded before css which c…
pull/13886/head
Torkel Ödegaard 7 years ago committed by GitHub
parent 2481d19dc8 2dde2c4f9b
commit befee108c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 27
      public/views/index.template.html

27
public/views/index.template.html
Unescape View File

@ -14,6 +14,9 @@
<link rel="icon" type="image/png" href="public/img/fav32.png"> <link rel="icon" type="image/png" href="public/img/fav32.png">
<link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28"> <link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28">
<link rel="apple-touch-icon" sizes="180x180" href="public/img/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="public/img/apple-touch-icon.png">
<link rel="stylesheet" href="public/build/grafana.[[ .Theme ]].css?v[[ .BuildVersion ]]+[[ .BuildCommit ]]">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="msapplication-TileColor" content="#2b5797"> <meta name="msapplication-TileColor" content="#2b5797">
@ -23,13 +26,6 @@
<body class="theme-[[ .Theme ]]"> <body class="theme-[[ .Theme ]]">
<style> <style>
body {
margin: 0;
height: 100%;
width: 100%;
position: absolute;
}
.preloader { .preloader {
height: 100%; height: 100%;
flex-direction: column; flex-direction: column;
@ -38,14 +34,6 @@
align-items: center; align-items: center;
} }
.theme-light .preloader {
background: linear-gradient(-60deg, #f7f8fa, #f5f6f9 70%, #f7f8fa 98%);
}
.theme-dark .preloader {
background: linear-gradient(180deg, #222426 10px, #161719 100px);
}
.preloader__enter { .preloader__enter {
opacity: 0; opacity: 0;
animation-name: preloader-fade-in; animation-name: preloader-fade-in;
@ -253,14 +241,7 @@
navTree: [[.NavTree]] navTree: [[.NavTree]]
}; };
// load css async // In case the js files fails to load the code below will show an info message.
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);
// switch loader to show all has loaded
window.onload = function() { window.onload = function() {
var preloader = document.getElementsByClassName("preloader"); var preloader = document.getElementsByClassName("preloader");
if (preloader.length) { if (preloader.length) {

Write Preview
Loading…
Cancel
Save