Merge remote-tracking branch 'origin/main'

templates/assets/icon/demo_index.html

@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon haofont">&#xe821;</span>
+                <div class="name">moon-clear-fill</div>
+                <div class="code-name">&amp;#xe821;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon haofont">&#xe698;</span>
+                <div class="name">eicon_train-line</div>
+                <div class="code-name">&amp;#xe698;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon haofont">&#xe6fd;</span>
                 <div class="name">disc-fill</div>
@@ -894,18 +906,6 @@
                 <div class="code-name">&amp;#xe65a;</div>
               </li>
           
-            <li class="dib">
-              <span class="icon haofont">&#xe65b;</span>
-                <div class="name">jike</div>
-                <div class="code-name">&amp;#xe65b;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon haofont">&#xe65c;</span>
-                <div class="name">jike</div>
-                <div class="code-name">&amp;#xe65c;</div>
-              </li>
-          
             <li class="dib">
               <span class="icon haofont">&#xe65d;</span>
                 <div class="name">heartbeat</div>
@@ -1092,12 +1092,12 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'haofont';
-  src: url('iconfont.eot?t=1699690237296'); /* IE9 */
+  src: url('iconfont.eot?t=1699854542133'); /* IE9 */
-  src: url('iconfont.eot?t=1699690237296#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  src: url('iconfont.eot?t=1699854542133#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('iconfont.woff2?t=1699690237296') format('woff2'),
+       url('iconfont.woff2?t=1699854542133') format('woff2'),
-       url('iconfont.woff?t=1699690237296') format('woff'),
+       url('iconfont.woff?t=1699854542133') format('woff'),
-       url('iconfont.ttf?t=1699690237296') format('truetype'),
+       url('iconfont.ttf?t=1699854542133') format('truetype'),
-       url('iconfont.svg?t=1699690237296#haofont') format('svg');
+       url('iconfont.svg?t=1699854542133#haofont') format('svg');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1123,6 +1123,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon haofont hao-icon-moon-clear-fill"></span>
+            <div class="name">
+              moon-clear-fill
+            </div>
+            <div class="code-name">.hao-icon-moon-clear-fill
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon haofont hao-icon-eicon_train-line"></span>
+            <div class="name">
+              eicon_train-line
+            </div>
+            <div class="code-name">.hao-icon-eicon_train-line
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon haofont hao-icon-disc-fill"></span>
             <div class="name">
@@ -2383,24 +2401,6 @@
             </div>
           </li>
           
-          <li class="dib">
-            <span class="icon haofont hao-icon-a-2"></span>
-            <div class="name">
-              jike
-            </div>
-            <div class="code-name">.hao-icon-a-2
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon haofont hao-icon-jike"></span>
-            <div class="name">
-              jike
-            </div>
-            <div class="code-name">.hao-icon-jike
-            </div>
-          </li>
-          
           <li class="dib">
             <span class="icon haofont hao-icon-heartbeat1"></span>
             <div class="name">
@@ -2680,6 +2680,22 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#hao-icon-moon-clear-fill"></use>
+                </svg>
+                <div class="name">moon-clear-fill</div>
+                <div class="code-name">#hao-icon-moon-clear-fill</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#hao-icon-eicon_train-line"></use>
+                </svg>
+                <div class="name">eicon_train-line</div>
+                <div class="code-name">#hao-icon-eicon_train-line</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#hao-icon-disc-fill"></use>
@@ -3800,22 +3816,6 @@
                 <div class="code-name">#hao-icon-heartbeat</div>
             </li>
           
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#hao-icon-a-2"></use>
-                </svg>
-                <div class="name">jike</div>
-                <div class="code-name">#hao-icon-a-2</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#hao-icon-jike"></use>
-                </svg>
-                <div class="name">jike</div>
-                <div class="code-name">#hao-icon-jike</div>
-            </li>
-          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#hao-icon-heartbeat1"></use>

templates/assets/icon/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: "haofont"; /* Project id 4159149 */
-  src: url('iconfont.eot?t=1699690237296'); /* IE9 */
+  src: url('iconfont.eot?t=1699854542133'); /* IE9 */
-  src: url('iconfont.eot?t=1699690237296#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  src: url('iconfont.eot?t=1699854542133#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('iconfont.woff2?t=1699690237296') format('woff2'),
+       url('iconfont.woff2?t=1699854542133') format('woff2'),
-       url('iconfont.woff?t=1699690237296') format('woff'),
+       url('iconfont.woff?t=1699854542133') format('woff'),
-       url('iconfont.ttf?t=1699690237296') format('truetype'),
+       url('iconfont.ttf?t=1699854542133') format('truetype'),
-       url('iconfont.svg?t=1699690237296#haofont') format('svg');
+       url('iconfont.svg?t=1699854542133#haofont') format('svg');
 }
 
 .haofont {
@@ -16,6 +16,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.hao-icon-moon-clear-fill:before {
+  content: "\e821";
+}
+
+.hao-icon-eicon_train-line:before {
+  content: "\e698";
+}
+
 .hao-icon-disc-fill:before {
   content: "\e6fd";
 }
@@ -576,14 +584,6 @@
   content: "\e65a";
 }
 
-.hao-icon-a-2:before {
-  content: "\e65b";
-}
-
-.hao-icon-jike:before {
-  content: "\e65c";
-}
-
 .hao-icon-heartbeat1:before {
   content: "\e65d";
 }

templates/assets/icon/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "hao-icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "17511807",
+      "name": "moon-clear-fill",
+      "font_class": "moon-clear-fill",
+      "unicode": "e821",
+      "unicode_decimal": 59425
+    },
+    {
+      "icon_id": "22554653",
+      "name": "eicon_train-line",
+      "font_class": "eicon_train-line",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
     {
       "icon_id": "8555184",
       "name": "disc-fill",
@@ -985,20 +999,6 @@
       "unicode": "e65a",
       "unicode_decimal": 58970
     },
-    {
-      "icon_id": "35014836",
-      "name": "jike",
-      "font_class": "a-2",
-      "unicode": "e65b",
-      "unicode_decimal": 58971
-    },
-    {
-      "icon_id": "35015039",
-      "name": "jike",
-      "font_class": "jike",
-      "unicode": "e65c",
-      "unicode_decimal": 58972
-    },
     {
       "icon_id": "35015857",
       "name": "heartbeat",

templates/modules/widgets/console.html

@@ -115,7 +115,7 @@
   <div class="button-group">
     <div class="console-btn-item">
       <a class="darkmode_switchbutton" href="javascript:void(0);" onclick="navFn.switchDarkMode();" rel="external nofollow"
-         title="显示模式切换"><i class="haofont hao-icon-moon" style="font-size:1rem"></i>
+         title="显示模式切换"><i class="haofont hao-icon-moon-clear-fill" style="font-size:1rem"></i>
       </a>
     </div>
     <div class="console-btn-item" id="consoleHideAside" onclick="heo.hideAsideBtn()" title="边栏显示控制"><a

templates/modules/widgets/nav-right.html

@@ -10,7 +10,7 @@
     <div class="nav-button only-home" id="travellings_button" title="随机前往一个开往项目网站" th:if="${theme.config.nav.right.travelling}">
         <a class="site-page" onclick="totraveling()" href="javascript:void(0);"  rel="external nofollow"
            title="随机前往一个开往项目网站">
-            <i class="haofont hao-icon-train" style="font-size: 0.94rem"></i>
+            <i class="haofont hao-icon-eicon_train-line"></i>
         </a>
     </div>
 
@@ -24,7 +24,7 @@
     <div class="nav-button" id="darkmode_button" th:if="${theme.config.nav.right.darkMode}">
         <a class="console_switchbutton" href="javascript:void(0);"  onclick="navFn.switchDarkMode();" rel="external nofollow"
            title="切换模式 - 日夜交替，黑白互换。">
-            <i class="haofont hao-icon-circle-half-stroke" style="font-size: 1rem; font-weight: 700;"></i>
+            <i class="haofont hao-icon-moon-clear-fill" style="font-size: 1rem;"></i>
         </a>
     </div>
 

templates/modules/widgets/right-menu.html

@@ -108,7 +108,7 @@
                 <span class="menu-commentBarrage-text">关闭热评</span>
             </div>
             <div class="rightMenu-item" id="menu-darkmode">
-                <i class="haofont hao-icon-circle-half-stroke"></i>
+                <i class="haofont hao-icon-moon-clear-fill" style="font-size: 19px;"></i>
                 <span class="menu-darkmode-text">深色模式</span>
             </div>
             <div th:if="${theme.config.style.translate.translateEnable}" class="rightMenu-item" id="menu-translate">