hexo-theme-volantis 5.0.0-rc.2 → 5.0.0-rc.3

package/_config.yml

@@ -18,7 +18,7 @@ default:
 ############################### Volantis ###############################
 info:
   theme_name: Volantis # This is theme's name.
-  theme_version: '5.0.0-rc.2' # This is theme's version.
+  theme_version: '5.0.0-rc.3' # This is theme's version.
   theme_docs: https://volantis.js.org/ # This is theme's URL.
   theme_repo: https://github.com/volantis-x/hexo-theme-volantis
 # Debug 调试模式
@@ -28,11 +28,11 @@ debug: false
 # 默认使用 https://cdn.jsdelivr.net/npm/hexo-theme-volantis@<%- theme.info.theme_version %>/source/js/*.min.js 的CDN压缩版本(min.js)，注意版本号对应关系！！可以通过修改以下配置项覆盖
 # 开发者注意 cdn.enable 设置为 false
 cdn:
-  enable: true
+  enable: false
   # CDN 前缀，为空使用默认值，链接最后不加 "/",
   # 例如： https://cdn.jsdelivr.net/gh/volantis-x/volantis-x.github.io@gh-page 填写最后编译生成的源码CDN地址前缀，此路径下应该含有/js与/css目录,
   # 该配置默认值是："https://cdn.jsdelivr.net/npm/hexo-theme-volantis@"+ theme.info.theme_version +"/source"
-  prefix: https://npm.elemecdn.com/hexo-theme-volantis@5.0.0-rc.2/source
+  prefix: https://npm.elemecdn.com/hexo-theme-volantis@5.0.0-rc.3/source
   # 以下配置可以覆盖 cdn.prefix,配置项的值可以为空，但是要使用CDN必须依据路径填写配置项的键
   set:
     js:
@@ -57,22 +57,22 @@ navbar:
     title:
   menu:
     - name: 博客
-      icon: fas fa-rss
+      icon: fa-solid fa-rss
       url: /
     - name: 分类
-      icon: fas fa-folder-open
+      icon: fa-solid fa-folder-open
       url: categories/
     - name: 标签
-      icon: fas fa-tags
+      icon: fa-solid fa-tags
       url: tags/
     - name: 归档
-      icon: fas fa-archive
+      icon: fa-solid fa-archive
       url: archives/
     - name: 友链
-      icon: fas fa-link
+      icon: fa-solid fa-link
       url: friends/
     - name: 关于
-      icon: fas fa-info-circle
+      icon: fa-solid fa-info-circle
       url: about/
   search: Search...   # Search bar placeholder
 ############################### Navigation Bar ############################### > end
@@ -156,7 +156,7 @@ article:
       # 参考资料、相关资料等 (for layout: post/docs)
       references:
         title: 参考资料
-        icon: fas fa-quote-left
+        icon: fa-solid fa-quote-left
         # 在 front-matter 中:
         #   references:
         #     - title: 某篇文章
@@ -168,7 +168,7 @@ article:
       related_posts:
         enable: false
         title: 相关文章
-        icon: fas fa-bookmark
+        icon: fa-solid fa-bookmark
         max_count: 5
         # 设为空则不使用文章头图
         placeholder_img: https://uploadbeta.com/api/pictures/random/?key=BingEverydayWallpaperPicture
@@ -200,35 +200,35 @@ article:
         url: /
       # 文章创建日期
       date:
-        icon: fas fa-calendar-alt
+        icon: fa-solid fa-calendar-alt
         title: '发布于：'
         format: 'll' # 日期格式 http://momentjs.com/docs/
       # 文章更新日期
       updated:
-        icon: fas fa-edit
+        icon: fa-solid fa-edit
         title: '更新于：'
         format: 'll' # 日期格式 http://momentjs.com/docs/
       # 文章分类
       category:
-        icon: fas fa-folder-open
+        icon: fa-solid fa-folder-open
       # 文章浏览计数
       counter:
-        icon: fas fa-eye
+        icon: fa-solid fa-eye
         unit: '次浏览'
       # 文章评论数量：支持 valine和waline
       valinecount:
