Merge remote-tracking branch 'origin/main'

# Conflicts:
#	theme.yaml

templates/about.html

@@ -42,7 +42,8 @@
                     </div>
                     <div class="author-title" th:text="${singlePage.spec.title}"></div>
                     
-                    <th:block th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgetList})}"></th:block>
+                    <th:block
+                            th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgetList})}"></th:block>
                     
                     <div class="author-content">
                         <div class="create-site-post author-content-item single" th:utext="${theme.config.about.xjlc}">
@@ -56,7 +57,8 @@
                 </div>
                 
                 <th:block th:if="${theme.config.about.tenyear.tenyear_enable}">
-                    <link rel="stylesheet" th:href="${assets_link + '/css/tenyear.css' + theme_version}"  media="all" onload="this.media='all'">
+                    <link rel="stylesheet" th:href="${assets_link + '/css/tenyear.css' + theme_version}" media="all"
+                          onload="this.media='all'">
                     <script> (() => {
                         const t = document.querySelector(".progress"),
                                 n = document.querySelector(".past-time"),
@@ -66,8 +68,9 @@
                                 a = new Date("[(${theme.config.about.tenyear.start_time})]").getTime(),
                                 i = new Date("[(${theme.config.about.tenyear.end_time})]").getTime(),
                                 c = ((new Date).getTime() - a) / (i - a) * 100,
-                                u = c <= 100 ? c + "%" : "100%";
-                            n.style.setProperty("--past-time-percentage", c + "%"), t.style.setProperty("--progress-percentage", u), o.textContent = c.toFixed(0) + "%", o.style.left = `calc(${c}% - 33px)`, r.textContent = "" + new Date(a).toLocaleDateString(), s.textContent = "" + new Date(i).toLocaleDateString(), setTimeout(() => {
+                                u = c <= 100 ? c + "%" : "100%",
+                                m = c <= 100 ? c.toFixed(0) + "%" : "已达标 ";
+                        n.style.setProperty("--past-time-percentage", c + "%"), t.style.setProperty("--progress-percentage", u), o.textContent = m, o.style.left = `calc(${c}% - 3rem)`, r.textContent = "" + new Date(a).toLocaleDateString(), s.textContent = "" + new Date(i).toLocaleDateString(), setTimeout(() => {
                             o.style.visibility = "visible"
                         }, 2500);
                     })()

templates/assets/js/comment/artalk.js

@@ -11,13 +11,35 @@
             countEl: '#ArtalkCount'
         }, null))
 
