Merge branch 'liuzhihang:main' into main

README.md

@@ -6,7 +6,7 @@
 <!-- 主题徽章 -->
 <p align="center">
   <!-- halo版本 -->
-  <a href="https://github.com/halo-dev/halo"><img alt="Halo version" src="https://img.shields.io/badge/halo-2.0%2B-blue" /></a>
+  <a href="https://github.com/halo-dev/halo"><img alt="Halo version" src="https://img.shields.io/badge/dynamic/yaml?label=Halo&query=%24.spec.require&url=https://raw.githubusercontent.com/liuzhihang/halo-theme-hao/master/theme.yaml&logo=data:image/webp;base64,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" /></a>
   <!-- 下载总数 -->
   <a href="https://github.com/liuzhihang/halo-theme-hao/releases"><img alt="size" src="https://img.shields.io/github/downloads/liuzhihang/halo-theme-hao/total.svg?style=flat-square""/></a>
   <!-- 许可协议 -->

package.json

@@ -1,6 +1,6 @@
 {
   "name": "halo-theme-hao",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "dependencies": {
   }
 }

templates/macro/author-content.html

@@ -11,11 +11,11 @@
         </div>
         <div class="banner-button-group" th:if="${not #strings.isEmpty(buttonUrl)}">
             <a class="banner-button" target="_blank" th:href="${buttonUrl}">
-                <i class="fas fa-circle-chevron-right"></i>
+                <i class="haofont hao-icon-circle-arrow-right"></i>
                 <span class="banner-button-text" th:text="${buttonTitle}"></span>
             </a>
         </div>
     </div>
 </div>
 
-</html>
+</html>

templates/macro/bangumi-item.html

@@ -21,27 +21,27 @@
                     </span>
                     <span class="bangumi-info-item bangumi-area">
                         <span class="bangumi-info-label">[[${spec.type}]]</span>
-                        <em>[[${spec.area}]]</em>
+                        <em th:text="${#strings.isEmpty(spec.score)? '未知' :spec.area}"></em>
                     </span>
                     <span class="bangumi-info-item bangumi-play">
                         <span class="bangumi-info-label">总播放</span>
-                        <em>[[${spec.view}]]</em>
+                        <em th:text="${#strings.isEmpty(spec.score)? '未知' :spec.view}"></em>
                     </span>
                     <span class="bangumi-info-item bangumi-follow">
                         <span class="bangumi-info-label">追番人数</span>
-                        <em>[[${spec.follow}]]</em>
+                        <em th:text="${#strings.isEmpty(spec.score)? '未知' :spec.follow}"></em>
                     </span>
                     <span class="bangumi-info-item bangumi-coin">
                         <span class="bangumi-info-label">硬币数</span>
-                        <em>[[${spec.coin}]]</em>
+                        <em th:text="${#strings.isEmpty(spec.score)? '未知' :spec.coin}"></em>
                     </span>
                     <span class="bangumi-info-item bangumi-danmaku">
                         <span class="bangumi-info-label">弹幕总数</span>
-                        <em>[[${spec.danmaku}]]</em>
+                        <em th:text="${#strings.isEmpty(spec.score)? '未知' :spec.danmaku}"></em>
                     </span>
                     <span class="bangumi-info-item bangumi-info-item-score">
                         <span class="bangumi-info-label">评分</span>
-                        <em>[[${spec.score}]]</em>
+                        <em th:text="${#strings.isEmpty(spec.score)? '暂无' :spec.score}"></em>
                     </span>
                 </span>
             </div>

theme.yaml

@@ -47,5 +47,5 @@ spec:
   repo: https://github.com/liuzhihang/halo-theme-hao
   settingName: "theme-hao-setting"
   configMapName: "theme-hao-configMap"
-  version: "1.3.3"
+  version: "1.3.4"
   require: ">=2.8.0"