-        icon: fas fa-comment-dots
+        icon: fa-solid fa-comment-dots
         desc: '' # 条评论
       walinecount:
-        icon: fas fa-comment-dots
+        icon: fa-solid fa-comment-dots
         desc: '' # 条评论
       # 文章字数和阅读时长
       wordcount:
-        icon_wordcount: fas fa-keyboard
-        icon_duration: fas fa-hourglass-half
+        icon_wordcount: fa-solid fa-keyboard
+        icon_duration: fa-solid fa-hourglass-half
       # 文章标签
       tags:
-        icon: fas fa-hashtag
+        icon: fa-solid fa-hashtag
       # 分享
       share:
         - id: qq
@@ -246,7 +246,7 @@ article:
 
 ############################### Comments ############################### > start
 comments:
-  title: <i class='fas fa-comments'></i> 评论
+  title: <i class='fa-solid fa-comments'></i> 评论
   subtitle:
   service: giscus
   # 可选评论系统 #
@@ -274,8 +274,8 @@ comments:
   # https://github.com/laymonage/giscus
   giscus:
     theme:
-      light: https://cdn.jsdelivr.net/gh/volantis-x/cdn-volantis@master/css/giscus/light.css
-      dark: https://cdn.jsdelivr.net/gh/volantis-x/cdn-volantis@master/css/giscus/dark.css
+      light: "light" # https://cdn.jsdelivr.net/gh/volantis-x/cdn-volantis@master/css/giscus/light.css
+      dark: "dark" # https://cdn.jsdelivr.net/gh/volantis-x/cdn-volantis@master/css/giscus/dark.css
     # 以下配置按照 yml 格式增删填写即可
     # repo: xxx/xxx
     # repo-id: xxx
@@ -284,6 +284,7 @@ comments:
     # mapping: "pathname"
     # reactions-enabled: "1"
     # emit-metadata: "0"
+    # lang: "zh-CN"
 
   # beaudar
   # https://beaudar.lipk.org/
@@ -452,13 +453,13 @@ sidebar:
       subtitle:
       jinrishici: true # Poetry Today. You can set a string, and it will be displayed when loading fails.
       social:
-        - icon: fas fa-rss
+        - icon: fa-solid fa-rss
           url: /atom.xml
-        - icon: fas fa-envelope
+        - icon: fa-solid fa-envelope
           url: mailto:me@xxx.com
         - icon: fab fa-github
           url: https://github.com/volantis-x/
-        - icon: fas fa-headphones-alt
+        - icon: fa-solid fa-headphones-alt
           url: /
     # ---------------------------------------
     # toc widget (valid only in articles)
@@ -466,7 +467,7 @@ sidebar:
       class: toc
       display: [desktop, mobile] # [desktop, mobile]
       header:
-        icon: fas fa-list
+        icon: fa-solid fa-list
         title: 本文目录
       list_number: false
       min_depth: 2
@@ -483,7 +484,7 @@ sidebar:
       class: category
       display: [desktop] # [desktop, mobile]
       header:
-        icon: fas fa-folder-open
+        icon: fa-solid fa-folder-open
         title: 文章分类
         url: /blog/categories/
     # ---------------------------------------
@@ -492,7 +493,7 @@ sidebar:
       class: tagcloud
       display: [desktop, mobile] # [desktop, mobile]
       header:
-        icon: fas fa-tags
+        icon: fa-solid fa-tags
         title: 热门标签
         url: /blog/tags/
       min_font: 14
@@ -515,7 +516,7 @@ sidebar:
       class: webinfo
       display: [desktop]
       header:
-        icon: fas fa-award
+        icon: fa-solid fa-award
         title: 站点信息
       type:
         article:
@@ -552,7 +553,7 @@ sidebar:
       class: lastupdate
       display: [desktop, mobile]
       header:
-        icon: fas fa-clock WISTERIA
+        icon: fa-solid fa-clock WISTERIA
         title: 最近更新
 ############################### Sidebar ############################### > end
 
@@ -564,7 +565,7 @@ tag_plugins:
   note: # style for default note:
     icon: '\f054'
     color: ''
