Skip to content

Commit 12aa5f7

Browse files
NinjaCheetahNinjaCheetah
committed
Themes now load much sooner, as they only wait on HTML parsing and not content loading
1 parent a1df22b commit 12aa5f7

6 files changed

Lines changed: 19 additions & 13 deletions

File tree

‎_layouts/main-pc.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@
2121
</style>
2222
<head>
2323
<meta charset="UTF-8" />
24-
<link id="pagestyle" rel="stylesheet" href="https://unpkg.com/xp.css"/>
24+
<link id="site-theme" rel="stylesheet" href="/assets/css/theme/XP.css"/>
2525
<!-- <link rel="stylesheet" href="https://unpkg.com/@sakun/system.css" />-->
2626
<link rel="stylesheet" href="/assets/css/index.css"/>
2727
<title>{{ page.title }} | {{ site.title }}</title>
2828
<script src="/assets/js/main.js"></script>
29-
<link rel="stylesheet" id="switcher-id" href=""/>
3029
</head>
3130
<body class="container">
3231
<div class="title">

‎_layouts/main.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@
2121
</style>
2222
<head>
2323
<meta charset="UTF-8" />
24-
<link id="pagestyle" rel="stylesheet" href="https://unpkg.com/xp.css"/>
24+
<link id="site-theme" rel="stylesheet" href="/assets/css/theme/XP.css"/>
2525
<!-- <link rel="stylesheet" href="https://unpkg.com/@sakun/system.css" />-->
2626
<link rel="stylesheet" href="/assets/css/index.css"/>
2727
<title>{{ page.title }} | {{ site.title }}</title>
2828
<script src="/assets/js/main.js"></script>
29-
<link rel="stylesheet" id="switcher-id" href=""/>
3029
</head>
3130
<body class="container">
3231
<div class="title">

‎assets/css/theme/7.css‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/theme/98.css‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/theme/XP.css‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/main.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
window.addEventListener('load', initialize, false);
2-
window.addEventListener('load', loadTheme, false);
1+
window.addEventListener('DOMContentLoaded', initialize, false);
2+
window.addEventListener('DOMContentLoaded', loadTheme, false);
33

44
function swapStyleSheet(sheet) {
5-
document.getElementById("pagestyle").setAttribute("href", sheet);
5+
document.getElementById("site-theme").setAttribute("href", sheet);
66
}
77

88
function initialize() {
@@ -11,15 +11,15 @@ function initialize() {
1111
let sevenStyle = document.getElementById("7-style");
1212

1313
XPStyle.onclick = function () {
14-
swapStyleSheet("https://unpkg.com/xp.css");
14+
swapStyleSheet("/assets/css/theme/XP.css");
1515
localStorage.setItem("theme", "XP");
1616
}
1717
ninetyEightStyle.onclick = function () {
18-
swapStyleSheet("https://unpkg.com/xp.css@0.2.3/dist/98.css");
18+
swapStyleSheet("/assets/css/theme/98.css");
1919
localStorage.setItem("theme", "98");
2020
}
2121
sevenStyle.onclick = function () {
22-
swapStyleSheet("https://unpkg.com/7.css")
22+
swapStyleSheet("/assets/css/theme/7.css")
2323
localStorage.setItem("theme", "7");
2424
}
2525
}
@@ -30,15 +30,15 @@ function loadTheme() {
3030

3131
switch (currentTheme) {
3232
case "XP":
33-
swapStyleSheet("https://unpkg.com/xp.css");
33+
swapStyleSheet("/assets/css/theme/XP.css");
3434
themeSelect.value = "0";
3535
break
3636
case "98":
37-
swapStyleSheet("https://unpkg.com/98.css");
37+
swapStyleSheet("/assets/css/theme/98.css");
3838
themeSelect.value = "1";
3939
break
4040
case "7":
41-
swapStyleSheet("https://unpkg.com/7.css");
41+
swapStyleSheet("/assets/css/theme/7.css");
4242
themeSelect.value = "2";
4343
break
4444
}

0 commit comments

Comments
 (0)