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

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	theme.yaml
This commit is contained in:
1152958806@qq.com 2024-01-10 23:39:40 +08:00
parent 670d5e7a2d f42b897200
commit d5547fdd48
10 changed files with 228 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
templates/about.html
View File

@ -42,7 +42,8 @@
</div> </div>
<div class="author-title" th:text="${singlePage.spec.title}"></div> <div class="author-title" th:text="${singlePage.spec.title}"></div>
<th:block th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgetList})}"></th:block> <th:block
th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgetList})}"></th:block>
<div class="author-content"> <div class="author-content">
<div class="create-site-post author-content-item single" th:utext="${theme.config.about.xjlc}"> <div class="create-site-post author-content-item single" th:utext="${theme.config.about.xjlc}">
@ -56,7 +57,8 @@
</div> </div>
<th:block th:if="${theme.config.about.tenyear.tenyear_enable}"> <th:block th:if="${theme.config.about.tenyear.tenyear_enable}">
<link rel="stylesheet" th:href="${assets_link + '/css/tenyear.css' + theme_version}" media="all" onload="this.media='all'"> <link rel="stylesheet" th:href="${assets_link + '/css/tenyear.css' + theme_version}" media="all"
onload="this.media='all'">
<script> (() => { <script> (() => {
const t = document.querySelector(".progress"), const t = document.querySelector(".progress"),
n = document.querySelector(".past-time"), n = document.querySelector(".past-time"),
@ -66,8 +68,9 @@
a = new Date("[(${theme.config.about.tenyear.start_time})]").getTime(), a = new Date("[(${theme.config.about.tenyear.start_time})]").getTime(),
i = new Date("[(${theme.config.about.tenyear.end_time})]").getTime(), i = new Date("[(${theme.config.about.tenyear.end_time})]").getTime(),
c = ((new Date).getTime() - a) / (i - a) * 100, c = ((new Date).getTime() - a) / (i - a) * 100,
u = c <= 100 ? c + "%" : "100%"; u = c <= 100 ? c + "%" : "100%",
n.style.setProperty("--past-time-percentage", c + "%"), t.style.setProperty("--progress-percentage", u), o.textContent = c.toFixed(0) + "%", o.style.left = `calc(${c}% - 33px)`, r.textContent = "" + new Date(a).toLocaleDateString(), s.textContent = "" + new Date(i).toLocaleDateString(), setTimeout(() => { m = c <= 100 ? c.toFixed(0) + "%" : "已达标 ";
n.style.setProperty("--past-time-percentage", c + "%"), t.style.setProperty("--progress-percentage", u), o.textContent = m, o.style.left = `calc(${c}% - 3rem)`, r.textContent = "" + new Date(a).toLocaleDateString(), s.textContent = "" + new Date(i).toLocaleDateString(), setTimeout(() => {
o.style.visibility = "visible" o.style.visibility = "visible"
}, 2500); }, 2500);
})() })()

28
templates/assets/js/comment/artalk.js
View File

@ -11,13 +11,35 @@
countEl: '#ArtalkCount' countEl: '#ArtalkCount'
}, null)) }, null))
if (GLOBAL_CONFIG.lightbox === 'null') return function versionOld(ctx){
window.artalkItem.on('list-loaded', () => { // 旧版本兼容性补丁
window.artalkItem.ctx.get('list').getCommentNodes().forEach(comment => { ctx.getCommentList().forEach(comment => {
const $content = comment.getRender().$content
btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])'))
})
}
function version_2_7_3_WithUpper(ctx){
// 2.7.3 版本及以后版本支持
ctx.get('list').getCommentNodes().forEach(comment => {
const $content = comment .getRender().$content const $content = comment .getRender().$content
btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])')) btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])'))
}) })
}
function versionCheck(ctx){
if(ctx.getCommentList != undefined){
// Artalk 版本小于于 2.7.3
versionOld(ctx);
}else{
version_2_7_3_WithUpper(ctx);
}
}
if (GLOBAL_CONFIG.lightbox === 'null') return
window.artalkItem.on('list-loaded', () => {
versionCheck(window.artalkItem.ctx);
}) })
} }

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