-    iconfont: 'Font Awesome 5 Free'
+    iconfont: 'Font Awesome 6 Free'
   # {% checkbox %}
   checkbox:
     interactive: false # enable interactive for user
@@ -580,7 +581,7 @@ site_footer:
   # layout of footer: [aplayer, social, license, info, copyright]
   layout: [aplayer, social, license, analytics, info, copyright]
   social:
-    - icon: #fas fa-rss
+    - icon: #fa-solid fa-rss
       url:
     # or
     - img:
@@ -592,8 +593,8 @@ site_footer:
   source: https://github.com/volantis-x/volantis-docs/
   # analytics using leancloud
   analytics: >
-    <span id="lc-sv">本站总访问量为 <span id='number'><i class="fas fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span> 次</span>
-    <span id="lc-uv">访客数为 <span id='number'><i class="fas fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span> 人</span>
+    <span id="lc-sv">本站总访问量为 <span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span> 次</span>
+    <span id="lc-uv">访客数为 <span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span> 人</span>
   # site copyright
   copyright: '[Copyright © 2017-2020 XXX](/)'
   # You can add your own property here. (Support markdown, for example: br: '<br>')
@@ -701,7 +702,8 @@ plugins:
     css: /libs/node-waves/dist/waves.min.css # https://cdn.jsdelivr.net/npm/node-waves@0.7.6/dist/waves.min.css
     js: /libs/node-waves/dist/waves.min.js # https://cdn.jsdelivr.net/npm/node-waves@0.7.6/dist/waves.min.js
 
-  # fontawesome animation
+  # fontawesome V6:  https://fontawesome.com/docs/web/style/animate
+  # fontawesome animation for fontawesome V5
   fontawesome_animation:
     enable: #true
     css: /libs/font-awesome-animation/font-awesome-animation.min.css # https://cdn.jsdelivr.net/gh/l-lin/font-awesome-animation/dist/font-awesome-animation.min.css
@@ -780,7 +782,7 @@ plugins:
   # 暗黑模式 darkmode
   # 开关按钮：在 navbar.menu 中添加：
   # - name: 暗黑模式 # 可自定义
-  #   icon: fas fa-moon # 可自定义
+  #   icon: fa-solid fa-moon # 可自定义
   #   toggle: darkmode
   darkmode:
     enable: #true
@@ -865,8 +867,8 @@ plugins:
   message:
     enable: true
     icon:     # 默认图标，支持对图标添加颜色，可选值：see：/source/css/_style/_plugins/fontcolor.styl
-      default: fas fa-info-circle light-blue
-      quection: fas fa-question-circle light-blue
+      default: fa-solid fa-info-circle light-blue
+      quection: fa-solid fa-question-circle light-blue
     time:     # 默认持续时间
       default: 5000
       quection: 20000
@@ -884,8 +886,8 @@ plugins:
       icon: 'far fa-copyright light-blue'
     aplayer:                              # 是否开启音乐通知；播放、暂停、失败 时的图标
       enable: true
-      play: fas fa-play
-      pause: fas fa-pause
+      play: fa-solid fa-play
+      pause: fa-solid fa-pause
     rightmenu:                            
       enable: true                        # 是否开启右键模块的消息通知
       notice: true                        # 唤醒原右键菜单的通知 
@@ -927,7 +929,7 @@ plugins:
 # 自定义右键菜单
 rightmenu:
   enable: true
-  faicon: fa              # 公共图标类型 fa fal fas fad
+  faicon: fa              # 公共图标类型 fa fal fa-solid fa-duotone
   # hr: 分割线, music: 音乐控制器
   layout: [home, hr, help, examples, contributors, hr, source_docs, source_theme, hr, print, darkmode, reading, music]
   ### 可选功能项 ###

package/layout/_meta/counter.ejs

@@ -9,7 +9,7 @@
       %>
       <div id="lc-pv" data-title="<%- post.title || page.title %>" data-path="<%- url_for(path) %>">
         <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
-        <span id='number'><i class="fas fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span>
+        <span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span>
         <%- theme.article.body.meta_library.counter.unit %>
       </div>
     </a>
