From 5098b2d41f3a5a50b26a5f7bc7540a7b4403a8ec Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <17683872107czx>
Date: Wed, 18 Oct 2023 17:15:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E8=84=9A=E5=9B=BE=E6=A0=87=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                        | 33 ++++++++++++++++++++++++----
 templates/assets/css/fullPage.css    |  8 +++++--
 templates/assets/zhheo/zhheoblog.css | 19 +++++++++++++++-
 templates/fcircle.html               | 10 +++++----
 templates/modules/footer.html        | 11 ++++++----
 5 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 9236de73..d68e3cb9 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -509,8 +509,6 @@ spec:
                   value: col2
                 - label: 三列
                   value: col3
-                - label: 四列
-                  value: col4
             - $formkit: select
               name: postLocation
               label: 封面位置
@@ -933,29 +931,56 @@ spec:
               label: 左侧
               value: [ ]
               children:
-                - $formkit: text
+                - $formkit: radio
+                  name: option_social_data
+                  label: 类型
+                  value: icon
+                  help: "icon图标选择icon图标，svg代码或者图片(如果使用图片请输入完整img标签)选择自定义"
+                  options:
+                    - value: icon
+                      label: icon图标
+                    - value: custom
+                      label: 自定义
+                - $formkit: textarea
                   name: icon
+                  help: "icon图标，svg代码，图片(如果使用图片请输入完整img标签)"
                   label: 图标
+                  validation: "required"
                 - $formkit: text
                   name: name
                   label: 名称
+                  validation: "required"
                 - $formkit: text
                   name: url
                   label: 链接
+                  validation: "required"
             - $formkit: repeater
               name: socialMediaRight
               label: 右侧
               value: [ ]
               children:
-                - $formkit: text
+                - $formkit: radio
+                  name: option_social_data
+                  label: 类型
+                  value: icon
+                  options:
+                    - value: icon
+                      label: icon图标
+                    - value: custom
+                      label: 自定义
+                - $formkit: textarea
                   name: icon
+                  help: "icon图标或svg代码或者图片(如果使用图片请输入完整img标签)"
                   label: 图标
+                  validation: "required"
                 - $formkit: text
                   name: name
                   label: 名称
+                  validation: "required"
                 - $formkit: text
                   name: url
                   label: 链接
+                  validation: "required"
         - $formkit: menuRadio
           name: menu
           label: 相关链接
diff --git a/templates/assets/css/fullPage.css b/templates/assets/css/fullPage.css
index a03839ac..5f26b2bd 100644
--- a/templates/assets/css/fullPage.css
+++ b/templates/assets/css/fullPage.css
@@ -11,14 +11,18 @@
 
 }
 
-.back-home-button {
+.page .back-home-button {
     color: rgba(255, 255, 255, 0.7);
 }
 
-#nav #site-name {
+.page #nav #site-name span {
     color: var(--light-grey);
 }
 
+.nav-fixed #nav #site-name span{
+    color: var(--heo-fontcolor);
+}
+
 #nav .site-page {
     color: rgba(255, 255, 255, 0.7);
 }
diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css
index d5eb3a02..a8f72422 100644
--- a/templates/assets/zhheo/zhheoblog.css
+++ b/templates/assets/zhheo/zhheoblog.css
@@ -5362,10 +5362,11 @@ html {
     }
 }
 
-.nav-fixed #nav .back-home-button {
+.nav-fixed #nav .back-home-button{
     color: var(--heo-fontcolor);
 }
 
+
 .back-home-button:hover {
     background: var(--heo-main);
     color: var(--heo-white);
@@ -6276,6 +6277,22 @@ a.deal_link:hover {
     transform: scale(1.1)
 }
 
+a.custom_socials {
+    display: flex;
+    margin: 1rem 27px;
+    border-radius: 3rem;
+    width: 32px;
+    height: 32px;
+    justify-content: center;
+    align-items: center;
+    transition: 0.3s;
+}
+
+a.custom_socials:hover {
+    transform: scale(1.1)
+}
+
+
 img.footer_mini_logo {
     width: 50px;
     height: 50px;
diff --git a/templates/fcircle.html b/templates/fcircle.html
index 42b06741..d9b5df87 100644
--- a/templates/fcircle.html
+++ b/templates/fcircle.html
@@ -72,10 +72,12 @@
                 <script type="text/javascript" th:src="${assets_link + '/libs/moments/bundle.js'}"></script>
 
                 <style>
-                    /*修复友链朋友圈管理面板显示太大导致无法关闭的bug*/
-                    .cf-manage-pannel[data-v-34921c7c] {
-                        width: 80% !important;
-                        height: 80% !important;
+                    .cf-article-author:hover {
+                        color: var(--heo-card-bg)!important
+                    }
+                    #cf-more:hover{
+                        background: var(--heo-lighttext)!important;
+                        color: var(--heo-card-bg)!important
                     }
                 </style>
 
diff --git a/templates/modules/footer.html b/templates/modules/footer.html
index 7136fb43..5e5e0ad8 100644
--- a/templates/modules/footer.html
+++ b/templates/modules/footer.html
@@ -12,9 +12,10 @@
     <!-- 社交链接，需要填入 href class title -->
     <div id="footer_deal">
         <th:block th:with="socialMedias = ${theme.config.footer.social_media.socialMediaLeft}">
-            <a class="deal_link" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
+            <a th:class="${socialMedia.option_social_data == 'custom' ? 'custom_socials' : 'deal_link'}" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
                th:href="${socialMedia.url}" th:title="${socialMedia.name}">
-                <i th:class="${socialMedia.icon}"></i>
+                <i th:if="${socialMedia.option_social_data == 'icon'}" th:class="${socialMedia.icon}"></i>
+                <th:block th:if="${socialMedia.option_social_data == 'custom'}" th:utext="${socialMedia.icon}"></th:block>
             </a>
         </th:block>
 
@@ -22,9 +23,11 @@
              th:with="img = @{${theme.config.footer.social_media.centerImg}}" th:src="${isLazyload ? '' : img}"
              th:data-lazy-src="${ isLazyload ? img : ''}" title="返回顶部" onclick="btf.scrollToDest(0, 500)">
         <th:block th:with="socialMedias = ${theme.config.footer.social_media.socialMediaRight}">
-            <a class="deal_link" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
+            <a th:class="${socialMedia.option_social_data == 'custom' ? 'custom_socials' : 'deal_link'}" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
                th:href="${socialMedia.url}" th:title="${socialMedia.name}">
-                <i th:class="${socialMedia.icon}"></i>
+                <i th:if="${socialMedia.option_social_data == 'icon' || #strings.isEmpty(socialMedia.option_social_data)}"
+                   th:class="${socialMedia.icon}"></i>
+                <th:block th:if="${socialMedia.option_social_data == 'custom'}" th:utext="${socialMedia.icon}"></th:block>
             </a>
         </th:block>
     </div>