Merge pull request #598 from carolcoral/main

修复“关于”页面中“地图”中的圆角问题

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,6 +87,7 @@
             -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 {
@@ -136,6 +149,7 @@
                         }
                         
                         let statisticElement = document.querySelector(".about-statistic.author-content-item");
+                        
                         function statisticUP() {
                             if (!statisticElement) return;
                             
@@ -161,9 +175,11 @@
                             const observer = new IntersectionObserver(callback, options);
                             observer.observe(statisticElement);
                         }
+                        
                         statisticUP()
                     });
         }
+        
         initAboutPage();
     
     </script>