kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Load custom.css after the modules. Fix: #284

Browse Source
This commit is contained in:
Michael Teeuw 2016-05-03 16:42:09 +02:00
parent 37f8c0783d
commit 14d3bb273c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -6,8 +6,8 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<link rel="icon" href="data:;base64,iVBORw0KGgo="> <link rel="icon" href="data:;base64,iVBORw0KGgo=">
<link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/main.css">
<link rel="stylesheet" type="text/css" href="css/custom.css">
<link rel="stylesheet" type="text/css" href="fonts/roboto.css"> <link rel="stylesheet" type="text/css" href="fonts/roboto.css">
<!-- custom.css is loaded by the loader.js to make sure it's loaded after the module css files. -->
</head> </head>
<body> <body>
<div class="region fullscreen below"><div class="container"></div></div> <div class="region fullscreen below"><div class="container"></div></div>

10
js/loader.js
View File

@ -34,7 +34,15 @@ var Loader = (function() {
loadNextModule(); loadNextModule();
}); });
} else { } else {
startModules(); // All modules loaded. Load custom.css
// This is done after all the moduels so we can
// overwrite all the defined styls.
loadFile('css/custom.css', function() {
// custom.css loaded. Start all modules.
startModules();
});
} }
}; };