Merge branch 'liuzhihang:main' into main

.all-contributorsrc

@@ -93,6 +93,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "TopJohn",
+      "name": "Top John",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7914367?v=4",
+      "profile": "https://op-lab.top",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "files": [

README.md

@@ -69,7 +69,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -90,6 +90,7 @@ This project follows the [all-contributors](https://github.com/all-contributors/
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/gadore"><img src="https://avatars.githubusercontent.com/u/18081104?v=4?s=100" width="100px;" alt="Gadore"/><br /><sub><b>Gadore</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=gadore" title="Code">💻</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://www.hydsb0.com"><img src="https://avatars.githubusercontent.com/u/64968400?v=4?s=100" width="100px;" alt="羡羡"/><br /><sub><b>羡羡</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=xyhcode" title="Code">💻</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/chengzhongxue"><img src="https://avatars.githubusercontent.com/u/89380218?v=4?s=100" width="100px;" alt="困困鱼"/><br /><sub><b>困困鱼</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=chengzhongxue" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://op-lab.top"><img src="https://avatars.githubusercontent.com/u/7914367?v=4?s=100" width="100px;" alt="Top John"/><br /><sub><b>Top John</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=TopJohn" title="Code">💻</a></td>
     </tr>
   </tbody>
   <tfoot>

templates/about.html

@@ -25,7 +25,7 @@
                         </div>
                         <div class="author-img">
                             <img
-                                th:src="@{${#strings.isEmpty(site.favicon) ? '/assets/images/hao-logo.jpg' : site.favicon}}">
+                                th:src="@{${#strings.isEmpty(site.logo) ? '/assets/images/hao-logo.jpg' : site.logo}}">
                         </div>
                         <div class="author-tag-right"
                             th:if="${not #lists.isEmpty(theme.config.about.authorInfoRightTags)}"
@@ -828,7 +828,7 @@
                                     <time class="datatime reward-list-item-time">[[${authorReward.datatime}]]</time>
                                 </div>
                             </div>
- 
+
                         </div>
                     </div>
                 </div>
@@ -845,4 +845,4 @@
 
 </th:block>
 
-</html>
+</html>