From 2e5f8ed2dccf6756d805002bcca7e28b19a9389c Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Mon, 25 Sep 2023 22:07:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A4=BE=E4=BA=A4=E5=AA=92=E4=BD=93?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=94=B9=E4=B8=BA=E8=87=AA=E5=A1=AB=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=BC=83=E7=94=A8=E9=80=89=E6=8B=A9=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                                | 213 +------------------
 templates/modules/footer.html                |   4 +-
 templates/modules/widgets/aside/profile.html |   4 +-
 3 files changed, 7 insertions(+), 214 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index ec27543b..7e4d5f69 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -631,84 +631,15 @@ spec:
               max: 2
               value: [ ]
               children:
-                - $formkit: select
+                - $formkit: text
                   name: icon
                   label: 图标
-                  options:
-                    - label: 电子邮箱
-                      value: hao-icon-envelope
-                    - label: 微信
-                      value: hao-icon-weixin
-                    - label: 公众号
-                      value: hao-icon-weixingongzhonghao
-                    - label: rss
-                      value: hao-icon-rss
-                    - label: 腾讯 QQ
-                      value: hao-icon-qq
-                    - label: 新浪微博
-                      value: hao-icon-weibo
-                    - label: 知乎
-                      value: hao-icon-29
-                    - label: 豆瓣
-                      value: hao-icon-douban
-                    - label: 哔哩哔哩
-                      value: hao-icon-bilibili
-                    - label: GitHub
-                      value: hao-icon-github
-                    - label: GitLab
-                      value: hao-icon-gitlab
-                    - label: 百度
-                      value: hao-icon-baidu
-                    - label: 掘金
-                      value: hao-icon-juejin
-                    - label: 语雀
-                      value: hao-icon-yuque
-                    - label: 博客园
-                      value: hao-icon-cnblogs
-                    - label: CSDN
-                      value: hao-icon-csdn
-                    - label: LeetCode
-                      value: hao-icon-leetcode
-                    - label: 头条
-                      value: hao-icon-toutiao
-                    - label: 抖音 / TikTok
-                      value: hao-icon-tiktok
-                    - label: Telegram
-                      value: hao-icon-telegram
-                    - label: Facebook
-                      value: hao-icon-facebook1
-                    - label: Instagram
-                      value: hao-icon-Instagram
-                    - label: LinkedIn
-                      value: hao-icon-linkedin
-                    - label: Twitter
-                      value: hao-icon-dove
-                    - label: Slack
-                      value: hao-icon-slack
-                    - label: Discord
-                      value: hao-icon-discord-line
-                    - label: YouTube
-                      value: hao-icon-youtube
-                    - label: Steam
-                      value: hao-icon-steam
-                    - label: Dribbble
-                      value: hao-icon-dribbble
                 - $formkit: text
                   name: name
                   label: 名称
                 - $formkit: url
                   name: url
                   label: 链接
-                - $formkit: radio
-                  name: urlType
-                  label: 链接类型
-                  value: normal
-                  help: 如果选择了图片类型，那么在访客点击之后会使用弹框的形式加载
-                  options:
-                    - label: 跳转链接
-                      value: normal
-                    - label: 图片
-                      value: image
         - $formkit: group
           name: wechat
           label: 公众号
@@ -953,167 +884,29 @@ spec:
               label: 左侧
               value: [ ]
               children:
-                - $formkit: select
+                - $formkit: text
                   name: icon
                   label: 图标
-                  options:
-                    - label: 电子邮箱
-                      value: hao-icon-envelope
-                    - label: 微信
-                      value: hao-icon-weixin
-                    - label: 公众号
-                      value: hao-icon-weixingongzhonghao
-                    - label: rss
-                      value: hao-icon-rss
-                    - label: 腾讯 QQ
-                      value: hao-icon-qq
-                    - label: 新浪微博
-                      value: hao-icon-weibo
-                    - label: 知乎
-                      value: hao-icon-29
-                    - label: 豆瓣
-                      value: hao-icon-douban
-                    - label: 哔哩哔哩
-                      value: hao-icon-bilibili
-                    - label: GitHub
-                      value: hao-icon-github
-                    - label: GitLab
-                      value: hao-icon-gitlab
-                    - label: 百度
-                      value: hao-icon-baidu
-                    - label: 掘金
-                      value: hao-icon-juejin
-                    - label: 语雀
-                      value: hao-icon-yuque
-                    - label: 博客园
-                      value: hao-icon-cnblogs
-                    - label: CSDN
-                      value: hao-icon-csdn
-                    - label: LeetCode
-                      value: hao-icon-leetcode
-                    - label: 头条
-                      value: hao-icon-toutiao
-                    - label: 抖音 / TikTok
-                      value: hao-icon-tiktok
-                    - label: Telegram
-                      value: hao-icon-telegram
-                    - label: Facebook
-                      value: hao-icon-facebook1
-                    - label: Instagram
-                      value: hao-icon-Instagram
-                    - label: LinkedIn
-                      value: hao-icon-linkedin
-                    - label: Twitter
-                      value: hao-icon-dove
-                    - label: Slack
-                      value: hao-icon-slack
-                    - label: Discord
-                      value: hao-icon-discord-line
-                    - label: YouTube
-                      value: hao-icon-youtube
-                    - label: Steam
-                      value: hao-icon-steam
-                    - label: Dribbble
-                      value: hao-icon-dribbble
                 - $formkit: text
                   name: name
                   label: 名称
                 - $formkit: text
                   name: url
                   label: 链接
