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

Merge pull request #203 from chengzhongxue/main 

页脚友链开关，tag样式修改，优化加载动画问题，评论样式
This commit is contained in:
小孙同学 2023-06-28 13:16:59 +08:00 committed by GitHub
parent 1b4366c216 e12e987295
commit 0bb58f9c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 1082 additions and 1035 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
settings.yaml
View File

@ -180,7 +180,7 @@ spec:
name: recommendPostCustom name: recommendPostCustom
label: 自定义文章 label: 自定义文章
help: "建议设置六篇文章" help: "建议设置六篇文章"
value: [ ] value: []
children: children:
- $formkit: url - $formkit: url
name: url name: url
@ -356,7 +356,7 @@ spec:
name: socialMedia name: socialMedia
label: 社交媒体 label: 社交媒体
help: 侧栏社交媒体建议只设置两个 help: 侧栏社交媒体建议只设置两个
value: [ ] value: []
children: children:
- $formkit: select - $formkit: select
name: icon name: icon
@ -470,7 +470,7 @@ spec:
- $formkit: repeater - $formkit: repeater
name: socialMediaLeft name: socialMediaLeft
label: 社交媒体（左） label: 社交媒体（左）
value: [ ] value: []
children: children:
- $formkit: select - $formkit: select
name: icon name: icon
@ -551,7 +551,7 @@ spec:
- $formkit: repeater - $formkit: repeater
name: socialMediaRight name: socialMediaRight
label: 社交媒体（右） label: 社交媒体（右）
value: [ ] value: []
children: children:
- $formkit: select - $formkit: select
name: icon name: icon
@ -632,6 +632,21 @@ spec:
- $formkit: menuRadio - $formkit: menuRadio
name: menu name: menu
label: 底部相关链接 label: 底部相关链接
- $formkit: radio
name: enable_footer_group
label: 启用页脚友链
value: true
options:
- label: 启用
value: true
- label: 禁用
value: false
- $formkit: url
name: fetchUrl
value: "`https://moments.0206.ink/randomfriend?num=3`"
label: 页脚友链地址
placeholder: 请输入页脚友链地址
help: 注意格式 (`友链地址`)
- group: post - group: post
label: 文章 label: 文章
@ -1262,12 +1277,7 @@ spec:
label: token地址 label: token地址
placeholder: 请输入token地址 placeholder: 请输入token地址
help: 注意格式 (`token地址`) help: 注意格式 (`token地址`)
- $formkit: url
name: fetchUrl
value: "`https://moments.0206.ink/randomfriend?num=3`"
label: 页脚友链地址
placeholder: 请输入页脚友链地址
help: 注意格式 (`友链地址`)
- group: comments - group: comments
label: 评论 label: 评论
formSchema: formSchema:

2
templates/archives.html
View File

@ -38,7 +38,7 @@
<div class="article-sort-item-tags"> <div class="article-sort-item-tags">
<a class="article-meta__tags" <a class="article-meta__tags"
th:each="tag : ${post.tags}" th:href="@{${tag.status.permalink}}"> th:each="tag : ${post.tags}" th:href="@{${tag.status.permalink}}">
<span class="tags-punctuation">#</span>[[${tag.spec.displayName}]] <span class="tags-punctuation">[[${tag.spec.displayName}]]</span>
</a> </a>
<span class="article-meta__link">•</span> <span class="article-meta__link">•</span>
</div> </div>

10
templates/assets/js/halo.js
View File