@@ -20,7 +20,7 @@
       <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
       <p>
         <span id="busuanzi_value_page_pv">
-          <i class="fas fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i>
+          <i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i>
         </span>
         <%- theme.article.body.meta_library.counter.unit %>
       </p>

package/layout/_partial/_cover/search.ejs

@@ -15,7 +15,7 @@
       <div class="m_search">
         <form name="searchform" class="form u-search-form">
           <input type="text" class="input u-search-input" placeholder="<%- theme.cover && theme.cover.search %>" />
-          <i class="icon fas fa-search fa-fw"></i>
+          <i class="icon fa-solid fa-search fa-fw"></i>
         </form>
       </div>
     <% } %>

package/layout/_partial/archive.ejs

@@ -47,7 +47,7 @@
         <% if (page.prev != 0) { %>
           <a class="prev" rel="prev" href="<%= url_for(page.prev_link) %>">
             <section class="post prev white-box <%- theme.custom_css.body.effect.join(' ') %>" >
-              <i class="fas fa-chevron-left" aria-hidden="true"></i>&nbsp;<%- __('post.prev_page') %>&nbsp;
+              <i class="fa-solid fa-chevron-left" aria-hidden="true"></i>&nbsp;<%- __('post.prev_page') %>&nbsp;
             </section>
           </a>
         <% } %>
@@ -57,7 +57,7 @@
         <% if (page.next != 0) { %>
           <a class="next" rel="next" href="<%= url_for(page.next_link) %>">
             <section class="post next white-box <%- theme.custom_css.body.effect.join(' ') %>">
-              &nbsp;<%- __('post.next_page') %>&nbsp;<i class="fas fa-chevron-right" aria-hidden="true"></i>
+              &nbsp;<%- __('post.next_page') %>&nbsp;<i class="fa-solid fa-chevron-right" aria-hidden="true"></i>
             </section>
           </a>
         <% } %>

package/layout/_partial/article.ejs

@@ -96,13 +96,13 @@
       <div class="prev-next">
         <% if (prev.path) { %>
           <a class='prev' href='<%- url_for(prev.path) %>'>
-            <p class='title'><i class="fas fa-chevron-left" aria-hidden="true"></i><%- prev.title || '' %></p>
+            <p class='title'><i class="fa-solid fa-chevron-left" aria-hidden="true"></i><%- prev.title || '' %></p>
             <p class='content'><%- prev.exp %></p>
           </a>
         <% } %>
         <% if (next.path) { %>
           <a class='next' href='<%- url_for(next.path) %>'>
-            <p class='title'><%- next.title || '' %><i class="fas fa-chevron-right" aria-hidden="true"></i></p>
+            <p class='title'><%- next.title || '' %><i class="fa-solid fa-chevron-right" aria-hidden="true"></i></p>
             <p class='content'><%- next.exp %></p>
           </a>
         <% } %>
@@ -114,13 +114,13 @@
     <div class="prev-next">
       <% if (post.prev) { %>
         <a class='prev' href='<%- url_for(post.prev.path) %>'>
-          <p class='title'><i class="fas fa-chevron-left" aria-hidden="true"></i><%- post.prev.title || '' %></p>
+          <p class='title'><i class="fa-solid fa-chevron-left" aria-hidden="true"></i><%- post.prev.title || '' %></p>
           <p class='content'><%- truncate(strip_html(page.prev.content), {length: 100}) %></p>
         </a>
       <% } %>
       <% if (post.next) { %>
         <a class='next' href='<%- url_for(post.next.path) %>'>
-          <p class='title'><%- post.next.title || '' %><i class="fas fa-chevron-right" aria-hidden="true"></i></p>
+          <p class='title'><%- post.next.title || '' %><i class="fa-solid fa-chevron-right" aria-hidden="true"></i></p>
           <p class='content'><%- truncate(strip_html(page.next.content), {length: 100}) %></p>
         </a>
       <% } %>

package/layout/_partial/categories.ejs

@@ -6,6 +6,6 @@
     });
     %>
     <div class='metatag cats'>