-                - $formkit: radio
-                  name: urlType
-                  label: 链接类型
-                  value: normal
-                  help: 如果选择了图片类型，那么在访客点击之后会使用弹框的形式加载
-                  options:
-                    - label: 跳转链接
-                      value: normal
-                    - label: 图片
-                      value: image
             - $formkit: repeater
               name: socialMediaRight
               label: 右侧
               value: [ ]
               children:
-                - $formkit: select
+                - $formkit: text
                   name: icon
                   label: 图标
-                  options:
-                    - label: 电子邮箱
-                      value: hao-icon-envelope
-                    - label: 微信
-                      value: hao-icon-weixin
-                    - label: 公众号
-                      value: hao-icon-weixingongzhonghao
-                    - label: rss
-                      value: hao-icon-rss
-                    - label: 腾讯 QQ
-                      value: hao-icon-qq
-                    - label: 新浪微博
-                      value: hao-icon-weibo
-                    - label: 知乎
-                      value: hao-icon-29
-                    - label: 豆瓣
-                      value: hao-icon-douban
-                    - label: 哔哩哔哩
-                      value: hao-icon-bilibili
-                    - label: GitHub
-                      value: hao-icon-github
-                    - label: GitLab
-                      value: hao-icon-gitlab
-                    - label: 百度
-                      value: hao-icon-baidu
-                    - label: 掘金
-                      value: hao-icon-juejin
-                    - label: 语雀
-                      value: hao-icon-yuque
-                    - label: 博客园
-                      value: hao-icon-cnblogs
-                    - label: CSDN
-                      value: hao-icon-csdn
-                    - label: LeetCode
-                      value: hao-icon-leetcode
-                    - label: 头条
-                      value: hao-icon-toutiao
-                    - label: 抖音 / TikTok
-                      value: hao-icon-tiktok
-                    - label: Telegram
-                      value: hao-icon-telegram
-                    - label: Facebook
-                      value: hao-icon-facebook1
-                    - label: Instagram
-                      value: hao-icon-Instagram
-                    - label: LinkedIn
-                      value: hao-icon-linkedin
-                    - label: Twitter
-                      value: hao-icon-dove
-                    - label: Slack
-                      value: hao-icon-slack
-                    - label: Discord
-                      value: hao-icon-discord-line
-                    - label: YouTube
-                      value: hao-icon-youtube
-                    - label: Steam
-                      value: hao-icon-steam
-                    - label: Dribbble
-                      value: hao-icon-dribbble
                 - $formkit: text
                   name: name
                   label: 名称
                 - $formkit: text
                   name: url
                   label: 链接
-                - $formkit: radio
-                  name: urlType
-                  label: 链接类型
-                  value: normal
-                  help: 如果选择了图片类型，那么在访客点击之后会使用弹框的形式加载
-                  options:
-                    - label: 跳转链接
-                      value: normal
-                    - label: 图片
-                      value: image
         - $formkit: menuRadio
           name: menu
           label: 相关链接
diff --git a/templates/modules/footer.html b/templates/modules/footer.html
index cfb86bee..7136fb43 100644
--- a/templates/modules/footer.html
+++ b/templates/modules/footer.html
@@ -14,7 +14,7 @@
         <th:block th:with="socialMedias = ${theme.config.footer.social_media.socialMediaLeft}">
             <a class="deal_link" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
                th:href="${socialMedia.url}" th:title="${socialMedia.name}">
-                <i class="haofont " th:classappend="${socialMedia.icon}"></i>
+                <i th:class="${socialMedia.icon}"></i>
             </a>
         </th:block>
 
@@ -24,7 +24,7 @@
         <th:block th:with="socialMedias = ${theme.config.footer.social_media.socialMediaRight}">
             <a class="deal_link" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
                th:href="${socialMedia.url}" th:title="${socialMedia.name}">
-                <i class="haofont " th:classappend="${socialMedia.icon}"></i>
+                <i th:class="${socialMedia.icon}"></i>
             </a>
         </th:block>
     </div>