@ -380,7 +380,7 @@ let halo = {
if (values.length === 0) { if (values.length === 0) {
powerStar.href = GLOBAL_CONFIG.source.power.powerLink powerStar.href = GLOBAL_CONFIG.source.power.powerLink
powerStar.innerHTML = ` powerStar.innerHTML = `
<div id="power-star-image" style="background-image: url('https://redirect.cnkj.site:8099/b/2023/6583b34d95d08.webp?type=blog')"> <div id="power-star-image" style="background-image: url('/themes/theme-hao/assets/images/afadian/afadian.webp')">
</div> </div>
<div class="power-star-body"> <div class="power-star-body">
<div id="power-star-title">还没有人赞助～</div> <div id="power-star-title">还没有人赞助～</div>

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

@ -122,7 +122,7 @@ document.addEventListener('DOMContentLoaded', function () {
} }
if (typeof $.fancybox === 'undefined') { if (typeof $.fancybox === 'undefined') {
$('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`) // $('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`)
$.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () { $.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () {
runFancybox($(ele)) runFancybox($(ele))
}) })

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

@ -74,7 +74,7 @@ var btf = {
} }
if (typeof $.fancybox === 'undefined') { if (typeof $.fancybox === 'undefined') {
$('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`) // $('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`)
$.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () { $.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () {
runFancybox($(ele)) runFancybox($(ele))
}) })

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

@ -2215,7 +2215,11 @@ blockquote footer cite::before {
} }
#aside-content :only-child > .card-widget { #aside-content :only-child > .card-widget {
margin-top: 0px; margin-top: 1rem;
}
#aside-content :only-child > :first-child {
margin-top: 0rem;
} }
#aside-content .card-more-btn { #aside-content .card-more-btn {
@ -6803,21 +6807,28 @@ body[data-type=music] .page #nav #site-name span{
} }
} }
/* 保证无card-widget时自动和左侧元素对齐 */
@media screen and (min-width: 1300px) { @media screen and (min-width: 1300px) {
#aside-content .sticky_layout {
margin-top: 0rem;
}
}
/* 用 :has() 伪类判断card-widget是否存在，进行属性覆写 */
/* 若存在，表明需要和card-widget保持距离 */
@media screen and (min-width: 1300px) {
#aside-content:has(+.card-widget) {
#aside-content .sticky_layout { #aside-content .sticky_layout {
margin-top: 1rem; margin-top: 1rem;
} }
} }
}
#aside-content .sticky_layout { #aside-content .sticky_layout {
top: 80px; top: 80px;
transition: top 0s; transition: top 0s;
} }
#aside-content .sticky_layout .card-widget:first-child {
margin-top: 0;
}
#aside-content .card-widget:hover { #aside-content .card-widget:hover {
box-shadow: var(--heo-shadow-border); box-shadow: var(--heo-shadow-border);
} }
@ -9890,8 +9901,13 @@ div#author-info__sayhi:hover {
transform: scale(1.1) transform: scale(1.1)
} }
/* 作者卡片背景 */ /* 选中第一个卡片，与左侧元素对齐 */
#aside-content > .card-widget:first-child { #aside-content > .card-widget:first-child {
margin-top: 0px;
}
/* 作者卡片背景 */
#aside-content > .card-widget.card-info {
transition: 0.3s; transition: 0.3s;
border: none; border: none;
box-shadow: none; box-shadow: none;

18
templates/modules/widgets/about-widgets/about-reward.html
View File

