Merge pull request #249 from LIlGG/next

merge next
LIlGG · Apr 5, 2022 · 2ea256e · 2ea256e
2 parents 917a781 + ed7db4b
commit 2ea256e
Show file tree

Hide file tree

Showing 23 changed files with 13,147 additions and 2,974 deletions.
diff --git 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[email protected]", theme_base)/>
+<#global res_base_url = settings.cdn?then(settings.cdn_href + theme.version, theme_base)/>
 <html lang="zh-CN">
 <head>
     <meta charset="UTF-8">
@@ -43,8 +43,8 @@
     }
 </script>
 <script src="${res_base_url!}/source/js/404.js" type="text/javascript"></script>
-<script type='text/javascript' src='${res_base_url!}/script/utils.min.js?ver=1.3.3'></script>
-<script type='text/javascript' src='${res_base_url!}/script/i18n.min.js?ver=1.3.3'></script>
+<script type='text/javascript' src='${res_base_url!}/script/utils.min.js?ver=${theme.version!}'></script>
+<script type='text/javascript' src='${res_base_url!}/script/i18n.min.js?ver=${theme.version!}'></script>
 <script>
 var Poi = {
     "themeBase": "${res_base_url!}",

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 <p align="center">
   <a href="https://github.com/halo-dev/halo"><img alt="Halo version" src="https://img.shields.io/badge/halo-1.4.3%2B-brightgreen?style=for-the-badge" /></a>
   <a href="https://github.com/LIlGG/halo-theme-sakura"><img alt="Build Status" src="https://img.shields.io/badge/build-positive-brightgreen?style=for-the-badge"></a>
-  <a href="https://github.com/prettier/prettier"><img alt="Code Style: Prettier" src="https://img.shields.io/badge/release-1.3.3-blue?style=for-the-badge"></a>
+  <a href="https://github.com/prettier/prettier"><img alt="Code Style: Prettier" src="https://img.shields.io/badge/release-1.3.4-blue?style=for-the-badge"></a>
   <a href="./LICENSE"><img alt="LICENSE MIT" src="https://img.shields.io/badge/license-MIT-blue.svg?style=for-the-badge"></a>
 </p>
 <p align="center">

diff --git a/categories.ftl b/categories.ftl
@@ -69,9 +69,9 @@
     </div>
 </div>
 <#if settings.category_radar!true>
-<style type="text/css">
+<style>
     .tag-contents {
-        margin-top: 14px;
+        margin: 14px 0;
     }
     #category-echarts {
         width: 100%;

diff --git a/footer.ftl b/footer.ftl
@@ -1,15 +1,3 @@
-<#--
-/**
- * The template for displaying the footer.
- *
- * Contains the closing of the #content div and all content after.
- *
- * @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
- *
- * @package Akina
- */
--->
-<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/[email protected]", theme_base)/>
 <#macro footer>
 </div><!-- #content -->
 <#include "comments.ftl">
@@ -219,7 +207,6 @@
 		"photosGutter": ${(settings.photos_gutter)!10},
 		"tocDepth": ${(settings.toc_depth)!0},
 		"i18n": "${settings.i18n!'auto'}",
-		"mathjax": "${(settings.mathjax!false)?string('true','')}",
 		"coverNum": "${(settings.rimage_cover_back_num)!'0'}",
 		"rimageUrl": "${(settings.rimage_url)!''}",
 		"coverOpen": "${(settings.rimage_cover_back_open!false)?string('true','')}",
@@ -257,7 +244,7 @@
 	};
 	/* ]]> */
 </script>
-<script type='text/javascript' src='${res_base_url!}/script/utils.min.js?ver=1.3.3'></script>
+<script type='text/javascript' src='${res_base_url!}/script/utils.min.js?ver=${theme.version!}'></script>
 <script type="text/javascript" src="${res_base_url!}/source/lib/lazysizes/lazysizes.min.js" async></script>
 <script type="text/javascript" src="${res_base_url!}/source/js/lib.js"></script>
 <!-- 相册 -->
@@ -281,7 +268,7 @@
 <#if settings.post_toc!true>
 	<script src="${res_base_url!}/source/lib/tocbot/dist/tocbot.min.js" defer></script>
 </#if>
-<script src="${settings.comment_mode!'//cdn.jsdelivr.net/gh/LIlGG/halo-comment[email protected]/dist/halo-comment.min.js'}" defer></script>
+<script src="${settings.comment_mode!'${res_base_url!}/source/js/comment/sakura-comment.min.js?ver=${theme.version!}'}" defer></script>
 <#if settings.tag_cloud!true>
 <script src="${res_base_url!}/source/lib/jqcloud2/jqcloud.min.js" defer></script>
 <script type='text/javascript'>
@@ -295,7 +282,7 @@
 </script>
 </#if>
 <#if settings.category_radar!true>