diff --git a/templates/modules/widgets/aside/profile.html b/templates/modules/widgets/aside/profile.html
index dd564da2..414bff00 100644
--- a/templates/modules/widgets/aside/profile.html
+++ b/templates/modules/widgets/aside/profile.html
@@ -42,7 +42,7 @@
 
             <a class="social-icon" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
                th:href="${socialMedia.url}" th:title="${socialMedia.name}">
-                <i class="haofont " th:classappend="${socialMedia.icon}"></i>
+                <i th:class="${socialMedia.icon}"></i>
             </a>
         </div>
 
@@ -171,7 +171,7 @@
                     <a class="social-icon" rel="external nofollow" target="_blank"
                        th:each="socialMedia : ${socialMedias}" th:href="${socialMedia.url}"
                        th:title="${socialMedia.name}">
-                        <i class="haofont " th:classappend="${socialMedia.icon}"></i>
+                        <i th:class="${socialMedia.icon}"></i>
                     </a>
                 </div>
             </div>

From 756764fc31260d441974c2c702386d61578b998a Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Mon, 25 Sep 2023 22:45:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=9E=AC=E9=97=B4=E6=94=B9=E4=B8=BA30?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/moments.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/moments.html b/templates/moments.html
index 6af2524e..5c760a44 100644
--- a/templates/moments.html
+++ b/templates/moments.html
@@ -20,7 +20,7 @@
                         buttonTitle = ${theme.config.moment.buttonTitle})}" ></div>
                 <div id="bber">
                     <section class="timeline page-1">
-                        <ul class="list" id="waterfall">
+                        <ul class="list" id="waterfall" th:with="moments = ${momentFinder.list(1, 30)}">
                             <li class="item" th:each="moment : ${moments.items}"
                                 th:with="content=${moment.spec.content}">
                                 <div class="bber-content">
@@ -57,11 +57,11 @@
                                     </a>
                                 </div>
                             </li>
-
                         </ul>
                     </section>
                     <!--  分页还没写 -->
                 </div>
+                <div id="bber-tips" style="color: var(--heo-secondtext);">- 只展示最近30条短文 -</div>
                 <script>heo.reflashEssayWaterFall();</script>
                 <hr/>
                 <!--/* 评论组件 */-->

From de988502de607571becfaca011c4b8b12d36938a Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Mon, 25 Sep 2023 22:56:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E8=B5=9E=E8=B5=8F=E4=BD=9C=E8=80=85=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/assets/zhheo/zhheoblog.css | 46 ++++++++++++++--------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css
index f4b7017f..7727020b 100644
--- a/templates/assets/zhheo/zhheoblog.css
+++ b/templates/assets/zhheo/zhheoblog.css
@@ -16614,29 +16614,6 @@ span.hexo-douban-pagenum {
 }
 
 
-@media screen and (max-width: 867px) {
-    #console .close-btn {
-        display:none
-    }
-
-    #console .console-card-group {
-        display: none
-    }
-
-    #consoleHideAside {
-        display: none
-    }
-
-    .console-card-group-reward .reward-all .reward-item img {
-        width: 130px;
-        height: 130px
-    }
-
-    #console #consoleKeyboard {
-        display: none
-    }
-}
-
 #console .console-card {
     background: var(--heo-maskbg);
     border-radius: 12px;
@@ -16954,6 +16931,29 @@ span.hexo-douban-pagenum {
     margin: .625rem;
 }
 
+@media screen and (max-width: 867px) {
+    #console .close-btn {
+        display:none
+    }
+
+    #console .console-card-group {
+        display: none
+    }
+
+    #consoleHideAside {
+        display: none
+    }
+
+    .console-card-group-reward .reward-all .reward-item img {
+        width: 130px;
+        height: 130px
+    }
+
+    #console #consoleKeyboard {
+        display: none
+    }
+}
+
 
 
 /* 快捷键窗口 */

From 80c14b37db01ae2fd00d44fd7be119e22afbb1cb Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Tue, 26 Sep 2023 23:18:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/templates/post.html b/templates/post.html
index 42688d6b..9e7223f1 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -106,7 +106,7 @@
                         <span  class="post-meta-commentcount" sec:authorize="isAuthenticated()"
                                data-flag-title="编辑文章"
                                title="编辑文章"
-                               th:attr="onclick='javascript:window.open(\''+ '/console/posts/editor?name='+${post.metadata.name}+'&returnToView=true' +'\')'">
+                               th:attr="onclick='javascript:window.open(\''+ '/console/posts/editor?name='+${post.metadata.name}+'&returnToView=true\''+ ',' +'\'_self'+'\')'">
                             <i style="margin-top: 2px;" class="haofont hao-icon-bianji post-meta-icon"></i>
                             <span>编辑</span>
                         </span>