@ -1,11 +1,11 @@
let halo = { let halo = {
darkComment: () => { darkComment : ()=>{
if (document.querySelector('#comment div').shadowRoot.querySelector('.halo-comment-widget').classList != null) { if(document.querySelector('#comment div').shadowRoot.querySelector('.halo-comment-widget').classList != null){
let commentDOMclass = document.querySelector('#comment div').shadowRoot.querySelector('.halo-comment-widget').classList let commentDOMclass = document.querySelector('#comment div').shadowRoot.querySelector('.halo-comment-widget').classList
if (commentDOMclass.contains('light')) if(commentDOMclass.contains('light'))
commentDOMclass.replace('light', 'dark') commentDOMclass.replace('light','dark')
else else
commentDOMclass.replace('dark', 'light') commentDOMclass.replace('dark','light')
} }
} }

16
templates/assets/js/heo.js
View File

@ -31,9 +31,9 @@ var heo = {
// }, // },
// 首页bb // 首页bb
initIndexEssay: function () { initIndexEssay: function() {
if (document.querySelector("#bber-talk")) if (document.querySelector("#bber-talk"))
new Swiper(".swiper-container", { new Swiper(".swiper-container",{
direction: "vertical", direction: "vertical",
loop: !0, loop: !0,
autoplay: { autoplay: {
@ -67,7 +67,7 @@ var heo = {
//监测是否在页面开头 //监测是否在页面开头
addNavBackgroundInit: function () { addNavBackgroundInit: function() {
var e = 0 var e = 0
, t = 0; , t = 0;
document.body && (e = document.body.scrollTop), document.body && (e = document.body.scrollTop),
@ -221,8 +221,8 @@ var heo = {
}, },
// 刷新即刻短文瀑布流 // 刷新即刻短文瀑布流
reflashEssayWaterFall: function () { reflashEssayWaterFall: function() {
document.querySelector("#waterfall") && setTimeout((function () { document.querySelector("#waterfall") && setTimeout((function() {
waterfall("#waterfall"), waterfall("#waterfall"),
document.getElementById("waterfall").classList.add("show") document.getElementById("waterfall").classList.add("show")
} }
@ -290,10 +290,10 @@ var heo = {
}, },
//隐藏cookie窗口 //隐藏cookie窗口
hidecookie: function () { hidecookie: function() {
heo_cookiesTime = setTimeout((() => { heo_cookiesTime = setTimeout((()=>{
document.getElementById("cookies-window").classList.add("cw-hide"), document.getElementById("cookies-window").classList.add("cw-hide"),
setTimeout((() => { setTimeout((()=>{
$("#cookies-window").hide() $("#cookies-window").hide()
} }
), 1e3) ), 1e3)

15
templates/assets/js/main.js
View File

@ -372,7 +372,7 @@ document.addEventListener('DOMContentLoaded', function () {
$header.classList.add('nav-fixed') $header.classList.add('nav-fixed')
if ($cookies_window != null && $cookies_window != '') { if($cookies_window!=null && $cookies_window!=''){
$cookies_window.classList.add('cw-hide') $cookies_window.classList.add('cw-hide')
} }
if (window.getComputedStyle($rightside).getPropertyValue('opacity') === '0') { if (window.getComputedStyle($rightside).getPropertyValue('opacity') === '0') {
@ -391,7 +391,7 @@ document.addEventListener('DOMContentLoaded', function () {
}, 200)) }, 200))
// find the scroll direction // find the scroll direction
function scrollDirection(currentTop) { function scrollDirection (currentTop) {
const result = currentTop > initTop // true is down & false is up const result = currentTop > initTop // true is down & false is up
initTop = currentTop initTop = currentTop
return result return result
@ -516,18 +516,14 @@ document.addEventListener('DOMContentLoaded', function () {
if (isAnchor) updateAnchor(currentId) if (isAnchor) updateAnchor(currentId)
if (currentId === '') { if (currentId === '') {
$cardToc.querySelectorAll('.active').forEach(i => { $cardToc.querySelectorAll('.active').forEach(i => { i.classList.remove('active') })
i.classList.remove('active')
})
detectItem = currentIndex detectItem = currentIndex
return return
} }
detectItem = currentIndex detectItem = currentIndex
$cardToc.querySelectorAll('.active').forEach(item => { $cardToc.querySelectorAll('.active').forEach(item => { item.classList.remove('active') })
item.classList.remove('active')
})
const currentActive = $tocLink[currentIndex] const currentActive = $tocLink[currentIndex]
currentActive.classList.add('active') currentActive.classList.add('active')
@ -700,8 +696,7 @@ document.addEventListener('DOMContentLoaded', function () {
const addRuntime = () => { const addRuntime = () => {
const $runtimeCount = document.getElementById('runtimeshow'); const $runtimeCount = document.getElementById('runtimeshow');
if ($runtimeCount) { if ($runtimeCount) {
var s1 = $runtimeCount.innerText; var s1 = $runtimeCount.innerText;;//建站时间
;//建站时间
if (s1) { if (s1) {
s1 = new Date(s1.replace(/-/g, "/")); s1 = new Date(s1.replace(/-/g, "/"));
s2 = new Date(); s2 = new Date();

7
templates/assets/js/utils.js
View File

@ -1,6 +1,7 @@
var btf = { var btf = {
// 修改时间显示"最近" // 修改时间显示"最近"
diffDate: function (d, more = false) { diffDate: function (d, more = false) {
const dateNow = new Date(); const dateNow = new Date();
@ -53,7 +54,7 @@ var btf = {
if (i.parentNode.tagName !== "A") { if (i.parentNode.tagName !== "A") {
const dataSrc = i.dataset.lazySrc || i.src; const dataSrc = i.dataset.lazySrc || i.src;
const dataCaption = i.title || i.alt || ""; const dataCaption = i.title || i.alt || "";
anzhiyu.wrap(i, "a", { btf.wrap(i, "a", {
href: dataSrc, href: dataSrc,
"data-fancybox": "gallery", "data-fancybox": "gallery",
"data-caption": dataCaption, "data-caption": dataCaption,
@ -217,12 +218,12 @@ var btf = {
}, },
scrollToDest: (e, t) => { scrollToDest: (e,t)=>{
if (e < 0 || t < 0) if (e < 0 || t < 0)
return; return;
const n = window.scrollY || window.screenTop; const n = window.scrollY || window.screenTop;
if (e -= 70, if (e -= 70,
"CSS" in window && CSS.supports("scroll-behavior", "smooth")) "CSS"in window && CSS.supports("scroll-behavior", "smooth"))
return void window.scrollTo({ return void window.scrollTo({
top: e, top: e,
behavior: "smooth" behavior: "smooth"

7
templates/assets/zhheo/blogex copy.js
View File

@ -20,7 +20,7 @@ function coverColor() {
// 获取颜色 https://github.com/fast-average-color/fast-average-color // 获取颜色 https://github.com/fast-average-color/fast-average-color
const fac = new FastAverageColor(); const fac = new FastAverageColor();
fac.getColorAsync(path, { fac.getColorAsync(path,{
// 忽略白色 // 忽略白色
ignoredColor: [255, 255, 255, 255] ignoredColor: [255, 255, 255, 255]
}) })
@ -166,9 +166,9 @@ function getContrastYIQ(hexcolor) {
function navTitle() { function navTitle() {
var titlevalue = document.title; var titlevalue = document.title;
var postName = document.getElementsByClassName("post-title")[0]; var postName = document.getElementsByClassName("post-title")[0];
if (postName == null || postName == '') { if(postName==null || postName==''){
document.getElementById("page-name-text").innerHTML = titlevalue; document.getElementById("page-name-text").innerHTML = titlevalue;
} else { }else{
document.getElementById("page-name-text").innerHTML = postName?.innerText; document.getElementById("page-name-text").innerHTML = postName?.innerText;
} }
} }
@ -316,6 +316,7 @@ function AddRewardMask() {
} }
//监听蒙版关闭 //监听蒙版关闭
document.addEventListener('touchstart', e => { document.addEventListener('touchstart', e => {
RemoveRewardMask() RemoveRewardMask()

30
templates/assets/zhheo/blogex.js
View File

@ -20,7 +20,7 @@ function coverColor() {
// 获取颜色 https://github.com/fast-average-color/fast-average-color // 获取颜色 https://github.com/fast-average-color/fast-average-color
const fac = new FastAverageColor(); const fac = new FastAverageColor();
fac.getColorAsync(path, { fac.getColorAsync(path,{
// 忽略白色 // 忽略白色
ignoredColor: [255, 255, 255, 255] ignoredColor: [255, 255, 255, 255]
}) })
@ -166,9 +166,9 @@ function getContrastYIQ(hexcolor) {
function navTitle() { function navTitle() {
var titlevalue = document.title; var titlevalue = document.title;
var postName = document.getElementsByClassName("post-title")[0]; var postName = document.getElementsByClassName("post-title")[0];
if (postName == null || postName == '') { if(postName==null || postName==''){
document.getElementById("page-name-text").innerHTML = titlevalue; document.getElementById("page-name-text").innerHTML = titlevalue;
} else { }else{
document.getElementById("page-name-text").innerHTML = postName?.innerText; document.getElementById("page-name-text").innerHTML = postName?.innerText;
} }
} }
@ -316,6 +316,7 @@ function AddRewardMask() {
} }
//监听蒙版关闭 //监听蒙版关闭
document.addEventListener('touchstart', e => { document.addEventListener('touchstart', e => {
RemoveRewardMask() RemoveRewardMask()
@ -467,9 +468,9 @@ document.querySelector('#console').addEventListener('wheel', (e) => {
// }) // })
//自动调整即刻短文尺寸 //自动调整即刻短文尺寸
window.addEventListener("resize", (function () { window.addEventListener("resize", (function() {
document.querySelector("#waterfall") && heo.reflashEssayWaterFall() document.querySelector("#waterfall") && heo.reflashEssayWaterFall()
} }
)); ));
//首页大卡片恢复显示 //首页大卡片恢复显示
@ -562,11 +563,11 @@ function owoBig() {
// }, 200)); // }, 200));
// 页面百分比 // 页面百分比
function percent() { function percent() {
let e = document.documentElement.scrollTop || window.pageYOffset let e = document.documentElement.scrollTop || window.pageYOffset
, , t = Math.max(document.body.scrollHeight, document.documentElement.scrollHeight, document.body.offsetHeight, document.documentElement.offsetHeight, document.body.clientHeight, document.documentElement.clientHeight) - document.documentElement.clientHeight
t = Math.max(document.body.scrollHeight, document.documentElement.scrollHeight, document.body.offsetHeight, document.documentElement.offsetHeight, document.body.clientHeight, document.documentElement.clientHeight) - document.documentElement.clientHeight
, o = Math.round(e / t * 100) , o = Math.round(e / t * 100)
, n = document.querySelector("#percent"); , n = document.querySelector("#percent");
var a = window.scrollY + document.documentElement.clientHeight var a = window.scrollY + document.documentElement.clientHeight
@ -758,8 +759,17 @@ if (getCookie('browsertc') != 1) {
//注入函数 //注入函数
document.addEventListener('pjax:send', function () { document.addEventListener('pjax:send', function () {
//显示加载进度条
if(GLOBAL_CONFIG.loadProgressBar){
Pace.restart(); Pace.restart();
}
//显示加载动画
if(GLOBAL_CONFIG.loadingBox){
heo.showLoading(); heo.showLoading();
}
}) })
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {
@ -771,7 +781,10 @@ document.addEventListener('DOMContentLoaded', function () {
heo.sayhi() heo.sayhi()
heo.addTag() heo.addTag()
heo.stopImgRightDrag() heo.stopImgRightDrag()
//页脚友联
if(GLOBAL_CONFIG.isFriendLinksInFooter){
link.addFriendLinksInFooter() link.addFriendLinksInFooter()
}
heo.qrcodeCreate() heo.qrcodeCreate()
heo.onlyHome() heo.onlyHome()
@ -783,7 +796,10 @@ document.addEventListener('DOMContentLoaded', function () {
heo.darkModeStatus() heo.darkModeStatus()
// heo.categoriesBarActive() // heo.categoriesBarActive()
heo.initThemeColor() heo.initThemeColor()
//隐藏加载动画
if(GLOBAL_CONFIG.loadingBox){
heo.hideLoading() heo.hideLoading()
}
// heo.tagPageActive() // heo.tagPageActive()
}) })
window.onscroll = function () { window.onscroll = function () {

10
templates/assets/zhheo/custom.css
View File

@ -4,23 +4,23 @@
} */ } */
/* 代码块纯黑色背景 */ /* 代码块纯黑色背景 */
code[class*=" language-"], pre[class*=" language-"] { code[class*=" language-"], pre[class*=" language-"]{
background: #18171d; background: #18171d;
} }
/* banner 字体图标大小及位置 */ /* banner 字体图标大小及位置 */
i.iconfont.icon-arrow-right.banner-righticon { i.iconfont.icon-arrow-right.banner-righticon{
font-size: 66px; font-size: 66px;
} }
span.bannerText { span.bannerText{
display: block; display: block;
margin-top: 35px; margin-top: 35px;
} }
/* 自我介绍渐变色背景 */ /* 自我介绍渐变色背景 */
#aside-content > .card-widget.card-info::before { #aside-content > .card-widget.card-info::before {
background: linear-gradient(-25deg, #0084ff, #031764, #67044d); background: linear-gradient(-25deg, var(--heo-main), #031764, var(--heo-main), #67044d);
background-size: 400%; background-size: 400%;
position: absolute; position: absolute;
width: 100%; width: 100%;
@ -36,7 +36,7 @@ ul li {
font-size: 18px; font-size: 18px;
} }
#article-container ol li:not(.tab), #article-container ul li:not(.tab) { #article-container ol li:not(.tab), #article-container ul li:not(.tab){
/* margin-left: 2em; */ /* margin-left: 2em; */
} }

2
templates/assets/zhheo/custom.min.css vendored
View File

@ -1 +1 @@
code[class*=" language-"],pre[class*=" language-"]{background:#18171d}i.iconfont.icon-arrow-right.banner-righticon{font-size:66px}span.bannerText{display:block;margin-top:35px}#aside-content>.card-widget.card-info::before{background:linear-gradient(-25deg,#0084ff,#031764,#67044d);background-size:400%;position:absolute;width:100%;height:100%;left:0;top:0;content:'';animation:gradient 15s ease infinite}ul li{font-size:18px}#article-container pre>code{background:0 0!important} code[class*=" language-"],pre[class*=" language-"]{background:#18171d}i.iconfont.icon-arrow-right.banner-righticon{font-size:66px}span.bannerText{display:block;margin-top:35px}#aside-content>.card-widget.card-info::before{background:linear-gradient(-25deg,var(--heo-main),#031764,var(--heo-main),#67044d);background-size:400%;position:absolute;width:100%;height:100%;left:0;top:0;content:'';animation:gradient 15s ease infinite}ul li{font-size:18px}#article-container pre>code{background:0 0!important}

660
templates/assets/zhheo/zhheoblog.css
View File

File diff suppressed because it is too large Load Diff

2
templates/assets/zhheo/zhheoblog.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
templates/categories.html
View File

@ -19,8 +19,8 @@
th:each="categoryItem : ${categoryFinder.listAll()}" th:each="categoryItem : ${categoryFinder.listAll()}"
th:href="@{${categoryItem.status.permalink}}" th:href="@{${categoryItem.status.permalink}}"
th:id="${categoryItem.spec.displayName}"> th:id="${categoryItem.spec.displayName}">
<span class="tags-punctuation">#</span> <span style="font-size: 22px;" class="tags-punctuation">[[${categoryItem.spec.displayName}]]</span>
[[${categoryItem.spec.displayName}]]
<span class="tagsPageCount">[[${categoryItem.status.visiblePostCount}]]</span></a> <span class="tagsPageCount">[[${categoryItem.status.visiblePostCount}]]</span></a>
</div> </div>
</div> </div>

2
templates/category.html
View File

@ -54,7 +54,7 @@
<div class="article-sort-item-tags"> <div class="article-sort-item-tags">
<a class="article-meta__tags" <a class="article-meta__tags"
th:each="tag : ${post.tags}" th:href="@{${tag.status.permalink}}"> th:each="tag : ${post.tags}" th:href="@{${tag.status.permalink}}">
<span class="tags-punctuation">#</span>[[${tag.spec.displayName}]] <span class="tags-punctuation">[[${tag.spec.displayName}]]</span>
</a> </a>
<span class="article-meta__link">•</span> <span class="article-meta__link">•</span>
</div> </div>

15
templates/modules/head.html
View File

@ -39,8 +39,7 @@
/> />
<link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/6.2.0/css/all.min.css" media="all" <link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/6.2.0/css/all.min.css" media="all" onload="this.media='all'">
onload="this.media='all'">
<script> <script>
(win => { (win => {
@ -119,9 +118,9 @@
} else if (t === 'light') activateLightMode() } else if (t === 'light') activateLightMode()
else activateDarkMode() else activateDarkMode()
if ("[[${theme.config.style.colorScheme}]]" === 'dark') if("[[${theme.config.style.colorScheme}]]" === 'dark')
activateDarkMode() activateDarkMode()
if ("[[${theme.config.style.colorScheme}]]" === 'light') if("[[${theme.config.style.colorScheme}]]" === 'light')
activateLightMode() activateLightMode()
const asideStatus = saveToLocal.get('aside-status') const asideStatus = saveToLocal.get('aside-status')
@ -152,8 +151,7 @@
<!-- icon图标 --> <!-- icon图标 -->
<link rel="preload" as="style" onload="this.rel='stylesheet'" <link rel="preload" as="style" onload="this.rel='stylesheet'" th:href="@{/assets/icon/fontawesome/fontawesome.min.css}">
th:href="@{/assets/icon/fontawesome/fontawesome.min.css}">
<link rel="stylesheet" href="https://npm.elemecdn.com/anzhiyu-theme-static@1.1.0/icon/ali_iconfont_css.css"> <link rel="stylesheet" href="https://npm.elemecdn.com/anzhiyu-theme-static@1.1.0/icon/ali_iconfont_css.css">
<!-- 声明一些公共信息 --> <!-- 声明一些公共信息 -->
@ -171,6 +169,9 @@
copyright: undefined, copyright: undefined,
lightbox: 'fancybox', lightbox: 'fancybox',
lazyload: {enable: true, error: "/themes/theme-hao/assets/images/404s.gif"}, lazyload: {enable: true, error: "/themes/theme-hao/assets/images/404s.gif"},
isFriendLinksInFooter: [[${theme.config.footer.enable_footer_group}]],
loadingBox: [[${theme.config.other.loadingBox}]],
loadProgressBar: [[${theme.config.other.loadProgressBar}]],
date_suffix: { date_suffix: {
just: '刚刚', just: '刚刚',
min: '分钟前', min: '分钟前',
@ -234,9 +235,11 @@
})() })()
</script> </script>
</head> </head>
</html> </html>

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

@ -9,22 +9,22 @@
<body> <body>
<!-- loading 页面 --> <!-- loading 页面 -->
<div th:replace="~{modules/loading-box :: loading-box}"></div> <div th:replace="~{modules/loading-box :: loading-box}"></div>
<!-- 网站背景 --> <!-- 网站背景 -->
<div id="web_bg"></div> <div id="web_bg"></div>
<!-- 控制台 --> <!-- 控制台 -->
<div th:replace="~{modules/widgets/console :: console}"></div> <div th:replace="~{modules/widgets/console :: console}"></div>
<div th:replace="~{modules/sidebar :: sidebar}"></div> <div th:replace="~{modules/sidebar :: sidebar}"></div>
<!-- 内容 --> <!-- 内容 -->
<th:block th:replace="${content}"></th:block> <th:block th:replace="${content}"></th:block>
<!-- todo 暂时没显示，是右下角悬浮操作按钮 --> <!-- todo 暂时没显示，是右下角悬浮操作按钮 -->
<div id="rightside"> <div id="rightside">
<div id="rightside-config-hide"> <div id="rightside-config-hide">
<button id="translateLink" title="简繁转换" type="button">简</button> <button id="translateLink" title="简繁转换" type="button">简</button>
<button id="darkmode" title="浅色和深色模式转换" type="button"><i class="fas fa-adjust"></i></button> <button id="darkmode" title="浅色和深色模式转换" type="button"><i class="fas fa-adjust"></i></button>
@ -34,12 +34,12 @@
<button id="rightside_config" title="设置" type="button"><i class="fas fa-cog fa-spin"></i></button> <button id="rightside_config" title="设置" type="button"><i class="fas fa-cog fa-spin"></i></button>
<button id="go-up" title="回到顶部" type="button"><i class="fas fa-arrow-up"></i></button> <button id="go-up" title="回到顶部" type="button"><i class="fas fa-arrow-up"></i></button>
</div> </div>
</div> </div>
<div th:replace="~{modules/right-menu :: right-menu}"></div> <div th:replace="~{modules/right-menu :: right-menu}"></div>
<div> <div>
<script th:src="@{/assets/js/utils.js}"></script> <script th:src="@{/assets/js/utils.js}"></script>
<script th:src="@{/assets/js/main.js}"></script> <script th:src="@{/assets/js/main.js}"></script>
<script charset="utf-8" data-pjax th:src="@{/assets/zhheo/blogex.js}"></script> <script charset="utf-8" data-pjax th:src="@{/assets/zhheo/blogex.js}"></script>
@ -79,7 +79,7 @@
<link th:href="@{/assets/libs/tocbot/4.18.2/tocbot.css}" rel="stylesheet"> <link th:href="@{/assets/libs/tocbot/4.18.2/tocbot.css}" rel="stylesheet">
<script> <script>
document.addEventListener("DOMContentLoaded", function () { document.addEventListener("DOMContentLoaded", function() {
const postContent = document.querySelector('.post-content'); const postContent = document.querySelector('.post-content');
@ -124,7 +124,11 @@
<!-- Tocbot 目录生成 end --> <!-- Tocbot 目录生成 end -->
<script>
<script >
if(GLOBAL_CONFIG.isFriendLinksInFooter){
var link = { var link = {
// 页脚友链 // 页脚友链
addFriendLinksInFooter: function () { addFriendLinksInFooter: function () {
@ -145,14 +149,14 @@
}) })
} }
} }
}
</script> </script>
<div id="js-pjax"></div> <div id="js-pjax"></div>
<script> <script>
let pjaxSelectors = ['title', '#config-diff', '#body-wrap', '#rightside-config-hide', '#rightside-config-show', '.js-pjax', '#site-config'] let pjaxSelectors = ['title', '#config-diff', '#body-wrap', '#rightside-config-hide', '#rightside-config-show', '.js-pjax','#site-config']
if (false) { if (false) {
pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]') pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
@ -235,9 +239,9 @@
</script> </script>
</div> </div>
<script data-pjax=""> <script data-pjax="">
if ([[${ theme.config.post.dynamicBackground }]]) { if ([[${ theme.config.post.dynamicBackground }]]) {
@ -262,8 +266,10 @@
heo.darkModeStatus(); heo.darkModeStatus();
// heo.categoriesBarActive(); // heo.categoriesBarActive();
heo.initThemeColor(); heo.initThemeColor();
//页脚友链 //页脚友联
link.addFriendLinksInFooter(); if(GLOBAL_CONFIG.isFriendLinksInFooter){
link.addFriendLinksInFooter()
}
//右下角 snackbar 弹窗 //右下角 snackbar 弹窗
if ([[${ theme.config.snackbar.switch }]]) { if ([[${ theme.config.snackbar.switch }]]) {
@ -271,7 +277,7 @@
} }
</script> </script>
</body> </body>
</html> </html>

5
templates/modules/post-list.html
View File

@ -52,13 +52,12 @@
th:each="tag : ${post.tags}" th:each="tag : ${post.tags}"
th:href="@{${tag.status.permalink}}" th:href="@{${tag.status.permalink}}"
th:title="${tag.spec.displayName}"> th:title="${tag.spec.displayName}">
<span class="tags-punctuation">#</span>[[${#strings.trim(tag.spec.displayName)}]] <span class="tags-punctuation">[[${#strings.trim(tag.spec.displayName)}]]</span>
</a> </a>
</span> </span>
</th:block> </th:block>
<!-- 创建时间 --> <!-- 创建时间 -->
<span class="post-meta-date" <span class="post-meta-date" th:with="days=${(new java.util.Date().getTime()-post.spec.publishTime.toEpochMilli())/86400000}">
th:with="days=${(new java.util.Date().getTime()-post.spec.publishTime.toEpochMilli())/86400000}">
<i class="far fa-calendar-alt"></i> <i class="far fa-calendar-alt"></i>
<time style="display: inline;" <time style="display: inline;"
th:datetime="${post.spec.publishTime}" th:datetime="${post.spec.publishTime}"

24
templates/post.html
View File

@ -7,7 +7,7 @@
<header class="post-bg" id="page-header"> <header class="post-bg" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = ${post.spec.title})}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${post.spec.title})}"></nav>
<div class="coverdiv" id="coverdiv"> <div class="coverdiv loaded" id="coverdiv">
<img alt="cover" class="nolazyload" id="post-cover" <img alt="cover" class="nolazyload" id="post-cover"
th:src="${#strings.isEmpty(post.spec.cover) ? theme.config.layout.postRandomImg : post.spec.cover}"> th:src="${#strings.isEmpty(post.spec.cover) ? theme.config.layout.postRandomImg : post.spec.cover}">
</div> </div>
@ -26,8 +26,10 @@
<div class="tag_share" th:if="${not #lists.isEmpty(post.tags)}"> <div class="tag_share" th:if="${not #lists.isEmpty(post.tags)}">
<div class="post-meta__tag-list"> <div class="post-meta__tag-list">
<a class="post-meta__tags" th:each="tag : ${post.tags}" <a class="post-meta__tags" th:each="tag : ${post.tags}"
th:href="@{${tag.status.permalink}}" th:text="'#'+${tag.spec.displayName}" th:href="@{${tag.status.permalink}}"
th:title="${tag.spec.displayName}"></a> th:title="${tag.spec.displayName}">
<span class="tags-name tags-punctuation">[[${tag.spec.displayName}]]</span>
</a>
</div> </div>
</div> </div>
</div> </div>
@ -61,8 +63,7 @@
<span class="post-meta-label">热度:</span> <span class="post-meta-label">热度:</span>
<span id="visit" th:text="${post.stats.visit}"></span> <span id="visit" th:text="${post.stats.visit}"></span>
</span> </span>
<span th:if="${post.spec.allowComment}" class="post-meta-commentcount" <span th:if="${post.spec.allowComment}" class="post-meta-commentcount" onclick="heo.scrollTo('#post-comment');" title="评论数">
onclick="heo.scrollTo('#post-comment');" title="评论数">
<i class="iconfont icon-comment-alt"></i> <i class="iconfont icon-comment-alt"></i>
<span class="post-meta-label">评论:</span> <span class="post-meta-label">评论:</span>
<a th:if="${#strings.equals(theme.config.comments.use, 'commentWidget')}" <a th:if="${#strings.equals(theme.config.comments.use, 'commentWidget')}"
@ -460,8 +461,7 @@
<div class="post-qr-code-desc">微信</div> <div class="post-qr-code-desc">微信</div>
</li> </li>
<li class="reward-item"><a th:href="@{${theme.config.post.reward.alipay}}" <li class="reward-item"><a th:href="@{${theme.config.post.reward.alipay}}"
target="_blank"><img alt="支付宝" target="_blank"><img alt="支付宝" class="post-qr-code-img"
class="post-qr-code-img"
th:src="${theme.config.post.reward.alipay}"></a> th:src="${theme.config.post.reward.alipay}"></a>
<div class="post-qr-code-desc">支付宝</div> <div class="post-qr-code-desc">支付宝</div>
</li> </li>
@ -484,8 +484,7 @@
<!-- 分享 --> <!-- 分享 -->
<div class="share-link mobile"> <div class="share-link mobile">
<div class="share-qrcode"> <div class="share-qrcode">
<div class="share-button" title="使用手机访问这篇文章"><i <div class="share-button" title="使用手机访问这篇文章"><i class="iconfont icon-qrcode"></i>
class="iconfont icon-qrcode"></i>
</div> </div>
<div class="share-main"> <div class="share-main">
<div class="share-main-all"> <div class="share-main-all">
@ -511,9 +510,8 @@
<div class="post-meta__tag-list"> <div class="post-meta__tag-list">
<a class="post-meta__tags" th:each="tag : ${post.tags}" <a class="post-meta__tags" th:each="tag : ${post.tags}"
th:href="@{${tag.status.permalink}}"> th:href="@{${tag.status.permalink}}">
<span class="tags-punctuation">#</span> <span class="tags-punctuation">[[${tag.spec.displayName}]]</span>
<th:block th:text="${tag.spec.displayName}" th:title="${tag.spec.displayName}">
</th:block>
<span class="tagsPageCount" th:text="${tag.status.visiblePostCount}"></span> <span class="tagsPageCount" th:text="${tag.status.visiblePostCount}"></span>
</a> </a>
</div> </div>
@ -599,7 +597,7 @@
</div> </div>
</div> </div>
<halo:comment group="content.halo.run" kind="SinglePage" th:attr="name='links'" <halo:comment group="content.halo.run" kind="SinglePage" th:attr="name='links'"
colorScheme="document.documentElement.getAttribute('data-theme')"/> colorScheme="document.documentElement.getAttribute('data-theme')" />
</div> </div>
</div> </div>

4
templates/tag.html
View File

@ -16,7 +16,7 @@
th:each="tagItem : ${tags}" th:each="tagItem : ${tags}"
th:href="@{${tagItem.status.permalink}}" th:href="@{${tagItem.status.permalink}}"
th:id="${tagItem.spec.displayName}"> th:id="${tagItem.spec.displayName}">
<span class="tags-punctuation">#</span> [[${tagItem.spec.displayName}]] <span class="tags-punctuation">[[${tagItem.spec.displayName}]]</span>
<span class="tagsPageCount" th:text="${tagItem.status.visiblePostCount}"></span> <span class="tagsPageCount" th:text="${tagItem.status.visiblePostCount}"></span>
</a> </a>
</div> </div>
@ -43,7 +43,7 @@
<div class="article-sort-item-tags"> <div class="article-sort-item-tags">
<a class="article-meta__tags" event.cancelbubble onclick="window.event.cancelBubble=!0" <a class="article-meta__tags" event.cancelbubble onclick="window.event.cancelBubble=!0"
th:each="tag : ${post.tags}" th:href="@{${tag.status.permalink}}"> th:each="tag : ${post.tags}" th:href="@{${tag.status.permalink}}">
<span class="tags-punctuation">#[[${tag.spec.displayName}]]</span> <span class="tags-punctuation">[[${tag.spec.displayName}]]</span>
</a> </a>
<span class="article-meta__link">•</span> <span class="article-meta__link">•</span>
</div> </div>

4
templates/tags.html
View File

@ -15,8 +15,8 @@
<a th:each="tagItem : ${tagFinder.listAll()}" <a th:each="tagItem : ${tagFinder.listAll()}"
th:href="@{${tagItem.status.permalink}}" th:href="@{${tagItem.status.permalink}}"
th:id="${tagItem.spec.displayName}" th:style="'font-size: 1em; color:' + ${tagItem.spec.color} "> th:id="${tagItem.spec.displayName}" th:style="'font-size: 1em; color:' + ${tagItem.spec.color} ">
<span class="tags-punctuation">#</span> <span class="tags-punctuation">[[${tagItem.spec.displayName}]]</span>
[[${tagItem.spec.displayName}]]
<span class="tagsPageCount">[[${tagItem.status.visiblePostCount}]]</span> <span class="tagsPageCount">[[${tagItem.status.visiblePostCount}]]</span>
</a> </a>

2
theme.yaml
View File

@ -27,5 +27,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.1.3 version: 1.1.2
require: 2.0.0 require: 2.0.0