From 5eac3756b2706982d27f74e1dbc361a3bcdb74ed Mon Sep 17 00:00:00 2001 From: liuzhihang Date: Sat, 31 Dec 2022 21:03:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/links.html | 40 -------------------------- templates/modules/layouts/layout.html | 2 +- templates/modules/loading-box.html | 41 +++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/templates/links.html b/templates/links.html index e3b27d96..1a439dd8 100644 --- a/templates/links.html +++ b/templates/links.html @@ -1,46 +1,6 @@ - - - -
diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html index 4ce2615d..a1f3b8a8 100644 --- a/templates/modules/layouts/layout.html +++ b/templates/modules/layouts/layout.html @@ -98,7 +98,7 @@ coverColor(); } - if ([[${theme.config.other.loadingBox} and not ${#strings.isEmpty(theme.config.other.loadingBoxImg)}]]) { + if ([[${theme.config.other.loadingBox}]]) { // 移除加载动画 removeLoading(); } diff --git a/templates/modules/loading-box.html b/templates/modules/loading-box.html index 27c8332e..9a1b5cbc 100644 --- a/templates/modules/loading-box.html +++ b/templates/modules/loading-box.html @@ -5,6 +5,47 @@
+ + + +
From ddffbd4e1e517c3b36411a895e06c41749edc441 Mon Sep 17 00:00:00 2001 From: liuzhihang Date: Wed, 4 Jan 2023 21:47:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- templates/page.html | 17 +++++++++++++++++ theme.yaml | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 792b61c2..51cac2bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "halo-theme-hao", - "version": "1.0.4", + "version": "1.0.5", "dependencies": { } } diff --git a/templates/page.html b/templates/page.html index bcbbe01e..ef52ffd4 100644 --- a/templates/page.html +++ b/templates/page.html @@ -12,6 +12,23 @@
+ + +
+ +
+
+
评论
+
隐私政策
+
+ 你无需删除空行，直接评论以获取最佳展示效果 +
+
+ +
+
diff --git a/theme.yaml b/theme.yaml index 7c259178..0ee37e80 100644 --- a/theme.yaml +++ b/theme.yaml @@ -13,5 +13,5 @@ spec: repo: 'https://github.com/liuzhihang/halo-theme-hao' settingName: "theme-hao-setting" configMapName: "theme-hao-configMap" - version: 1.0.4 + version: 1.0.5 require: 2.0.0 From 50f3381e512df0d2dbaef0150cb342687569c397 Mon Sep 17 00:00:00 2001 From: liuzhihang Date: Wed, 4 Jan 2023 22:57:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E4=BB=8A=E6=97=A5=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 2 +- templates/modules/widgets/top-group.html | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/settings.yaml b/settings.yaml index 51423e99..675ccfe3 100644 --- a/settings.yaml +++ b/settings.yaml @@ -124,7 +124,7 @@ spec: - $formkit: group if: "$get(todayRecommend).value" name: todayRecommendContent - label: 公众号 + label: 今日推荐 value: todayRecommendUrl: todayRecommendTitle: diff --git a/templates/modules/widgets/top-group.html b/templates/modules/widgets/top-group.html index ad736176..ff636b96 100644 --- a/templates/modules/widgets/top-group.html +++ b/templates/modules/widgets/top-group.html @@ -44,11 +44,10 @@
-
+ th:if="${theme.config.top.todayRecommend}" + th:attr="onclick='javascript:window.open(\''+ ${theme.config.top.todayRecommendContent.todayRecommendUrl} +'\')'">
今日推荐