From 8374720788db4dd360a6bf662262b8416dac437e Mon Sep 17 00:00:00 2001
From: LIlGG <1103069291@qq.com>
Date: Mon, 4 Apr 2022 19:05:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(cdn):=20=E6=96=B0=E5=A2=9E=E5=85=AC?=
=?UTF-8?q?=E5=85=B1=E5=85=8D=E8=B4=B9=20cdn=20=E5=9C=B0=E5=9D=80=EF=BC=8C?=
=?UTF-8?q?=E4=BD=BF=E7=94=A8=20cloudflare=E3=80=82=E6=9C=9B=E5=96=84?=
=?UTF-8?q?=E5=BE=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
404.ftl | 6 +++---
footer.ftl | 18 +++---------------
header.ftl | 5 ++---
index.ftl | 2 --
mail_template/mail_reply.ftl | 3 +--
settings.yaml | 14 ++++++++++++--
6 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/404.ftl b/404.ftl
index 2c525a2..58bbd05 100644
--- a/404.ftl
+++ b/404.ftl
@@ -1,7 +1,7 @@
<#--
@package Akina
-->
-<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@1.3.3", theme_base)/>
+<#global res_base_url = settings.cdn?then(settings.cdn_href + theme.version, theme_base)/>
@@ -43,8 +43,8 @@
}
-
-
+
+
-
+
@@ -307,8 +295,8 @@
-
-
+
+
<#nested />
<#if settings.live2d_switch!true>
diff --git a/header.ftl b/header.ftl
index 1879aaa..4152df6 100644
--- a/header.ftl
+++ b/header.ftl
@@ -1,7 +1,7 @@
<#--
@package Akina
-->
-<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@1.3.3", theme_base)/>
+<#global res_base_url = settings.cdn?then(settings.cdn_href + theme.version, theme_base)/>
<#macro header title>
@@ -11,10 +11,9 @@
${title!}
-
<@global.head />
-
+
diff --git a/index.ftl b/index.ftl
index 4082393..7a49801 100644
--- a/index.ftl
+++ b/index.ftl
@@ -1,8 +1,6 @@
<#--
@package Akina
-->
-<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@1.3.3", theme_base)/>
-
<#include "header.ftl">
<@header title="${blog_title!}">
diff --git a/mail_template/mail_reply.ftl b/mail_template/mail_reply.ftl
index f382144..85007a5 100644
--- a/mail_template/mail_reply.ftl
+++ b/mail_template/mail_reply.ftl
@@ -1,5 +1,4 @@
-
-<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/halo-theme-sakura@1.3.3", theme_base)/>
+<#global res_base_url = settings.cdn?then(settings.cdn_href + theme.version, theme_base)/>