@ -14,7 +14,8 @@
<div id="TA">[[${theme.config.aboutReward.reward.name}]]</div> <div id="TA">[[${theme.config.aboutReward.reward.name}]]</div>
</div> </div>
</div> </div>
<div id="tube-con"><svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg"> <div id="tube-con">
<svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 77H234.226L307.006 24H790" stroke="#e5e9ef" stroke-width="20"></path> <path d="M1 77H234.226L307.006 24H790" stroke="#e5e9ef" stroke-width="20"></path>
<path d="M0 140H233.035L329.72 71H1028" stroke="#e5e9ef" stroke-width="20"></path> <path d="M0 140H233.035L329.72 71H1028" stroke="#e5e9ef" stroke-width="20"></path>
<path d="M1 255H234.226L307.006 307H790" stroke="#e5e9ef" stroke-width="20"></path> <path d="M1 255H234.226L307.006 307H790" stroke="#e5e9ef" stroke-width="20"></path>
@ -25,7 +26,8 @@
<ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#e5e9ef"></ellipse> <ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#e5e9ef"></ellipse>
<circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle> <circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
</svg> </svg>
<div id="mask"><svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg"> <div id="mask">
<svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 77H234.226L307.006 24H790" stroke="#f25d8e" stroke-width="20"></path> <path d="M1 77H234.226L307.006 24H790" stroke="#f25d8e" stroke-width="20"></path>
<path d="M0 140H233.035L329.72 71H1028" stroke="#f25d8e" stroke-width="20"></path> <path d="M0 140H233.035L329.72 71H1028" stroke="#f25d8e" stroke-width="20"></path>
<path d="M1 255H234.226L307.006 307H790" stroke="#f25d8e" stroke-width="20"></path> <path d="M1 255H234.226L307.006 307H790" stroke="#f25d8e" stroke-width="20"></path>
@ -35,8 +37,10 @@
<circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle> <circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle>
<ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#f25d8e"></ellipse> <ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#f25d8e"></ellipse>
<circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle> <circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
</svg></div> </svg>
<div id="orange-mask"><svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg"> </div>
<div id="orange-mask">
<svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 77H234.226L307.006 24H790" stroke="#ffd52b" stroke-width="20"></path> <path d="M1 77H234.226L307.006 24H790" stroke="#ffd52b" stroke-width="20"></path>
<path d="M0 140H233.035L329.72 71H1028" stroke="#ffd52b" stroke-width="20"></path> <path d="M0 140H233.035L329.72 71H1028" stroke="#ffd52b" stroke-width="20"></path>
<path d="M1 255H234.226L307.006 307H790" stroke="#ffd52b" stroke-width="20"></path> <path d="M1 255H234.226L307.006 307H790" stroke="#ffd52b" stroke-width="20"></path>
@ -46,7 +50,8 @@
<circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle> <circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle>
<ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#ffd52b"></ellipse> <ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#ffd52b"></ellipse>
<circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle> <circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
</svg></div> </svg>
</div>
<p id="people">共<b>[[${theme.config.aboutReward.reward_list.size()}]]</b>人</p> <p id="people">共<b>[[${theme.config.aboutReward.reward_list.size()}]]</b>人</p>
</div> </div>
</div> </div>
@ -57,7 +62,8 @@
<div class="reward-list-item-name">[[${authorReward.name}]]</div> <div class="reward-list-item-name">[[${authorReward.name}]]</div>
<div class="reward-list-bottom-group"> <div class="reward-list-bottom-group">
<div th:if="${authorReward.sign == 'N'}" class="reward-list-item-money">¥ <div th:if="${authorReward.sign == 'N'}" class="reward-list-item-money">¥
[[${authorReward.amount}]]</div> [[${authorReward.amount}]]
</div>
<div th:if="${authorReward.sign == 'Y'}" class="reward-list-item-money" <div th:if="${authorReward.sign == 'Y'}" class="reward-list-item-money"
style="background: var(--heo-vip);">¥ [[${authorReward.amount}]] style="background: var(--heo-vip);">¥ [[${authorReward.amount}]]
</div> </div>

39
templates/modules/widgets/about-widgets/statistics-map.html
View File