-        if (GLOBAL_CONFIG.lightbox === 'null') return
-        window.artalkItem.on('list-loaded', () => {
-            window.artalkItem.ctx.get('list').getCommentNodes().forEach(comment => {
+        function versionOld(ctx){
+            // 旧版本兼容性补丁
+            ctx.getCommentList().forEach(comment => {
                 const $content = comment.getRender().$content
                 btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])'))
             })
+        }
 
+        function version_2_7_3_WithUpper(ctx){
+            // 2.7.3 版本及以后版本支持
+            ctx.get('list').getCommentNodes().forEach(comment => {
+                const $content = comment .getRender().$content
+                btf.loadLightbox($content.querySelectorAll('img:not([atk-emoticon])'))
+            })
+
+        }
+
+        function versionCheck(ctx){
+            if(ctx.getCommentList != undefined){
+                // Artalk 版本小于于 2.7.3
+                versionOld(ctx);
+            }else{
+                version_2_7_3_WithUpper(ctx);
+            }
+        }
+
+        if (GLOBAL_CONFIG.lightbox === 'null') return
+        window.artalkItem.on('list-loaded', () => {
+            versionCheck(window.artalkItem.ctx);
         })
     }
 

templates/assets/js/halo.js

@@ -380,7 +380,7 @@ let halo = {
             if (values.length === 0) {
                 powerStar.href = GLOBAL_CONFIG.source.power.powerLink
                 powerStar.innerHTML = ` 
-                        <div id="power-star-image" style="background-image: url('https://redirect.cnkj.site:8099/b/2023/6583b34d95d08.webp?type=blog')">
+                        <div id="power-star-image" style="background-image: url('/themes/theme-hao/assets/images/afadian/afadian.webp')">
                         </div>
                         <div class="power-star-body">
                             <div id="power-star-title">还没有人赞助～</div>

templates/assets/js/main.js

@@ -122,7 +122,7 @@ document.addEventListener('DOMContentLoaded', function () {
         }
 
         if (typeof $.fancybox === 'undefined') {
-            $('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`)
+            // $('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`)
             $.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () {
                 runFancybox($(ele))
             })

templates/assets/js/utils.js

@@ -74,7 +74,7 @@ var btf = {
             }
 
             if (typeof $.fancybox === 'undefined') {
-                $('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`)
+                // $('head').append(`<link rel="stylesheet" type="text/css" href="${GLOBAL_CONFIG.source.fancybox.css}">`)
                 $.getScript(`${GLOBAL_CONFIG.source.fancybox.js}`, function () {
                     runFancybox($(ele))
                 })

templates/assets/zhheo/zhheoblog.css

@@ -2215,7 +2215,11 @@ blockquote footer cite::before {
 }
 
 #aside-content :only-child > .card-widget {
-    margin-top: 0px;
+    margin-top: 1rem;
+}
+
+#aside-content :only-child > :first-child {
+    margin-top: 0rem;
 }
 
 #aside-content .card-more-btn {
@@ -6803,10 +6807,21 @@ body[data-type=music] .page #nav #site-name span{
     }
 }
 
+/* 保证无card-widget时自动和左侧元素对齐 */
 @media screen and (min-width: 1300px) {
+    #aside-content .sticky_layout {
+        margin-top: 0rem;
+    }
+}
+
+/* 用 :has() 伪类判断card-widget是否存在，进行属性覆写 */
+/* 若存在，表明需要和card-widget保持距离 */
+@media screen and (min-width: 1300px) {
+    #aside-content:has(+.card-widget) {
         #aside-content .sticky_layout {
             margin-top: 1rem;
         }
+    }
 }
 
 #aside-content .sticky_layout {
@@ -6814,10 +6829,6 @@ body[data-type=music] .page #nav #site-name span{
     transition: top 0s;
 }
 
-#aside-content .sticky_layout .card-widget:first-child {
-    margin-top: 0;
-}
-
 #aside-content .card-widget:hover {
     box-shadow: var(--heo-shadow-border);
 }
@@ -9890,8 +9901,13 @@ div#author-info__sayhi:hover {
     transform: scale(1.1)
 }
 
-/* 作者卡片背景 */
+/* 选中第一个卡片，与左侧元素对齐 */
 #aside-content > .card-widget:first-child {
+    margin-top: 0px;
+}
+
+/* 作者卡片背景 */
+#aside-content > .card-widget.card-info {
     transition: 0.3s;
     border: none;
     box-shadow: none;

templates/modules/widgets/about-widgets/about-reward.html

@@ -1,8 +1,8 @@
 <div class="author-content" th:if="${theme.config.aboutReward.aboutRewardEnable}">
     <div class="author-content-item single reward" id="about-reward">
         <div class="author-content-item-tips">致谢</div>
-        <span class="author-content-item-title" >[[${theme.config.aboutReward.title}]]</span>
-        <div class="author-content-item-description" >
+        <span class="author-content-item-title">[[${theme.config.aboutReward.title}]]</span>
+        <div class="author-content-item-description">
             [[${theme.config.aboutReward.content}]]
         </div>
         
@@ -14,7 +14,8 @@
                     <div id="TA">[[${theme.config.aboutReward.reward.name}]]</div>
                 </div>
             </div>