-<script src="${res_base_url!}/source/js/echarts/echarts.min.js" defer></script>
+<script src="${res_base_url!}/source/js/echarts/echarts.min.js" async defer></script>
 <script type='text/javascript'>
 	var categoryRadar = {
 		<@categoryTag method="list">
@@ -308,8 +295,8 @@
 </#if>
 <script type='text/javascript' src='${res_base_url!}/source/js/qrcode.min.js' defer></script>
 <script type='text/javascript' src='${res_base_url!}/source/lib/flv.min/index.js' defer></script>
-<script type='text/javascript' src='${res_base_url!}/script/i18n.min.js?ver=1.3.3' defer></script>
-<script type='text/javascript' src='${theme_base!}/script/app.min.js?ver=1.3.3'></script>
+<script type='text/javascript' src='${res_base_url!}/script/i18n.min.js?ver=${theme.version!}' defer></script>
+<script type='text/javascript' src='${theme_base!}/script/app.min.js?ver=${theme.version!}'></script>
 <#nested />
 <#if settings.live2d_switch!true>
 <script src="${res_base_url!}/source/lib/jquery-ui/jquery-ui.min.js" async defer></script>

diff --git 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[email protected]", theme_base)/>
+<#global res_base_url = settings.cdn?then(settings.cdn_href + theme.version, theme_base)/>
 <#macro header title>
 <!DOCTYPE html>
 <html lang="zh-CN">
@@ -11,10 +11,9 @@
 	<title itemprop="name">${title!}</title>
 	<meta name="description" content="${meta_description!}"/>
 	<meta name="keywords" content="${meta_keywords!}"/>
-  	<link rel="dns-prefetch" href="//cdn.jsdelivr.net">
 
 	<@global.head />
-	<link rel='stylesheet' href='${theme_base!}/styles/style.min.css?ver=1.3.3' type='text/css' media='all'>
+	<link rel='stylesheet' href='${theme_base!}/styles/style.min.css?ver=${theme.version!}' type='text/css' media='all'>
 	<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noto+SerifMerriweather|Merriweather+Sans|Source+Code+Pro|Ubuntu:400,700|Noto+Serif+SC&display=swap" media="noexist" onload="this.media='all'">
 	<link rel="stylesheet" href="//at.alicdn.com/t/font_2010950_sh9o0r7ahar.css" media="noexist" onload="this.media='all'">
 	<link rel="stylesheet" href="${res_base_url!}/source/css/lib.css" media="noexist" onload="this.media='all'">
@@ -28,6 +27,9 @@
 	<#if settings.photos_style == "justify">
 	<link rel="stylesheet" href="${res_base_url!}/source/lib/justifiedGallery/justifiedGallery.min.css" media="noexist" onload="this.media='all'">
 	</#if>
+	<#if settings.katex!false && (is_post?? || is_sheet??)>
+		<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/katex.min.css" media="noexist" onload="this.media='all'"/>
+	</#if>
 	<#include "inc/decorate.ftl">
 	<script type="text/javascript">
 		if (!!window.ActiveXObject || "ActiveXObject" in window) {

diff --git a/index.ftl b/index.ftl
@@ -1,8 +1,6 @@
 <#--
 	@package Akina
 -->
-<#global res_base_url = settings.cdn?then("//cdn.jsdelivr.net/gh/LIlGG/[email protected]", theme_base)/>
-
 <#include "header.ftl">
 <@header title="${blog_title!}">
 	<div class="blank"></div>

diff --git a/layouts/imgbox.ftl b/layouts/imgbox.ftl
@@ -24,7 +24,7 @@
 		</#if>
 		<div class="header-info no-select
 			<#if user.description?default("")?trim?length gt 1>
-			 info-desc"><p><i class="fa fa-quote-left"></i>${user.description}<i class="fa fa-quote-right"></i></p>
+			 info-desc"><p><i class="fa fa-quote-left"></i><span class="desc">${user.description}</span><i class="fa fa-quote-right"></i></p>
 			<#else>
 			">
 			</#if>

diff --git a/layouts/sharelike.ftl b/layouts/sharelike.ftl
@@ -1,15 +1,18 @@
 <#--
-	分享/点赞页 
+	分享/点赞页
 	实际上我感觉原版的分享风格更好看，因此保留原版的
 	简单起见，这里暂时不封装
 -->
 <style>
+.s-wechat {
+    position: relative;
+}
+
 .s-wechat .wechat-qrcode {
 	display: none;
 	border: 1px solid #eee;
 	position: absolute;
-	z-index: 999;
-	top: -205px;
+	top: -215px;
 	left: -84px;
 	width: 200px;
 	height: 192px;
@@ -86,7 +89,7 @@
 	<ul class="social-share sharehidden">
 		<li>
 			<a href="http://service.weibo.com/share/share.php?url=${post.fullPath!}&appkey=&title=${post.title!}|${user.nickname!}&pic=${post.thumbnail!}" onclick="window.open(this.href, 'weibo-share', 'width=490,height=700');return false;" class="s-weibo i18n" data-iname="share.weibo" data-iattr="title">
-				<img src="${res_base_url!}/source/images/sns/weibo.png"/> 
+				<img src="${res_base_url!}/source/images/sns/weibo.png"/>
 			</a>
 		</li>
 		<li>
@@ -125,4 +128,4 @@
 	</ul>
 	<i class="iconfont show-share icon-forward"></i>
 </div>
-</#if>
+</#if>
diff --git 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/[email protected]", theme_base)/>
+<#global res_base_url = settings.cdn?then(settings.cdn_href + theme.version, theme_base)/>
 <div style="background: white;
       width: 95%;
       max-width: 800px;