@ -6,11 +6,15 @@
<div class="author-content-item-tips">数据</div> <div class="author-content-item-tips">数据</div>
<span class="author-content-item-title">访问统计</span> <span class="author-content-item-title">访问统计</span>
<div id="statistic"></div> <div id="statistic"></div>
<div class="post-tips">统计信息来自 <a href="https://invite.51.la/1NzKqTeb?target=V6" rel="noopener nofollow" <div class="post-tips">统计信息来自 <a href="https://invite.51.la/1NzKqTeb?target=V6"
rel="noopener nofollow"
target="_blank">51la网站统计</a></div> target="_blank">51la网站统计</a></div>
<div class="banner-button-group"><a class="banner-button" onclick="pjax.loadUrl('/archives')" <div class="banner-button-group">
data-pjax-state=""><i class="haofont hao-icon-circle-arrow-up-right-1"></i><span <a class="banner-button" onclick="pjax.loadUrl('/archives')" data-pjax-state="">
class="banner-button-text">文章隧道</span></a></div> <i class="haofont hao-icon-circle-arrow-up-right-1"></i>
<span class="banner-button-text">文章隧道</span>
</a>
</div>
</div> </div>
</div> </div>
@ -18,23 +22,30 @@
<div class="author-content-item-group column mapAndInfo"> <div class="author-content-item-group column mapAndInfo">
<div class="author-content-item map single"> <div class="author-content-item map single">
<span class="map-title">我现在住在 <span class="map-title">我现在住在
<b>[[${theme.config.about.map.StrengthenTitle}]]</b></span> <b>[[${theme.config.about.map.StrengthenTitle}]]</b>
</span>
</div> </div>
<div class="author-content-item selfInfo single" <div class="author-content-item selfInfo single"
th:if="${not #lists.isEmpty(theme.config.about.map.authorInfo)}" th:if="${not #lists.isEmpty(theme.config.about.map.authorInfo)}"
th:with="texts = ${theme.config.about.map.authorInfo}"> th:with="texts = ${theme.config.about.map.authorInfo}">
<div th:if="${theme.config.about.map.authorInfo.size()}>'0'"><span class="selfInfo-title" <div th:if="${theme.config.about.map.authorInfo.size()}>'0'">
th:text="${texts[0].authorInfoTitle}">生于</span><span class="selfInfo-content" <span class="selfInfo-title"
th:text="${texts[0].authorInfoTitle}">生于</span><span
class="selfInfo-content"
id="selfInfo-content-year" th:style="'color:' + ${texts[0].authorInfoColor}" id="selfInfo-content-year" th:style="'color:' + ${texts[0].authorInfoColor}"
th:text="${texts[0].authorInfoContent}">2000</span> th:text="${texts[0].authorInfoContent}">2000</span>
</div> </div>
<div th:if="${theme.config.about.map.authorInfo.size()}>'1'"><span class="selfInfo-title" <div th:if="${theme.config.about.map.authorInfo.size()}>'1'">
th:text="${texts[1].authorInfoTitle}">太原理工大学</span><span class="selfInfo-content" <span class="selfInfo-title"
th:text="${texts[1].authorInfoTitle}">太原理工大学</span><span
class="selfInfo-content"
th:style="'color:' + ${texts[1].authorInfoColor}" th:style="'color:' + ${texts[1].authorInfoColor}"
th:text="${texts[1].authorInfoContent}">计算机科学</span> th:text="${texts[1].authorInfoContent}">计算机科学</span>
</div> </div>
<div th:if="${theme.config.about.map.authorInfo.size()}>'2'"><span class="selfInfo-title" <div th:if="${theme.config.about.map.authorInfo.size()}>'2'">
th:text="${texts[2].authorInfoTitle}">现在职业</span><span class="selfInfo-content" <span class="selfInfo-title"
th:text="${texts[2].authorInfoTitle}">现在职业</span><span
class="selfInfo-content"
th:style="'color:' + ${texts[2].authorInfoColor}" th:style="'color:' + ${texts[2].authorInfoColor}"
th:text="${texts[2].authorInfoContent}">BI工程师</span> th:text="${texts[2].authorInfoContent}">BI工程师</span>
</div> </div>
@ -57,6 +68,7 @@
background: url([[${theme.config.about.map.backgroundDark}]]) no-repeat center; background: url([[${theme.config.about.map.backgroundDark}]]) no-repeat center;
background-size: 100%; background-size: 100%;
} }
.author-content-item.map:hover { .author-content-item.map:hover {
background-size: 120%; background-size: 120%;
transition: 4s ease-in-out; transition: 4s ease-in-out;
@ -75,10 +87,12 @@
-webkit-backdrop-filter: blur(20px); -webkit-backdrop-filter: blur(20px);
transition: 1s ease-in-out; transition: 1s ease-in-out;
font-size: 20px; font-size: 20px;
border-radius: 0 0 1rem 1rem;
} }
.author-content-item.map:hover .map-title { .author-content-item.map:hover .map-title {
bottom: -100%; bottom: -100%;
border-radius: 0 0 1rem 1rem;
} }
.author-content-item.map .map-title b { .author-content-item.map .map-title b {
@ -136,6 +150,7 @@
} }
let statisticElement = document.querySelector(".about-statistic.author-content-item"); let statisticElement = document.querySelector(".about-statistic.author-content-item");
function statisticUP() { function statisticUP() {
if (!statisticElement) return; if (!statisticElement) return;
@ -161,9 +176,11 @@
const observer = new IntersectionObserver(callback, options); const observer = new IntersectionObserver(callback, options);
observer.observe(statisticElement); observer.observe(statisticElement);
} }
statisticUP() statisticUP()
}); });
} }
initAboutPage(); initAboutPage();
</script> </script>

2
templates/modules/widgets/aside/wechat.html
View File

@ -17,7 +17,7 @@ th:with="faceImg = ${theme.config.sidebar.wechat.wechatImgFace}, backImg=${theme
#aside-content .card-widget#card-wechat::before { #aside-content .card-widget#card-wechat::before {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 90%;
left: 0; left: 0;
top: 0; top: 0;
background: url([[${theme.config.sidebar.wechat.wechatImg}]]) center center no-repeat; background: url([[${theme.config.sidebar.wechat.wechatImg}]]) center center no-repeat;

2
theme.yaml
View File

@ -51,5 +51,5 @@ spec:
repo: https://githubfast.com/liuzhihang/halo-theme-hao repo: https://githubfast.com/liuzhihang/halo-theme-hao
settingName: "theme-hao-setting" settingName: "theme-hao-setting"
configMapName: "theme-hao-configMap" configMapName: "theme-hao-configMap"
version: "1.4.7-beta2" version: "1.4.6"
require: ">=2.10.0" require: ">=2.10.0"