-        <i class="fas fa-folder-open fa-fw" aria-hidden="true"></i>&nbsp;<%- cats.join('&nbsp;/&nbsp;') %>
+        <i class="fa-solid fa-folder-open fa-fw" aria-hidden="true"></i>&nbsp;<%- cats.join('&nbsp;/&nbsp;') %>
     </div>
 <% } %>

package/layout/_partial/footer.ejs

@@ -41,7 +41,7 @@
         <%- __('footer.use') %>
         <a href="https://github.com/volantis-x/hexo-theme-volantis/tree/<%- theme_version %>" target="_blank" class="codename">Volantis</a>
         <%- __('footer.theme') %><% if (theme.analytics.busuanzi) { %><%- __('symbol.comma') %><%- __('footer.total_views') %>
-          <span id="busuanzi_value_site_pv"><i class="fas fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span>
+          <span id="busuanzi_value_site_pv"><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span>
           <%- __('footer.times') %>
         <% } %>
       <% } else if (item == 'source') { %>

package/layout/_partial/head.ejs

@@ -26,7 +26,13 @@
   <%- open_graph(theme.open_graph) %>
   <!-- feed -->
   <%_ if (config.feed && config.feed.path){ _%>
-    <%- feed_tag(config.feed.path, {title: config.title}) %>
+    <%_ if (typeof(config.feed.path)=="string"){ _%>
+      <%- feed_tag(config.feed.path, {title: config.title}) %>
+    <%_ }else{ _%>
+      <%_ ([...config.feed.path]).forEach(function(item){ _%>
+        <%- feed_tag(item, {title: config.title}) %>
+      <%_ }) _%>
+    <%_ } _%>
   <%_ } _%>
   <!-- import meta -->
   <%_ if (config.import && config.import.meta){ _%>

package/layout/_partial/header.ejs

@@ -4,9 +4,9 @@
     <div class='nav-sub'>
       <p class="title"></p>
       <ul class='switcher nav-list-h m-phone' id="pjax-header-nav-list">
-        <li><a id="s-comment" class="fas fa-comments fa-fw" target="_self"  href="/" onclick="return false;" title="comment"></a></li>
+        <li><a id="s-comment" class="fa-solid fa-comments fa-fw" target="_self"  href="/" onclick="return false;" title="comment"></a></li>
         <% if (page.sidebar == undefined || page.sidebar != false) { %>
-          <li><a id="s-toc" class="s-toc fas fa-list fa-fw" target="_self"  href="/" onclick="return false;" title="toc"></a></li>
+          <li><a id="s-toc" class="s-toc fa-solid fa-list fa-fw" target="_self"  href="/" onclick="return false;" title="toc"></a></li>
         <% } %>
       </ul>
     </div>
@@ -93,7 +93,7 @@
       <% if (theme.search.enable) { %>
       <div class="m_search">
         <form name="searchform" class="form u-search-form">
-          <i class="icon fas fa-search fa-fw"></i>
+          <i class="icon fa-solid fa-search fa-fw"></i>
           <input type="text" class="input u-search-input" placeholder="<%- theme.navbar && theme.navbar.search %>" />
         </form>
       </div>
@@ -101,10 +101,10 @@
 
 			<ul class='switcher nav-list-h m-phone'>
 				<% if (theme.search.enable === true) { %>
-					<li><a class="s-search fas fa-search fa-fw" target="_self" href="/" onclick="return false;" title="search"></a></li>
+					<li><a class="s-search fa-solid fa-search fa-fw" target="_self" href="/" onclick="return false;" title="search"></a></li>
 				<% } %>
 				<li>
-          <a class="s-menu fas fa-bars fa-fw" target="_self" href="/" onclick="return false;" title="menu"></a>
+          <a class="s-menu fa-solid fa-bars fa-fw" target="_self" href="/" onclick="return false;" title="menu"></a>
           <ul class="menu-phone list-v navigation white-box">
             <% menu_list.forEach(function(value){ %>
               <% menu(value, 'mobile') %>

package/layout/_partial/scripts/_ctrl/cdnCtrl.ejs

@@ -14,7 +14,7 @@
   theme.cdn.map.css={}
   theme.cdn.addJS=(name,source,force)=>{
     if(force){
-      theme.cdn.map.js[name]=force
+      theme.cdn.map.js[name]=force + '?time=' + Date.now()
     }else{
       if(!source){
         source=name
@@ -32,7 +32,7 @@
   }
   theme.cdn.addCSS=(name,source,force)=>{
     if(force){
-      theme.cdn.map.css[name]=force
+      theme.cdn.map.css[name]=force + '?time=' + Date.now()
     }else{
       if(!source){
         source=name

package/layout/_partial/scripts/global.ejs

@@ -2,10 +2,43 @@
   /************这个文件存放不需要重载的全局变量和全局函数*********/
   window.volantis = {}; // volantis 全局变量
   volantis.debug = <%- theme.debug %>; // 开启调试模式
-  volantis.WEBCONFIG = <%- JSON.stringify(config) %>;
-  volantis.THEMECONFIG = <%- JSON.stringify(theme) %>;
-  volantis.LASTUPDATE = new Date('<%- new Date() %>');
   volantis.dom = {}; // 页面Dom see: /source/js/app.js etc.
+
+  volantis.GLOBAL_CONFIG ={
+    cdn: <%- JSON.stringify(theme.cdn.map) %>,
+    default: <%- JSON.stringify(theme.default) %>,
+    lastupdate: new Date('<%- new Date() %>'),
+    sidebar: {
+      for_page: <%- JSON.stringify(theme.sidebar.for_page) %>,
+      for_post: <%- JSON.stringify(theme.sidebar.for_post) %>,
+      webinfo: {
+        lastupd: {
+          enable: <%- JSON.stringify(theme.sidebar.widget_library.webinfo.type.lastupd.enable) %>,
+          friendlyShow: <%- JSON.stringify(theme.sidebar.widget_library.webinfo.type.lastupd.friendlyShow) %>
+        },
+        runtime: {
+          data: <%- JSON.stringify(theme.sidebar.widget_library.webinfo.type.runtime.data) %>,
+          unit: <%- JSON.stringify(theme.sidebar.widget_library.webinfo.type.runtime.unit) %>
+        }
+      }
+    },
+    plugins: {
+      message: <%- JSON.stringify(theme.plugins.message) %>,
+      fancybox: <%- JSON.stringify(theme.plugins.fancybox) %>,
+      aplayer: {
+        id: <%- JSON.stringify(theme.plugins.aplayer.id) %>,
+        enable:<%- JSON.stringify(theme.plugins.aplayer.enable) %>
+      },
+      rightmenu: {
+        faicon: <%- JSON.stringify(theme.rightmenu.faicon) %>,
+        layout: <%- JSON.stringify(theme.rightmenu.layout) %>,
+        music_alwaysShow: <%- JSON.stringify(theme.rightmenu.music.alwaysShow) %>,
+        customPicUrl: <%- JSON.stringify(theme.rightmenu.customPicUrl) %>,
+        print: <%- JSON.stringify(theme.rightmenu.print.defaultStyles) %>
+      }
+    }
+  }
+
   /******************** volantis.EventListener ********************************/
   // 事件监听器 see: /source/js/app.js
   volantis.EventListener = {}

package/layout/_plugins/aplayer/script.ejs

@@ -24,8 +24,8 @@
           setTimeout(() => {
             Metings.forEach((item, index) => {
               const aplayerItem = item.aplayer; if(!aplayerItem) return;
-              const rightAplayerCheck = volantis.THEMECONFIG.rightmenu.layout.includes('music') 
-                && item.meta.id === volantis.THEMECONFIG.plugins.aplayer.id;
+              const rightAplayerCheck = '<%= theme.rightmenu.layout.includes("music") %>' === 'true'
+                && item.meta.id === '<%= theme.plugins.aplayer.id %>'; 
               if(rightAplayerCheck) RightMenuAplayer.checkAPlayer();
               if(aplayerItem.events.events.play.every(item => {return item.name !== 'messagePlay'})) {
                 aplayerItem.on('play', function messagePlay() {

package/layout/_plugins/comments/artalk/script.ejs

@@ -1,5 +1,5 @@
 <script>
-  volantis.layoutHelper("comments",`<div id="artalk_container"><i class="fas fa-cog fa-spin fa-fw fa-2x"></i></div>`);
+  volantis.layoutHelper("comments",`<div id="artalk_container"><i class="fa-solid fa-cog fa-spin fa-fw fa-2x"></i></div>`);
   function load_artalk() {
     if(!document.querySelectorAll("#artalk_container")[0])return;
     volantis.css("<%- theme.comments.artalk.css %>");

package/layout/_plugins/comments/disqus/script.ejs

@@ -1,6 +1,6 @@
 <script>
   volantis.layoutHelper("comments",`<div id="disqus_thread">
-    <div id="notShowDisqus" style="display: none;text-align: center;"><i class='fas fa-exclamation-triangle'></i>&nbsp;<%- __('post.comments_placeholder', 'Disqus') %></div>
+    <div id="notShowDisqus" style="display: none;text-align: center;"><i class='fa-solid fa-exclamation-triangle'></i>&nbsp;<%- __('post.comments_placeholder', 'Disqus') %></div>
     <div id="load-btns"><a class="load-comments" onclick="needLoadDisqus()"><%- __('post.comments_load', 'Disqus') %></a></div>
     <div id="loading-comments" style="display: none"><i class="fa fa-cog fa-spin fa-fw fa-2x"></i><br><%- __('post.comments_check', 'Disqus') %></div>
   </div>

package/layout/_plugins/comments/livere/script.ejs

@@ -1,6 +1,6 @@
 <script>
   volantis.layoutHelper("comments",`<div id="lv-container" data-id="city" data-uid="<%= theme.comments.livere.uid %>">
-  <noscript><div><i class='fas fa-exclamation-triangle'>&nbsp;<%- __('post.comments_placeholder', 'Livere') %></div></noscript>
+  <noscript><div><i class='fa-solid fa-exclamation-triangle'>&nbsp;<%- __('post.comments_placeholder', 'Livere') %></div></noscript>
 </div>`)
 </script>
 <script data-pjax type="text/javascript">

package/layout/_plugins/comments/minivaline/script.ejs

@@ -1,5 +1,5 @@
 <script>
-  volantis.layoutHelper("comments",`<div id="minivaline_container"><i class="fas fa-cog fa-spin fa-fw fa-2x"></i></div>`)
+  volantis.layoutHelper("comments",`<div id="minivaline_container"><i class="fa-solid fa-cog fa-spin fa-fw fa-2x"></i></div>`)
   function load_minivaline() {
     if(!document.querySelector("#minivaline_container"))return;
     volantis.js("<%- theme.comments.minivaline.js %>", pjax_minivaline)

package/layout/_plugins/comments/twikoo/script.ejs

@@ -1,5 +1,5 @@
 <script>
-  volantis.layoutHelper("comments",`<div id="twikoo_container"><i class="fas fa-cog fa-spin fa-fw fa-2x"></i></div>`)
+  volantis.layoutHelper("comments",`<div id="twikoo_container"><i class="fa-solid fa-cog fa-spin fa-fw fa-2x"></i></div>`)
   function load_twikoo() {
     if(!document.querySelectorAll("#twikoo_container")[0])return;
     volantis.js("<%- theme.comments.twikoo.js %>", pjax_twikoo)

package/layout/_plugins/comments/valine/script.ejs

@@ -1,5 +1,5 @@
 <script>
-  volantis.layoutHelper("comments",`<div id="valine_container"><i class="fas fa-cog fa-spin fa-fw fa-2x"></i></div>`)
+  volantis.layoutHelper("comments",`<div id="valine_container"><i class="fa-solid fa-cog fa-spin fa-fw fa-2x"></i></div>`)
   function emoji(path, idx, ext) {
     return path + "/" + path + "-" + idx + "." + ext;
   }

package/layout/_plugins/comments/waline/script.ejs

@@ -1,5 +1,5 @@
 <script>
-  volantis.layoutHelper("comments",`<div id="waline"><i class="fas fa-cog fa-spin fa-fw fa-2x"></i></div>`)
+  volantis.layoutHelper("comments",`<div id="waline"><i class="fa-solid fa-cog fa-spin fa-fw fa-2x"></i></div>`)
   function pjax_waline() {
     if(!document.querySelector("#waline"))return;
     let pagePlaceholder = pdata.commentPlaceholder || "<%= theme.comments.waline.placeholder %>";

package/layout/_plugins/search/script.ejs

@@ -14,6 +14,10 @@
     document.querySelectorAll(".input.u-search-input").forEach((e) => {
       e.removeEventListener("focus", loadSearchService, false);
     });
+
+    document.querySelectorAll(".u-search-form").forEach((e) => {
+      e.addEventListener("submit", (event)=>{event.preventDefault();}, false);
+    });
   }
 
   // 打开并搜索 字符串 s

package/layout/_widget/webinfo.ejs

@@ -29,9 +29,9 @@
         <div class="webinfo-item">
           <div><%= item.type.visitcounter.siteuv.text %></div>
           <% if (item.type.visitcounter.service == "busuanzi") {%>
-          <div><span id="busuanzi_value_site_uv"><i class="fas fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.siteuv.unit %></div>
+          <div><span id="busuanzi_value_site_uv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.siteuv.unit %></div>
           <% } else if (item.type.visitcounter.service == "leancloud") { %>
-          <div><span id="lc-uv"><span id='number'><i class="fas fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.siteuv.unit %></div>
+          <div><span id="lc-uv"><span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.siteuv.unit %></div>
           <% } %>
         </div>
       <% } %>
@@ -40,9 +40,9 @@
         <div class="webinfo-item">
           <div><%= item.type.visitcounter.sitepv.text %></div>
           <% if (item.type.visitcounter.service == "busuanzi") {%>
-          <div><span id="busuanzi_value_site_pv"><i class="fas fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.sitepv.unit %></div>
+          <div><span id="busuanzi_value_site_pv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.sitepv.unit %></div>
           <% } else if (item.type.visitcounter.service == "leancloud") { %>
-          <div><span id="lc-sv"><span id='number'><i class="fas fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.sitepv.unit %></div>
+          <div><span id="lc-sv"><span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.sitepv.unit %></div>
           <% } %>
         </div>
       <% } %>

package/layout/archive.ejs

@@ -21,7 +21,7 @@
 										<%= date(post.date, config.date_format) %>
 									<% } %>
 									<% if(theme.plugins.aplayer && theme.plugins.aplayer.enable && post.music && post.music.enable != false){ %>
-										&nbsp;<i class="fas fa-headphones-alt music" aria-hidden="true"></i>
+										&nbsp;<i class="fa-solid fa-headphones-alt music" aria-hidden="true"></i>
 									<% } %>
 									<% if (post.icon) { %>
 										&nbsp;<i class="<%- post.icon %>" aria-hidden="true"></i>

package/layout/category.ejs

@@ -15,7 +15,7 @@ if (!page.robots) {
             <% if (site.categories.length){ %>
               <% site.categories.sort('path').each(function(category){ %>
                 <a class="<%= category.parent ? ' child' : ''%>" href="<%= url_for(category.path) %>">
-                  <span><i class='fas fa-folder-open fa-fw' aria-hidden="true"></i>&nbsp;&nbsp;<%= category.name %></span>
+                  <span><i class='fa-solid fa-folder-open fa-fw' aria-hidden="true"></i>&nbsp;&nbsp;<%= category.name %></span>
                   <span class="title">
                     (<%- category.posts.length %>)
                   </span>

package/layout/friends.ejs

@@ -29,7 +29,7 @@
                       <% if (item.keywords) { %>
                         <div class='friend-tags-wrapper'>
                         <% (item.keywords||[]).forEach(function(keyword){ %>
-                          <p class="tags"><i class="fas fa-hashtag fa-fw" aria-hidden="true"></i><%= keyword %></p>
+                          <p class="tags"><i class="fa-solid fa-hashtag fa-fw" aria-hidden="true"></i><%= keyword %></p>
                         <% }) %>
                         </div>
                       <% } %>