From f58f59fc39c697d3b9acc964754c84146872bc0b Mon Sep 17 00:00:00 2001 From: liuxuewen <947752894@qq.com> Date: Mon, 18 Dec 2023 17:14:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add:=20=E6=96=B0=E5=A2=9E=E9=A1=B5=E8=84=9A?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E5=AF=B9=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E3=80=81=E4=B8=BB=E9=A2=98=E3=80=81=E5=85=B3=E4=BA=8E=E7=AD=89?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E6=8E=A7=E5=88=B6=20add:=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=E4=B8=AD?= =?UTF-8?q?=E5=AF=B9ICP=E5=92=8C=E5=85=AC=E7=BD=91=E5=AE=89=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BD=BF=E7=94=A8http=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=8F=AF=E8=87=AA=E5=8A=A8=E8=AF=86=E5=88=AB=E4=B8=BA?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=93=BE=E6=8E=A5=20fix:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=A1=B5=E8=84=9A=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E8=AE=A2=E9=98=85=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 19 ++++++++++--------- settings.yaml | 29 +++++++++++++++++++++++++++++ templates/modules/footer.html | 18 ++++++++++++------ theme.yaml | 2 +- 4 files changed, 52 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 423be855..ea3044eb 100644 --- a/README.md +++ b/README.md @@ -34,15 +34,16 @@ ## 🔥 预览 -| 站点名称 | 站点地址 | -|:--------:|:-------------------------:| -| 程序员小航 | https://liuzhihang.com | -| 流殃 | https://shyblog.world | -| 羡羡 | https://www.hydsb0.com/ | -| 困困鱼 | https://kunkunyu.com | -| Top John | https://op-lab.top | -| Roozen | https://roozen.top | -| Lanbin | https://lib.lanbin.top | +| 站点名称 | 站点地址 | +|:----------:|:-----------------------:| +| 程序员小航 | https://liuzhihang.com | +| 流殃 | https://shyblog.world | +| 羡羡 | https://www.hydsb0.com/ | +| 困困鱼 | https://kunkunyu.com | +| Top John | https://op-lab.top | +| Roozen | https://roozen.top | +| Lanbin | https://lib.lanbin.top | +| Carol`s 小屋 | https://blog.cnkj.site | ## 👋 简介 diff --git a/settings.yaml b/settings.yaml index bd6fec01..f8686e4a 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1041,12 +1041,41 @@ spec: children: - $formkit: radio name: default_enable + id: default_enable + key: default_enable label: 底部 options: - label: 显示 value: true - label: 隐藏 value: false + - $formkit: radio + if: $get(default_enable).value + name: dingyue + label: 订阅 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + if: $get(default_enable).value + name: zhuti + label: 主题 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + if: $get(default_enable).value + name: about + label: 关于 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false - $formkit: group name: style_one label: 中间 diff --git a/templates/modules/footer.html b/templates/modules/footer.html index 94d525c2..bbadea08 100644 --- a/templates/modules/footer.html +++ b/templates/modules/footer.html @@ -119,19 +119,25 @@
- 订阅 - 主题 - 关于 + 订阅 + 主题 + 关于 [[${theme.config.basics.icp}]] + target="_blank"> + [[${theme.config.basics + .icp}]] + icp [[${theme.config.basics.gongan}]] + target="_blank"> + [[${theme.config.basics.gongan}]] + gongan diff --git a/theme.yaml b/theme.yaml index 648805aa..81ce6162 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.3" + version: "1.4.4" require: ">=2.10.0" From 1811fb3cb93fb0a9b22bd77eba80c58951b66d81 Mon Sep 17 00:00:00 2001 From: liuxuewen <947752894@qq.com> Date: Mon, 18 Dec 2023 17:15:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add:=20=E6=96=B0=E5=A2=9E=E9=A1=B5=E8=84=9A?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E5=AF=B9=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E3=80=81=E4=B8=BB=E9=A2=98=E3=80=81=E5=85=B3=E4=BA=8E=E7=AD=89?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E6=8E=A7=E5=88=B6=20add:=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=E4=B8=AD?= =?UTF-8?q?=E5=AF=B9ICP=E5=92=8C=E5=85=AC=E7=BD=91=E5=AE=89=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BD=BF=E7=94=A8http=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=8F=AF=E8=87=AA=E5=8A=A8=E8=AF=86=E5=88=AB=E4=B8=BA?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=93=BE=E6=8E=A5=20fix:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=A1=B5=E8=84=9A=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E8=AE=A2=E9=98=85=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cf9e7826..1c23ee87 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "halo-theme-hao", - "version": "1.4.3", + "version": "1.4.4", "dependencies": { } } From 72d2b2b8dd7260f1bed42c4782bc5a370d780dfb Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:57:56 +0000 Subject: [PATCH 3/4] docs: update README.md [skip ci] --- README.md | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 423be855..c0f13687 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! -[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-15-orange.svg?style=flat-square)](#contributors-) @@ -141,30 +141,31 @@ This project follows the [all-contributors](https://github.com/all-contributors/ - - - - - - + + + + + + - - - - - - + + + + + + - - + + + From 5ff1e8fc07cea8be6da85da2fb38d1b59fabe486 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:57:57 +0000 Subject: [PATCH 4/4] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index d156719d..784af200 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -129,6 +129,15 @@ "contributions": [ "code" ] + }, + { + "login": "carolcoral", + "name": "Carol", + "avatar_url": "https://avatars.githubusercontent.com/u/8952687?v=4", + "profile": "https://github.com/carolcoral", + "contributions": [ + "code" + ] } ], "files": [
liuzhihang
liuzhihang
💻 ✅		sunheyi
sunheyi
💻		Joy
Joy
💻		John Niang
John Niang
💻		Lanbin
Lanbin
✅		小孙同学
小孙同学
✅ 💻		liuzhihang
liuzhihang
💻 ✅		sunheyi
sunheyi
💻		Joy
Joy
💻		John Niang
John Niang
💻		Lanbin
Lanbin
✅		小孙同学
小孙同学
✅ 💻
airbo
airbo
✅ 💻		Gadore
Gadore
💻		羡羡
羡羡
💻		困困鱼
困困鱼
💻		Top John
Top John
💻		BugJi
BugJi
💻		airbo
airbo
✅ 💻		Gadore
Gadore
💻		羡羡
羡羡
💻		困困鱼
困困鱼
💻		Top John
Top John
💻		BugJi
BugJi
💻
Roozen
Roozen
💻		石头君
石头君
💻		Roozen
Roozen
💻		石头君
石头君
💻		Carol
Carol
💻
- + Add your contributions