-            <div id="tube-con"><svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <div id="tube-con">
+                <svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
                     <path d="M1 77H234.226L307.006 24H790" stroke="#e5e9ef" stroke-width="20"></path>
                     <path d="M0 140H233.035L329.72 71H1028" stroke="#e5e9ef" stroke-width="20"></path>
                     <path d="M1 255H234.226L307.006 307H790" stroke="#e5e9ef" stroke-width="20"></path>
@@ -25,7 +26,8 @@
                     <ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#e5e9ef"></ellipse>
                     <circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
                 </svg>
-                <div id="mask"><svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <div id="mask">
+                    <svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <path d="M1 77H234.226L307.006 24H790" stroke="#f25d8e" stroke-width="20"></path>
                         <path d="M0 140H233.035L329.72 71H1028" stroke="#f25d8e" stroke-width="20"></path>
                         <path d="M1 255H234.226L307.006 307H790" stroke="#f25d8e" stroke-width="20"></path>
@@ -35,8 +37,10 @@
                         <circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle>
                         <ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#f25d8e"></ellipse>
                         <circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
-                </svg></div>
-                <div id="orange-mask"><svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    </svg>
+                </div>
+                <div id="orange-mask">
+                    <svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <path d="M1 77H234.226L307.006 24H790" stroke="#ffd52b" stroke-width="20"></path>
                         <path d="M0 140H233.035L329.72 71H1028" stroke="#ffd52b" stroke-width="20"></path>
                         <path d="M1 255H234.226L307.006 307H790" stroke="#ffd52b" stroke-width="20"></path>
@@ -46,7 +50,8 @@
                         <circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle>
                         <ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#ffd52b"></ellipse>
                         <circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
-                </svg></div>
+                    </svg>
+                </div>
                 <p id="people">共<b>[[${theme.config.aboutReward.reward_list.size()}]]</b>人</p>
             </div>
         </div>
@@ -57,7 +62,8 @@
                 <div class="reward-list-item-name">[[${authorReward.name}]]</div>
                 <div class="reward-list-bottom-group">
                     <div th:if="${authorReward.sign == 'N'}" class="reward-list-item-money">¥
-                        [[${authorReward.amount}]]</div>
+                        [[${authorReward.amount}]]
+                    </div>
                     <div th:if="${authorReward.sign == 'Y'}" class="reward-list-item-money"
                          style="background: var(--heo-vip);">¥ [[${authorReward.amount}]]
                     </div>

templates/modules/widgets/about-widgets/statistics-map.html

@@ -1,16 +1,20 @@
 <!-- 数据统计&作者相关信息 -->
-<div class="author-content" >
+<div class="author-content">
     <div class="about-statistic author-content-item"
          style="background: url(https://bu.dusays.com/2023/03/12/640dc8c72f623.webp);">
         <div class="card-content">
             <div class="author-content-item-tips">数据</div>
             <span class="author-content-item-title">访问统计</span>
             <div id="statistic"></div>
-            <div class="post-tips">统计信息来自 <a href="https://invite.51.la/1NzKqTeb?target=V6" rel="noopener nofollow"
+            <div class="post-tips">统计信息来自 <a href="https://invite.51.la/1NzKqTeb?target=V6"
+                                                   rel="noopener nofollow"
                                                    target="_blank">51la网站统计</a></div>
-            <div class="banner-button-group"><a class="banner-button" onclick="pjax.loadUrl('/archives')"
-                                                data-pjax-state=""><i class="haofont hao-icon-circle-arrow-up-right-1"></i><span
-                    class="banner-button-text">文章隧道</span></a></div>
+            <div class="banner-button-group">
+                <a class="banner-button" onclick="pjax.loadUrl('/archives')" data-pjax-state="">
+                    <i class="haofont hao-icon-circle-arrow-up-right-1"></i>
+                    <span class="banner-button-text">文章隧道</span>
+                </a>
+            </div>
         </div>
     </div>
     
@@ -18,23 +22,30 @@
     <div class="author-content-item-group column mapAndInfo">
         <div class="author-content-item map single">
             <span class="map-title">我现在住在
