From 86cdd8fcc8b5abb28b9484372f5ce69ab28c1eac Mon Sep 17 00:00:00 2001
From: roozen <2273038475@qq.com>
Date: Thu, 3 Aug 2023 16:49:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=AD=97?=
 =?UTF-8?q?=E6=9C=BA=E6=95=88=E6=9E=9C=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=9A=8F?=
 =?UTF-8?q?=E6=9C=BA=E6=96=87=E5=AD=97=E5=8F=AF=E9=80=89=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                           | 19 ++++++++--
 templates/modules/header/index-img.html | 48 ++++++++++++++++---------
 2 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 14a843fa..bc2018cd 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -92,6 +92,7 @@ spec:
           value:
             enable_above:
             typed:
+            enable_typed_random:
             enable_above_video:
             index_img:
             phone_index_img:
@@ -115,10 +116,24 @@ spec:
               children:
                 - $formkit: text
                   name: text
-                  label: 文字
-                  placeholder: 请输入文字
+                  label: 自定义文字
+                  placeholder: 请输入自定义文字
+            - $formkit: radio
+              label: 随机文字
+              if: $get(enable_above).value
+              name: enable_typed_random
+              key: enable_typed_random
+              id: enable_typed_random
+              value: false
+              help: 如果配置了自定义文字，优先展示自定文字
+              options:
+                - label: 启用
+                  value: true
+                - label: 禁用
+                  value: false
             - $formkit: radio
               if: $get(enable_above).value
+              label: 背景模式
               name: enable_above_video
               key: enable_above_video
               id: enable_above_video
diff --git a/templates/modules/header/index-img.html b/templates/modules/header/index-img.html
index c42668cc..cfd1be62 100644
--- a/templates/modules/header/index-img.html
+++ b/templates/modules/header/index-img.html
@@ -242,23 +242,39 @@
         </style>
         <script th:inline="javascript">
             function subtitleType() {
-                fetch("https://v1.hitokoto.cn").then((t => t.json())).then((t => {
-                    {
-                        const e = "出自 " + t.from;
-                        const n = [[${theme.config.top.above.typed}]].map((item) => {
-                            return item.realNode.text;
-                        });
-                        n.unshift(t.hitokoto, e), window.typed = new Typed("#subtitle", {
-                            strings: n,
-                            startDelay: 300,
-                            typeSpeed: 100,
-                            loop: !0,
-                            backSpeed: 50
-                        })
-                    }
-                }))
+                if([[${theme.config.top.above.enable_typed_random}]]){
+                    fetch("https://v1.hitokoto.cn").then((t => t.json())).then((t => {
+                        {
+                            const e = "出自 " + t.from;
+                            const n = [[${theme.config.top.above.typed}]].map((item) => {
+                                return item.realNode.text;
+                            });
+                            n.push(t.hitokoto, e), window.typed = new Typed("#subtitle", {
+                                strings: n,
+                                startDelay: 300,
+                                typeSpeed: 100,
+                                loop: !0,
+                                backSpeed: 50
+                            })
+                        }
+                    }))
+                }else{
+                    const n = [[${theme.config.top.above.typed}]].map((item) => {
+                        return item.realNode.text;
+                    });
+                    window.typed = new Typed("#subtitle", {
+                        strings: n,
+                        startDelay: 300,
+                        typeSpeed: 100,
+                        loop: !0,
+                        backSpeed: 50
+                    })
+                }
             }
-            "function" == typeof Typed ? subtitleType() : getScript("https://npm.elemecdn.com/typed.js@2.0.12/lib/typed.min.js").then(subtitleType)
+            // 防止加载文字太短时第一个自定义文字显示不出来
+            setTimeout(()=>{
+                "function" == typeof Typed ? subtitleType() : getScript("https://npm.elemecdn.com/typed.js@2.0.12/lib/typed.min.js").then(subtitleType)
+            },1800)
         </script>
     </th:block>
 </th:block>

From a02955defa56ac6bc49bc9791119627d559d54b0 Mon Sep 17 00:00:00 2001
From: roozen <2273038475@qq.com>
Date: Thu, 3 Aug 2023 18:07:35 +0800
Subject: [PATCH 2/3] update README.md

---
 README.md     | 14 ++++++++++----
 settings.yaml |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 60f08e2b..e377b23d 100644
--- a/README.md
+++ b/README.md
@@ -55,9 +55,15 @@
 对 [Hexo-Theme-Butterfly](https://github.com/liuzhihang/halo-theme-hao)
 主题的魔改版本。
 
-## 🛠 安装
+## 🚨 注意事项(看我看我)
+1. **安装后请到主题设置页面，将每个设置项都保存一下！！！**
+2. **建站时间必填**
+3. 如果安装主题后报错，请仔细查阅[主题说明](https://github.com/liuzhihang/halo-theme-hao)与[更新说明](https://github.com/liuzhihang/halo-theme-hao/releases)！！！
+4. 如果还未解决，可以加群求助！！！
+5. 如果群友也解决不了，再考虑提ISSUE！！！
+6. `1.3.1`及以上版本需要`Halo`版本>=`2.8.0`
 
-> **安装后请到主题设置页面，将每个设置项都保存一下！！！**
+## 🛠 安装
 
 ### 🚗 自动安装
 
@@ -89,12 +95,12 @@
 
 - 评论功能 [plugin-comment-widget](https://github.com/halo-sigs/plugin-comment-widget/releases)
 - 搜索功能 [plugin-search-widget](https://github.com/halo-sigs/plugin-search-widget/releases)
-- 友链页面 [plugin-links](https://github.com/chengzhongxue/plugin-links)(魔改版本) 
+- 友链页面 [plugin-links](https://github.com/halo-sigs/plugin-links)
 - 瞬间页面 [plugin-moments](https://github.com/halo-sigs/plugin-moments) 
 - 代码高亮 [plugin-prismjs](https://github.com/liuzhihang/plugin-prismjs)
 - 图片懒加载 [plugin-lazyload](https://github.com/liuzhihang/plugin-lazyload)
 - 追番插件 [plugin-bilibili-bangumi](https://github.com/Roozenlz/plugin-bilibili-bangumi)
-- 图库插件 [plugin-photos](https://github.com/chengzhongxue/plugin-photos)(魔改版本)
+- 图库插件 [plugin-photos](https://github.com/halo-sigs/plugin-photos)
 
 > 更多插件请参见：https://github.com/halo-sigs/awesome-halo
 
diff --git a/settings.yaml b/settings.yaml
index 9c97bf8b..2c350d03 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -125,7 +125,7 @@ spec:
               key: enable_typed_random
               id: enable_typed_random
               value: false
-              help: 如果配置了自定义文字，优先展示自定文字
+              help: 如果配置了自定义文字，优先展示自定义文字
               options:
                 - label: 启用
                   value: true

From d4b355125ff1fb74dce0fad772d02cdafc83ae24 Mon Sep 17 00:00:00 2001
From: roozen <2273038475@qq.com>
Date: Thu, 3 Aug 2023 22:43:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=B8=E5=86=8C?=
 =?UTF-8?q?=E9=9B=86=E6=A8=A1=E6=9D=BF=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E6=97=B6=E9=9D=A0=E5=B7=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/album.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/album.html b/templates/album.html
index 766380e9..f20da9cc 100644
--- a/templates/album.html
+++ b/templates/album.html
@@ -57,7 +57,7 @@
                         width: 100%;
                         display: flex;
                         flex-wrap: wrap;
-                        justify-content: space-around;
+                        justify-content: space-between;
                         margin: var(--album-spacing-xxl) 0 0
                     }