Merge pull request #70 from liuzhihang/dev

Dev

templates/assets/libs/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
     font-family: "iconfont"; /* Project id 3736806 */
-  src: url('iconfont.woff2?t=1668835494725') format('woff2'),
+    src: url('iconfont.woff2?t=1675495619599') format('woff2'),
-       url('iconfont.woff?t=1668835494725') format('woff'),
+    url('iconfont.woff?t=1675495619599') format('woff'),
-       url('iconfont.ttf?t=1668835494725') format('truetype');
+    url('iconfont.ttf?t=1675495619599') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
     -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-arrows-alt-h:before {
+    content: "\ef28";
+}
+
+.icon-plus-circle:before {
+    content: "\f082";
+}
+
 .icon-csdn1:before {
     content: "\e608";
 }

templates/assets/libs/iconfont/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "5633818",
+      "name": "arrows-alt-h",
+      "font_class": "arrows-alt-h",
+      "unicode": "ef28",
+      "unicode_decimal": 61224
+    },
+    {
+      "icon_id": "5634298",
+      "name": "plus-circle",
+      "font_class": "plus-circle",
+      "unicode": "f082",
+      "unicode_decimal": 61570
+    },
     {
       "icon_id": "3506983",
       "name": "csdn",

templates/links.html

@@ -20,7 +20,7 @@
                         <!--    <span class="banner-button-text">随机访问</span>-->
                         <!--</a>-->
                         <a class="banner-button" href="#post-comment" rel="external nofollow">
-                            <i class="fas fa-circle-chevron-right"></i>
+                            <i class="iconfont icon-link"></i>
                             <span class="banner-button-text">申请友链</span>
                         </a>
                     </div>

templates/modules/head.html

@@ -18,8 +18,6 @@
     
     <link rel="stylesheet" th:href="@{/assets/zhheo/custom.css}">
     
-    <link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/6.2.0/css/all.min.css">
-    
     <link media="print"
           onload='this.media="all"'
           rel="stylesheet"

templates/modules/layouts/layout.html

@@ -49,17 +49,17 @@
 <th:block th:replace="${content}"></th:block>
 
 <!-- todo 暂时没显示，是右下角悬浮操作按钮 -->
-<div id="rightside">
+<!--<div id="rightside">-->
-    <div id="rightside-config-hide">
+<!--    <div id="rightside-config-hide">-->
-        <button id="translateLink" title="简繁转换" type="button">简</button>
+<!--        <button id="translateLink" title="简繁转换" type="button">简</button>-->
-        <button id="darkmode" title="浅色和深色模式转换" type="button"><i class="fas fa-adjust"></i></button>
+<!--        <button id="darkmode" title="浅色和深色模式转换" type="button"><i class="fas fa-adjust"></i></button>-->
-        <button id="hide-aside-btn" title="单栏和双栏切换" type="button"><i class="fas fa-arrows-alt-h"></i></button>
+<!--        <button id="hide-aside-btn" title="单栏和双栏切换" type="button"><i class="fas fa-arrows-alt-h"></i></button>-->
-    </div>
+<!--    </div>-->
-    <div id="rightside-config-show">
+<!--    <div id="rightside-config-show">-->
-        <button id="rightside_config" title="设置" type="button"><i class="fas fa-cog fa-spin"></i></button>
+<!--        <button id="rightside_config" title="设置" type="button"><i class="fas fa-cog fa-spin"></i></button>-->
-        <button id="go-up" title="回到顶部" type="button"><i class="fas fa-arrow-up"></i></button>
+<!--        <button id="go-up" title="回到顶部" type="button"><i class="fas fa-arrow-up"></i></button>-->
-    </div>
+<!--    </div>-->
-</div>
+<!--</div>-->
 
 <div th:replace="modules/right-menu :: right-menu"></div>
 

templates/modules/sidebar.html

@@ -71,7 +71,7 @@
             </div>
             <div class="menus_item">
                 <a class="site-page" href="javascript:void(0);" rel="external nofollow">
-                    <span>专栏</span><i class="fas fa-chevron-down expand"></i>
+                    <span>专栏</span><i class="iconfont icon-chevron-down"></i>
                 </a>
                 <ul class="menus_item_child" th:with="categories = ${categoryFinder.listAll()}">
                     <li th:each="category : ${categories}">
@@ -108,7 +108,7 @@
         <span class="sidebar-menu-item-title">标签</span>
         <div class="card-widget card-tags card-archives card-webinfo card-allinfo"
              th:with="tags = ${tagFinder.listAll()}">
-            <div class="item-headline"><i class="fas fa-tags"></i><span>标签</span></div>
+            <div class="item-headline"><i class="iconfont icon-tags"></i><span>标签</span></div>
             <div class="card-tag-cloud">
                 <a style="font-size:1em;color:#d3d3d3" th:each="tag : ${tags}"
                    th:href="@{${tag.status.permalink}}"

templates/modules/widgets/top-group.html

@@ -57,7 +57,7 @@
         </div>
         <div class="banner-button-group">
             <a class="banner-button" onclick="window.event.cancelBubble=!0;heo.hideTodayCard()">
-                <i class="fas fa-circle-plus"></i>
+                <i class="iconfont icon-plus-circle"></i>
                 <span class="banner-button-text">更多推荐</span>
             </a>
         </div>