-                <b>[[${theme.config.about.map.StrengthenTitle}]]</b></span>
+                <b>[[${theme.config.about.map.StrengthenTitle}]]</b>
+            </span>
         </div>
         <div class="author-content-item selfInfo single"
              th:if="${not #lists.isEmpty(theme.config.about.map.authorInfo)}"
              th:with="texts = ${theme.config.about.map.authorInfo}">
-            <div th:if="${theme.config.about.map.authorInfo.size()}>'0'"><span class="selfInfo-title"
-                                                                               th:text="${texts[0].authorInfoTitle}">生于</span><span class="selfInfo-content"
+            <div th:if="${theme.config.about.map.authorInfo.size()}>'0'">
+                <span class="selfInfo-title"
+                      th:text="${texts[0].authorInfoTitle}">生于</span><span
+                    class="selfInfo-content"
                     id="selfInfo-content-year" th:style="'color:' + ${texts[0].authorInfoColor}"
                     th:text="${texts[0].authorInfoContent}">2000</span>
             </div>
-            <div th:if="${theme.config.about.map.authorInfo.size()}>'1'"><span class="selfInfo-title"
-                                                                               th:text="${texts[1].authorInfoTitle}">太原理工大学</span><span class="selfInfo-content"
+            <div th:if="${theme.config.about.map.authorInfo.size()}>'1'">
+                <span class="selfInfo-title"
+                      th:text="${texts[1].authorInfoTitle}">太原理工大学</span><span
+                    class="selfInfo-content"
                     th:style="'color:' + ${texts[1].authorInfoColor}"
                     th:text="${texts[1].authorInfoContent}">计算机科学</span>
             </div>
-            <div th:if="${theme.config.about.map.authorInfo.size()}>'2'"><span class="selfInfo-title"
-                                                                               th:text="${texts[2].authorInfoTitle}">现在职业</span><span class="selfInfo-content"
+            <div th:if="${theme.config.about.map.authorInfo.size()}>'2'">
+                <span class="selfInfo-title"
+                      th:text="${texts[2].authorInfoTitle}">现在职业</span><span
+                    class="selfInfo-content"
                     th:style="'color:' + ${texts[2].authorInfoColor}"
                     th:text="${texts[2].authorInfoContent}">BI工程师</span>
             </div>
@@ -57,6 +68,7 @@
             background: url([[${theme.config.about.map.backgroundDark}]]) no-repeat center;
             background-size: 100%;
         }
+        
         .author-content-item.map:hover {
             background-size: 120%;
             transition: 4s ease-in-out;
@@ -75,10 +87,12 @@
             -webkit-backdrop-filter: blur(20px);
             transition: 1s ease-in-out;
             font-size: 20px;
+            border-radius: 0 0 1rem 1rem;
         }
         
         .author-content-item.map:hover .map-title {
             bottom: -100%;
+            border-radius: 0 0 1rem 1rem;
         }
         
         .author-content-item.map .map-title b {
@@ -136,6 +150,7 @@
                         }
                         
                         let statisticElement = document.querySelector(".about-statistic.author-content-item");
+                        
                         function statisticUP() {
                             if (!statisticElement) return;
                             
@@ -161,9 +176,11 @@
                             const observer = new IntersectionObserver(callback, options);
                             observer.observe(statisticElement);
                         }
+                        
                         statisticUP()
                     });
         }
+        
         initAboutPage();
     
     </script>

templates/modules/widgets/aside/wechat.html

@@ -17,7 +17,7 @@ th:with="faceImg = ${theme.config.sidebar.wechat.wechatImgFace}, backImg=${theme
         #aside-content .card-widget#card-wechat::before {
             position: absolute;
             width: 100%;
-            height: 100%;
+            height: 90%;
             left: 0;
             top: 0;
             background: url([[${theme.config.sidebar.wechat.wechatImg}]]) center center no-repeat;

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.7-beta2"
+  version: "1.4.6"
   require: ">=2.10.0"