github
/
halo-theme-hao
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52 from liuzhihang/dev 

Dev
This commit is contained in:
liuzhihang 2023-01-04 22:58:47 +08:00 committed by GitHub
parent 3deca69f2a 50f3381e51
commit 937de21cbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 64 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "halo-theme-hao", "name": "halo-theme-hao",
"version": "1.0.4", "version": "1.0.5",
"dependencies": { "dependencies": {
} }
} }

2
settings.yaml
View File

@ -124,7 +124,7 @@ spec:
- $formkit: group - $formkit: group
if: "$get(todayRecommend).value" if: "$get(todayRecommend).value"
name: todayRecommendContent name: todayRecommendContent
label: 公众号 label: 今日推荐
value: value:
todayRecommendUrl: todayRecommendUrl:
todayRecommendTitle: todayRecommendTitle:

40
templates/links.html
View File

@ -1,46 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'links')" <html lang="en" th:replace="modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'links')"
xmlns:th="http://www.thymeleaf.org"> xmlns:th="http://www.thymeleaf.org">
<style type="text/css">#loading-box .loading-bg {
display: flex;
width: 100%;
height: 100%;
position: fixed;
background: var(--heo-maskbgdeep);
z-index: 1999;
opacity: 1;
transition: 0.3s;
pointer-events: all;
backdrop-filter: saturate(180%) blur(20px);
-webkit-backdrop-filter: blur(20px);
}
#loading-box.loaded .loading-bg {
opacity: 0;
pointer-events: none;
}
#loading-box .loading-img {
width: 100px;
margin: auto;
animation-duration: 0.3s;
animation-name: loadingAction;
animation-iteration-count: infinite;
animation-direction: alternate;
}
@keyframes loadingAction {
from {
opacity: 1;
}
to {
opacity: 0.6;
}
}
</style>
<th:block th:fragment="content"> <th:block th:fragment="content">
<div class="page" id="body-wrap"> <div class="page" id="body-wrap">

2
templates/modules/layouts/layout.html
View File

@ -98,7 +98,7 @@
coverColor(); coverColor();
} }
if ([[${theme.config.other.loadingBox} and not ${#strings.isEmpty(theme.config.other.loadingBoxImg)}]]) { if ([[${theme.config.other.loadingBox}]]) {
// 移除加载动画 // 移除加载动画
removeLoading(); removeLoading();
} }

41
templates/modules/loading-box.html
View File

@ -5,6 +5,47 @@
<div id="loading-box" onclick="heo.hideLoading()" <div id="loading-box" onclick="heo.hideLoading()"
th:fragment="loading-box" th:fragment="loading-box"
th:if="${theme.config.other.loadingBox} and not ${#strings.isEmpty(theme.config.other.loadingBoxImg)}"> th:if="${theme.config.other.loadingBox} and not ${#strings.isEmpty(theme.config.other.loadingBoxImg)}">
<style type="text/css">
#loading-box .loading-bg {
display: flex;
width: 100%;
height: 100%;
position: fixed;
background: var(--heo-maskbgdeep);
z-index: 1999;
opacity: 1;
transition: 0.3s;
pointer-events: all;
backdrop-filter: saturate(180%) blur(20px);
-webkit-backdrop-filter: blur(20px);
}
#loading-box.loaded .loading-bg {
opacity: 0;
pointer-events: none;
}
#loading-box .loading-img {
width: 100px;
margin: auto;
animation-duration: 0.3s;
animation-name: loadingAction;
animation-iteration-count: infinite;
animation-direction: alternate;
}
@keyframes loadingAction {
from {
opacity: 1;
}
to {
opacity: 0.6;
}
}
</style>
<div class="loading-bg"> <div class="loading-bg">
<img class="loading-img" th:src="${theme.config.other.loadingBoxImg}"> <img class="loading-img" th:src="${theme.config.other.loadingBoxImg}">
</div> </div>

5
templates/modules/widgets/top-group.html
View File

@ -44,11 +44,10 @@
</div> </div>
</div> </div>
<!-- 今日推荐 --> <!-- 今日推荐 -->
<div class="todayCard" id="todayCard" <div class="todayCard" id="todayCard"
th:if="${theme.config.top.todayRecommendSwitch}" th:if="${theme.config.top.todayRecommend}"
th:onclick="'window.open('+ ${theme.config.top.todayRecommendContent.todayRecommendUrl} +')'"> th:attr="onclick='javascript:window.open(\''+ ${theme.config.top.todayRecommendContent.todayRecommendUrl} +'\')'">
<div class="todayCard-info"> <div class="todayCard-info">
<div class="todayCard-tips">今日推荐</div> <div class="todayCard-tips">今日推荐</div>
<div class="todayCard-title" th:text="${theme.config.top.todayRecommendContent.todayRecommendTitle}"></div> <div class="todayCard-title" th:text="${theme.config.top.todayRecommendContent.todayRecommendTitle}"></div>

17
templates/page.html
View File

@ -12,6 +12,23 @@
<main class="layout hide-aside" id="content-inner"> <main class="layout hide-aside" id="content-inner">
<div id="page"> <div id="page">
<div id="article-container line-numbers" th:utext="${singlePage.content.content}"></div> <div id="article-container line-numbers" th:utext="${singlePage.content.content}"></div>
<hr>
<!-- 评论模块 -->
<div id="post-comment"
th:if="${pluginFinder.available('PluginCommentWidget') and singlePage.spec.allowComment}">
<div class="comment-head">
<div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
<div class="comment-privacy"><a href="#">隐私政策</a></div>
<div class="comment-tips" id="comment-tips">
<span>你无需删除空行，直接评论以获取最佳展示效果</span>
</div>
</div>
<halo:comment group="content.halo.run" kind="SinglePage"
th:attr="name=${singlePage.metadata.name}"/>
</div>
</div> </div>
<!-- 侧栏 --> <!-- 侧栏 -->

2
theme.yaml
View File

@ -13,5 +13,5 @@ spec:
repo: 'https://github.com/liuzhihang/halo-theme-hao' repo: 'https://github.com/liuzhihang/halo-theme-hao'
settingName: "theme-hao-setting" settingName: "theme-hao-setting"
configMapName: "theme-hao-configMap" configMapName: "theme-hao-configMap"
version: 1.0.4 version: 1.0.5
require: 2.0.0 require: 2.0.0