-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
+
+
-
+
From 46cddc3daad7be339e0cfeb7b2cffc8c9b8e256e Mon Sep 17 00:00:00 2001
From: liuxuewen <947752894@qq.com>
Date: Wed, 3 Jan 2024 14:48:53 +0800
Subject: [PATCH 04/12] =?UTF-8?q?change:=20=E4=BF=AE=E6=94=B9=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
theme.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/theme.yaml b/theme.yaml
index c2bf0a9b..d16f3c06 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -51,5 +51,5 @@ spec:
repo: https://githubfast.com/liuzhihang/halo-theme-hao
settingName: "theme-hao-setting"
configMapName: "theme-hao-configMap"
- version: "1.4.6"
+ version: "1.4.7-beta1"
require: ">=2.10.0"
From 70913f9edd7ca264ea3991a57498f567b70fd68a Mon Sep 17 00:00:00 2001
From: liuxuewen <947752894@qq.com>
Date: Wed, 3 Jan 2024 15:36:57 +0800
Subject: [PATCH 05/12] =?UTF-8?q?change:=20=E4=BF=AE=E6=94=B9=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/about.html | 2 +-
templates/modules/widgets/about-widgets/statistics-map.html | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/templates/about.html b/templates/about.html
index 913455c2..df1baa62 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -70,7 +70,7 @@
c = ((new Date).getTime() - a) / (i - a) * 100,
u = c <= 100 ? c + "%" : "100%",
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}% - 33px)`, r.textContent = "" + new Date(a).toLocaleDateString(), s.textContent = "" + new Date(i).toLocaleDateString(), setTimeout(() => {
+ 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"
}, 2500);
})()
diff --git a/templates/modules/widgets/about-widgets/statistics-map.html b/templates/modules/widgets/about-widgets/statistics-map.html
index 43786aa9..1b9d1558 100644
--- a/templates/modules/widgets/about-widgets/statistics-map.html
+++ b/templates/modules/widgets/about-widgets/statistics-map.html
@@ -92,6 +92,7 @@
.author-content-item.map:hover .map-title {
bottom: -100%;
+ border-radius: 0 0 1rem 1rem;
}
.author-content-item.map .map-title b {
From 61640a9d5f5c2b531ad6056bb73eee818fe68305 Mon Sep 17 00:00:00 2001
From: liuxuewen <947752894@qq.com>
Date: Thu, 4 Jan 2024 16:01:25 +0800
Subject: [PATCH 06/12] =?UTF-8?q?change:=20=E4=BF=AE=E6=94=B9=E7=88=B1?=
=?UTF-8?q?=E5=8F=91=E7=94=B5=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87=E8=B7=AF?=
=?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/assets/js/halo.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/assets/js/halo.js b/templates/assets/js/halo.js
index 3bd26475..06193554 100644
--- a/templates/assets/js/halo.js
+++ b/templates/assets/js/halo.js
@@ -380,7 +380,7 @@ let halo = {
if (values.length === 0) {
powerStar.href = GLOBAL_CONFIG.source.power.powerLink
powerStar.innerHTML = `
-
+
还没有人赞助~
From b719d710cba5e89cff1ef50360e96e6915a959a4 Mon Sep 17 00:00:00 2001
From: Nonoas <54799528+Nonoas@users.noreply.github.com>
Date: Sat, 6 Jan 2024 11:19:05 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1?=
=?UTF-8?q?=E5=8D=A1=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/modules/widgets/aside/wechat.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/modules/widgets/aside/wechat.html b/templates/modules/widgets/aside/wechat.html
index 9e5002f2..80539bcd 100644
--- a/templates/modules/widgets/aside/wechat.html
+++ b/templates/modules/widgets/aside/wechat.html
@@ -17,7 +17,7 @@ th:with="faceImg = ${theme.config.sidebar.wechat.wechatImgFace}, backImg=${theme
#aside-content .card-widget#card-wechat::before {
position: absolute;
width: 100%;
- height: 100%;
+ height: 90%;
left: 0;
top: 0;
background: url([[${theme.config.sidebar.wechat.wechatImg}]]) center center no-repeat;
From 24a1039ed2cfd23856eb9162760a0dc5aaf16e53 Mon Sep 17 00:00:00 2001
From: HenryZeng
Date: Mon, 8 Jan 2024 02:34:56 +0800
Subject: [PATCH 08/12] Update zhheoblog.css
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
部分修复 bug #611
修复:去除 文章页 配置中的profile项导致的 文章页 侧边栏卡片间距为0的问题
---
templates/assets/zhheo/zhheoblog.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css
index 8f45ad5f..6203a3f7 100644
--- a/templates/assets/zhheo/zhheoblog.css
+++ b/templates/assets/zhheo/zhheoblog.css
@@ -2215,7 +2215,7 @@ blockquote footer cite::before {
}
#aside-content :only-child > .card-widget {
- margin-top: 0px;
+ margin-top: 1rem;
}
#aside-content .card-more-btn {
From 9f6940cca9ec021904cd73f8b4019bae4724a4ca Mon Sep 17 00:00:00 2001
From: HenryZeng
Date: Mon, 8 Jan 2024 14:36:25 +0800
Subject: [PATCH 09/12] =?UTF-8?q?Update=20zhheoblog.css=20+=20fix=20#611?=
=?UTF-8?q?=20=E5=AE=8C=E5=85=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/assets/zhheo/zhheoblog.css | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css
index 6203a3f7..80ca4cae 100644
--- a/templates/assets/zhheo/zhheoblog.css
+++ b/templates/assets/zhheo/zhheoblog.css
@@ -2218,6 +2218,10 @@ blockquote footer cite::before {
margin-top: 1rem;
}
+#aside-content :only-child > :first-child {
+ margin-top: 0rem;
+}
+
#aside-content .card-more-btn {
float: right;
color: inherit;
@@ -6803,9 +6807,20 @@ body[data-type=music] .page #nav #site-name span{
}
}
+/* 保证无card-widget时自动和左侧元素对齐 */
@media screen and (min-width: 1300px) {
#aside-content .sticky_layout {
- margin-top: 1rem;
+ margin-top: 0rem;
+ }
+}
+
+/* 用 :has() 伪类判断card-widget是否存在,进行属性覆写 */
+/* 若存在,表明需要和card-widget保持距离 */
+@media screen and (min-width: 1300px) {
+ #aside-content:has(+.card-widget) {
+ #aside-content .sticky_layout {
+ margin-top: 1rem;
+ }
}
}
@@ -6814,10 +6829,6 @@ body[data-type=music] .page #nav #site-name span{
transition: top 0s;
}
-#aside-content .sticky_layout .card-widget:first-child {
- margin-top: 0;
-}
-
#aside-content .card-widget:hover {
box-shadow: var(--heo-shadow-border);
}
@@ -9890,8 +9901,13 @@ div#author-info__sayhi:hover {
transform: scale(1.1)
}
-/* 作者卡片背景 */
+/* 选中第一个卡片,与左侧元素对齐 */
#aside-content > .card-widget:first-child {
+ margin-top: 0px;
+}
+
+/* 作者卡片背景 */
+#aside-content > .card-widget.card-info {
transition: 0.3s;
border: none;
box-shadow: none;
From 5c88a2813aef03a218b5528cd92efdd1b5b3924e Mon Sep 17 00:00:00 2001
From: HenryZeng
Date: Tue, 9 Jan 2024 00:46:07 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8DArtalk=202.7.3=E6=9B=B4?=
=?UTF-8?q?=E6=8D=A2=E5=87=BD=E6=95=B0=E9=80=A0=E6=88=90=E7=9A=84=E5=8A=A0?=
=?UTF-8?q?=E8=BD=BD=E5=BC=82=E5=B8=B8=20+=20=E5=A2=9E=E5=8A=A0=E5=90=91?=
=?UTF-8?q?=E4=B8=8B=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/assets/js/comment/artalk.js | 29 +++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/templates/assets/js/comment/artalk.js b/templates/assets/js/comment/artalk.js
index d9acb5c4..79ef7be6 100644
--- a/templates/assets/js/comment/artalk.js
+++ b/templates/assets/js/comment/artalk.js
@@ -11,13 +11,34 @@
countEl: '#ArtalkCount'
}, null))
+ function versionOld(ctx){
+ ctx.getCommentList().forEach(comment => {
+ const $content = comment.getRender().$content
+ btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])'))
+ })
+ }
+
+ function version_2_7_3_WithUpper(ctx){
+ ctx.get('list').getCommentNodes().forEach(comment => {
+ const $content = comment .getRender().$content
+ 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
Artalk.use(ctx => {
ctx.on('list-loaded', () => {
- ctx.getCommentList().forEach(comment => {
- const $content = comment.getRender().$content
- btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])'))
- })
+ versionCheck(ctx);
})
})
}
From 9dc77df7269764acde8aa82a5ae9101db9c716f9 Mon Sep 17 00:00:00 2001
From: HenryZeng
Date: Tue, 9 Jan 2024 01:33:12 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B7=E6=96=B0?=
=?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=8A=A0=E8=BD=BD=E7=9B=B8=E5=85=B3=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/assets/js/comment/artalk.js | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/templates/assets/js/comment/artalk.js b/templates/assets/js/comment/artalk.js
index 79ef7be6..d9c42cef 100644
--- a/templates/assets/js/comment/artalk.js
+++ b/templates/assets/js/comment/artalk.js
@@ -36,10 +36,8 @@
}
if (GLOBAL_CONFIG.lightbox === 'null') return
- Artalk.use(ctx => {
- ctx.on('list-loaded', () => {
- versionCheck(ctx);
- })
+ artalkItem.on('list-loaded', () => {
+ versionCheck(artalkItem.ctx);
})
}
From 875f67d71cac83fefbc3f0e1c355c3d9d331a183 Mon Sep 17 00:00:00 2001
From: HenryZeng
Date: Wed, 10 Jan 2024 23:20:42 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=20/null=20=E8=BF=99=E4=B8=80=E4=B8=8D?=
=?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E8=B5=84=E6=BA=90=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/assets/js/main.js | 2 +-
templates/assets/js/utils.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/assets/js/main.js b/templates/assets/js/main.js
index 581948b5..e14b3e54 100644
--- a/templates/assets/js/main.js
+++ b/templates/assets/js/main.js
@@ -122,7 +122,7 @@ document.addEventListener('DOMContentLoaded', function () {
}
if (typeof $.fancybox === 'undefined') {
- $('head').append(``)
+ // $('head').append(``)
$.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () {
runFancybox($(ele))
})
diff --git a/templates/assets/js/utils.js b/templates/assets/js/utils.js
index 4c4de61e..104eb177 100644
--- a/templates/assets/js/utils.js
+++ b/templates/assets/js/utils.js
@@ -74,7 +74,7 @@ var btf = {
}
if (typeof $.fancybox === 'undefined') {
- $('head').append(``)
+ // $('head').append(``)
$.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () {
runFancybox($(ele))
})