hexo-theme-volantis 5.0.0-rc.8 → 5.1.1

package/CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+### [5.1.1](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.1.0...v5.1.1) (2022-05-19)
+
+
+### Bug Fixes
+
+* **#761:** overflow ([74e0d04](https://github.com/volantis-x/hexo-theme-volantis/commit/74e0d04a47d17c513f0d29ecaceb49b51d63ee18))
+
+## [5.1.0](https://github.com/volantis-x/hexo-theme-volantis/compare/5.0.0...v5.1.0) (2022-05-19)
+
+
+### Features
+
+* release-please ([97efd35](https://github.com/volantis-x/hexo-theme-volantis/commit/97efd352d3f44d7f12a813db89c07ab0ba56e188))
+
+
+### Bug Fixes
+
+* 703 ([034d684](https://github.com/volantis-x/hexo-theme-volantis/commit/034d6847050472d7fe89335d65f371112c7449e8))
+* 706 移动端菜单栏异常 ([e1f63b3](https://github.com/volantis-x/hexo-theme-volantis/commit/e1f63b33d47a992c278eb51471e5e2816ebc138f))
+* 713 ([e1233de](https://github.com/volantis-x/hexo-theme-volantis/commit/e1233de457648ea46597a5ec4875efc5011e58b5))
+* 740 ([a845788](https://github.com/volantis-x/hexo-theme-volantis/commit/a845788c9dbc1c251e93ca6e8b557d6e1bfb849e))
+* Discuss 评论系统适配深色模式 ([#752](https://github.com/volantis-x/hexo-theme-volantis/issues/752)) ([86002b6](https://github.com/volantis-x/hexo-theme-volantis/commit/86002b67af0060e21e9ac2514aeee64377e01e69))
+* error friendly ([3bffeab](https://github.com/volantis-x/hexo-theme-volantis/commit/3bffeabc2399cd3dda5816c13b1b56be25d7f95f))
+* no-title ([48c70f8](https://github.com/volantis-x/hexo-theme-volantis/commit/48c70f8c13dd4d6dc7fa1bb5226c5987fde7971f))
+* **twikoo:** 所有页面都说同一个path的bug ([14de40b](https://github.com/volantis-x/hexo-theme-volantis/commit/14de40bbe12e1e1679a60a58e0d501625d0e7ff2))
+* 为 Discuss 添加最低高度 ([#742](https://github.com/volantis-x/hexo-theme-volantis/issues/742)) ([9bf70de](https://github.com/volantis-x/hexo-theme-volantis/commit/9bf70debfb8a38da89a7bf5f7bd7634d504aa457))
+* 修复Discuss评论区表情包在深色模式下，css权重低的bug ([#753](https://github.com/volantis-x/hexo-theme-volantis/issues/753)) ([872baf7](https://github.com/volantis-x/hexo-theme-volantis/commit/872baf7481b1bb6e47381638c5c346fb232a398a))

package/README.md

@@ -3,16 +3,17 @@
 </p>
 
 [![](https://img.shields.io/npm/v/hexo-theme-volantis.svg?style=flat-square)](https://www.npmjs.com/package/hexo-theme-volantis)
+[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://www.conventionalcommits.org/zh-hans/v1.0.0/)
 
 ## Getting Started
 
 Check your environment:
 
 ```yaml
-Hexo: 4.2 ~ 5.x
-hexo-cli: 3.1 ~ 4.x
-node.js: 12.16 LTS ~ latest LTS
-npm: 6.13 ~ latest LTS
+Hexo: 5.4 ~ 6.x
+hexo-cli: 4.3 ~ latest
+node.js: 16.x LTS ~ latest LTS
+npm: 8.x ~ latest LTS
 ```
 
 Edit your `_config.yml`:

package/_config.yml

@@ -1,7 +1,6 @@
 ############################### Volantis ###############################
 info:
   theme_name: Volantis # This is theme's name.
-  theme_version: '5.0.0-rc.8' # 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 调试模式
@@ -13,9 +12,10 @@ default:
   cover: volantis-static/media/placeholder/cover/76b86c0226ffd.svg # https://cdn.jsdelivr.net/gh/cdn-x/placeholder@1.0.1/cover/76b86c0226ffd.svg
   image: volantis-static/media/placeholder/image/2659360.svg # https://cdn.jsdelivr.net/gh/cdn-x/placeholder@1.0.1/image/2659360.svg
 ############################### CSP ###############################
-# 内容安全策略( CSP )
+# 内容安全策略( CSP ) meta 标签 http-equiv="Content-Security-Policy"
 # https://developer.mozilla.org/zh-CN/docs/Web/HTTP/CSP
 # https://content-security-policy.com/
+# 也可以设为 false 在 HTTP 标头中设置 https://volantis.js.org/v5/advanced-settings/#设置-HTTP-响应标头
 csp:
   enable: true
   content: "
@@ -53,7 +53,9 @@ cdn:
       app: /js/app.js
     css:
       style: /css/style.css # (异步加载样式)
-# 请求静态资源添加版本号 本地文件使用文件内容的hash值作为版本号(app.8c1e7c88.js)  其他为时间戳 (?time=1648684470140)
+# 静态资源版本控制
+# 本地文件使用文件内容的hash值作为版本号(app.8c1e7c88.js)  其他为时间戳 (?time=1648684470140)
+# 建议静态资源设置标头 浏览器缓存一年边缘缓存一个月 cache-control: max-age=86400, s-maxage=31536000 如果有更新记得刷新缓存
 cdn_version: true
 # volantis static 静态资源文件 npm 包 CDN 地址 (后面加 "/" )
 # https://github.com/volantis-x/volantis-static
@@ -62,12 +64,13 @@ volantis_static_cdn: https://unpkg.com/volantis-static@0.0.1649552113628/
 # 全局页面字符串替换  A => B (可用于临时修改错字等)
 replace:
   - https://cdn.jsdelivr.net/npm/ => https://unpkg.com/
-  - https://unpkg.com/ => https://npm.elemecdn.com/
+  - https://cdn.jsdelivr.net/gh/ => https://fastly.jsdelivr.net/gh/
+#  - https://unpkg.com/ => https://npm.elemecdn.com/
 
 # dns-prefetch preconnect x-dns-prefetch-control
 dns_prefetch:
-  # - https://unpkg.com
-  - https://npm.elemecdn.com
+  - https://unpkg.com
+  # - https://npm.elemecdn.com
 
 # 平滑滚动效果
 scroll_smooth: true
@@ -276,20 +279,15 @@ comments:
   # https://artalk.js.org/
   # https://github.com/ArtalkJS/Artalk
   artalk:
-    js: https://unpkg.com/artalk@2.1.3/dist/Artalk.js
-    css: https://unpkg.com/artalk@2.1.3/dist/Artalk.css
-    server: http://127.0.0.1:8080/api    # 修改为自建的后端服务地址
+    js: https://yours-artalk-domain/dist/Artalk.js   # or https://unpkg.com/artalk@2.2.8/dist/Artalk.js
+    css: https://yours-artalk-domain/dist/Artalk.css # or https://unpkg.com/artalk@2.2.8/dist/Artalk.css
+    server: https://yours-artalk-domain    # 修改为自建的后端服务地址
     path:  # 全局评论地址
-    # 更多选项 https://artalk.js.org/guide/frontend/config.htm 按照yml格式继续填写即可 
-    # 除了 [el pageKey pageTitle site] 选项
-    # 下面是一些例子：
-    placeholder: 来啊，快活啊 ( ゜- ゜)   # 全局评论占位
-    noComment: 快来成为第一个评论的人吧~  # 评论为空时，评论列表显示字符
-    pagination:
-      readMore: true   # 加载更多模式
-      autoLoad: false  # 滚动到底部自动加载
-      pageSize: 10     # 每次请求获取数量
-    
+    placeholder: # 评论占位
+    # 更多置项可在 Artalk 后端进行配置，详见 https://artalk.js.org/guide/backend/fe-control.html
+    # 也可以在此处继续参考上方例子进行配置，不建议重写配置的字段除上方所述外还有：
+    # [el, useBackendConf, pageKey, pageTitle, site, darkMode, pvEl]
+
   # giscus
   # https://giscus.app
   # https://github.com/laymonage/giscus
@@ -407,19 +405,31 @@ comments:
   # Waline
   # https://waline.js.org/
   waline:
-    js: https://npm.elemecdn.com/@waline/client@1.6.0/dist/Waline.min.js
+    js: https://unpkg.com/@waline/client@v2/dist/waline.js
+    css: https://unpkg.com/@waline/client@v2/dist/waline.css
     path: # 全局评论地址 目前设置全局评论地址后visitor失效,这是waline的问题
-    placeholder: 快来评论吧~  # 评论占位提示
-    # imageHosting: https://7bu.top/api/upload?token=7ffe9d626fe4315c953758efbdb6ee2e # 图床api（默认注释使用base64）
-    # 其他配置项按照yml格式继续填写即可 除了 [el path placeholder uploadImage] 选项
-    meta: [nick,mail,link] # waline comment header info
-    requiredFields: [nick,mail]
-    serverURL: xxxxxxxxxxxxxxx # Waline 的服务端地址（必填） 测试用地址: https://waline-ruddy.vercel.app
-    avatar: robohash # gravatar style https://waline.js.org/client/basic.html#avatar
-    avatarCDN: #https://sdn.geekzu.org/avatar/
-    pageSize: 10 # 评论每页显示数量
-    lang: zh-CN
-    visitor: true
+    placeholder: # 评论占位提示
+    serverURL: # Waline 的服务端地址（必填） 测试用地址: https://waline.vercel.app
+    imageUploader:
+      # 以兰空图床为例，下列填写内容为：
+      # url: https://xxxxxx/api/v1/upload
+      # token: Bearer xxxxxxxxxxxxxx
+      # resp: data.links.url
+      api:   # 图床地址
+      token: # 图床验证
+      resp:  # 图片地址返回值的字段
+    pageview: true # 浏览量统计
+    comment: true  # 评论数统计
+    # 其他配置项按照yml格式继续填写即可 除了 [el path imageUploader] 选项
+    # 组件属性地址：https://waline.js.org/reference/component.html
+    # meta: ['nick', 'mail', 'link']
+
+  # Discuss
+  # https://discuss.js.org
+  discuss:
+    js: https://cdn.jsdelivr.net/npm/discuss/dist/Discuss.js # 建议锁定版本
+    serverURLs: # Discuss server address url
+    # https://discuss.js.org/Quick-Start.html#path
 
 
 ############################### Comments ############################### > end
@@ -525,7 +535,6 @@ sidebar:
           text: '本站总字数：'   # 需要启用 wordcount
           unit: '字'
         visitcounter:
-          service: leancloud  # busuanzi, leancloud
           siteuv:
             enable: true
             text: '本站访客数：'
@@ -675,7 +684,7 @@ plugins:
 
   # https://scrollrevealjs.org/api/reveal.html
   scrollreveal:
-    enable: #true
+    enable: true
     js: volantis-static/libs/scrollreveal/dist/scrollreveal.min.js # https://unpkg.com/scrollreveal@4.0.9/dist/scrollreveal.min.js
     distance: 32px
     duration: 800 # ms
@@ -862,9 +871,9 @@ plugins:
       enable: true
       play: fa-solid fa-play
       pause: fa-solid fa-pause
-    rightmenu:                            
+    rightmenu:
       enable: true                        # 是否开启右键模块的消息通知
-      notice: true                        # 唤醒原右键菜单的通知 
+      notice: true                        # 唤醒原右键菜单的通知
 
   # 聊天功能
   chat_service: # tidio or gitter
@@ -878,7 +887,7 @@ plugins:
   # https://gitter.im
   gitter:
     room: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-  
+
   # swiper
   # https://www.swiper.com.cn/
   swiper:
@@ -895,12 +904,13 @@ rightmenus:
   enable: true
   # 右键菜单项及加载顺序
   # 内容示例：plugins.[组名], menus.[组名], hr(分割线，推荐去线留白), music(音乐控制器)
-  order: 
+  order:
     - plugins.navigation
     - hr
     - plugins.inputBox
     - plugins.seletctText
     - plugins.elementCheck
+    - plugins.elementImage
     - menus.link
     - hr
     - menus.darkMode
@@ -917,7 +927,7 @@ rightmenus:
   # 注： 
   # 1. link/event 二选一，同时出现时仅处理 link
   # 2. 内置事件列表： copyText, copyLink, copyPaste, copyAll, copyCut, copyImg, printMode, readMode
-  # 3. 内置组列表：navigation, inputBox, seletctText, elementCheck, articlePage
+  # 3. 内置组列表：navigation, inputBox, seletctText, elementCheck, elementImage, articlePage
   # 4. plugins 列允许自定义组内项目
   # 5. menus   列允许自定义组及其内容
   # 6. 除 navigation 外的内置组，在显示时会隐藏含 link 属性的菜单项
@@ -929,12 +939,12 @@ rightmenus:
     # 例外，在 articlePage 组显示时（文章页）时依旧显示含 link 属性的菜单项
     articleShowLink: false
     # 当设定全局音乐播放器时，是否一直显示音乐控制菜单。false：仅当音乐播放时启用
-    musicAlwaysShow: true
+    musicAlwaysShow: false
   # 右键内置组，预置实现
   plugins:
     # 导航组件
     # 横向排列，共用一行，仅显示图标 (原则上支持的数量不限)
-    navigation: 
+    navigation:
       - {id: 'left', name: '转到上一页', icon: 'fa-solid fa-arrow-left', event: 'history.back()', group: 'navigation'}
       - {id: 'right', name: '转到下一页', icon: 'fa-solid fa-arrow-right', event: 'history.forward()', group: 'navigation'}
       - {id: 'redo', name: '刷新当前页面', icon: 'fa-solid fa-redo', event: 'window.location.reload()', group: 'navigation'}
@@ -947,19 +957,22 @@ rightmenus:
       - {id: 'copyAll', name: '全选文本', icon: 'fa-solid fa-object-ungroup', event: 'copyAll', group: 'inputBox'}
       - {id: 'copyCut', name: '剪切文本', icon: 'fa-solid fa-cut', event: 'copyCut', group: 'inputBox'}
     # 文本选中类组件
-    # 生效于右键选中文本，__text__ 为选中的文本。     
+    # 生效于右键选中文本，__text__ 为选中的文本。
     seletctText:
       - {id: 'copyText', name: '复制文本', icon: 'fa-solid fa-copy', event: 'copyText', group: 'seletctText'}
       - {id: 'searchWord', name: '站内搜索', icon: 'fa-solid fa-search', event: 'OpenSearch(__text__)', group: 'seletctText'}
       - {id: 'bingSearch', name: '必应搜索', icon: 'fa-solid fa-search', event: 'window.open(`https://cn.bing.com/search?q=${__text__}`)', group: 'seletctText'}
       #- {id: 'googleSearch', name: '谷歌搜索', icon: 'fa-solid fa-search', event: 'window.open(`https://www.google.com/search?q=${__text__}`)', group: 'seletctText'}
-    # 元素判断组件
-    # 生效于 a/img 处的右键行为，__link__ 为链接地址
+    # 链接判断组件
+    # 生效于链接处的右键行为，__link__ 为链接地址
     elementCheck:
       - {id: 'openTab', name: '新标签页打开', icon: 'fa-solid fa-external-link-square-alt', event: 'window.open(__link__)', group: 'elementCheck'}
       - {id: 'copyLink', name: '复制链接地址', icon: 'fa-solid fa-link', event: 'copyLink', group: 'elementCheck'}
-      # 复制图片文件至剪切板，仅支持 png 格式
-      - {id: 'copyImg', name: '复制图片文件', icon: 'fa-solid fa-image', event: 'copyImg', group: 'elementCheck'}
+    # 图片判断类组件
+    # 生效于图片类的右键行为，__link__ 为链接地址
+    elementImage:
+      - {id: 'copyImg', name: '复制图片', icon: 'fa-solid fa-image', event: 'copyImg', group: 'elementImage'}
+      - {id: 'googleImg', name: '谷歌识图', icon: 'fa-solid fa-images', event: 'window.open(`https://www.google.com.hk/searchbyimage?image_url=${__link__}`)', group: 'elementImage'}
     # 文章页面组件
     # 生效于 post.article 页面
     articlePage:
@@ -974,7 +987,7 @@ rightmenus:
       - hr
       - {id: 'source_docs', name: '本站源码', icon: 'fa-solid fa-code-branch', link: 'https://github.com/volantis-x/volantis-docs/', group: 'link'}
       - {id: 'source_theme', name: '主题源码', icon: 'fa-solid fa-code-branch', link: 'https://github.com/volantis-x/hexo-theme-volantis/', group: 'link'}
-    darkMode: 
+    darkMode:
       - {id: 'darkMode', name: '暗黑模式', icon: 'fa-solid fa-moon', event: 'volantis.dark.toggle()', group: 'darkMode'}
 ###
 
@@ -1043,7 +1056,7 @@ color_scheme:
     # 主题色
     theme: '#3dd9b6'
     # 链接色
-    link: '#1b79c4'
+    link: '#2092ec'
     # 按钮色
     button: '#44D7B6'
     # 鼠标放到交互元素上时的色
@@ -1100,11 +1113,11 @@ color_scheme:
     # 卡片背景色              # Dark Grey 3
     card: '#262626'
     # 网站背景上的文字
-    site_inner: '#eee'
+    site_inner: '#eeeeeede'
     # 网站页脚文字
-    site_footer: '#aaa'
+    site_footer: '#aaaaaade'
     # 卡片上的普通文字
-    text: '#eee'
+    text: '#eeeeeede'
 
     # 区块和代码块背景色       # Dark Grey 4
     block: '#434343'
@@ -1113,21 +1126,21 @@ color_scheme:
     # 行内代码颜色
     inlinecode: '#D56D28'
 
-    # 文章部分
-    h1: '#f5f5f5'            #  Dark Grey 8
-    h2: '#f5f5f5'
-    h3: '#f0f0f0'            #  Dark Grey 7
-    h4: '#f0f0f0'
-    h5: '#f0f0f0'
-    h6: '#f0f0f0'
-    p: '#d9d9d9e6'           #  Dark Grey 6
+    # 文章部分 高强度文本的不透明度应为87％ 中等重点文字适用于60％
+    h1: '#FFFFFFde'            #  Dark Grey 8
+    h2: '#FFFFFFde'
+    h3: '#FFFFFF99'            #  Dark Grey 7
+    h4: '#FFFFFF99'
+    h5: '#FFFFFF99'
+    h6: '#FFFFFF99'
+    p: '#d9d9d9de'           #  Dark Grey 6
 
     # 列表文字                #  Dark Grey 6
-    list: '#d9d9d9d9'
+    list: '#d9d9d9de'
     # 列表 hover 时的文字
     list_hl: 'mix($color-theme, #fff, 80)'
     # 辅助性文字              #  Dark Grey 5
-    meta: '#bfbfbf'
+    meta: '#bfbfbfde'
     # 夜间图片亮度
     brightness: 70%
 ############################### Color Scheme ############################### > end

package/layout/_meta/counter.ejs

@@ -26,7 +26,7 @@
       </p>
     </a>
   </div>
-  -<% } else if (theme.comments.service=='waline' && theme.comments.waline.visitor) { %>
+<% } else if (theme.comments.service=='waline' && theme.comments.waline.pageview) { %>
   <div class="new-meta-item browse">
     <a class='notlink'>
       <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
@@ -36,21 +36,43 @@
           path = path.substring(0, path.length - 10);
         }
       %>
-      <span id="<%- url_for(path) %>" class="leancloud_visitors" data-flag-title="<%- post.title || page.title %>">
+      <span data-path="<%- url_for(path) %>" class="waline-pageview-count"></span>
+    </a>
+  </div>
+<% } else if (theme.comments.service=='twikoo' && !!page.comments) { %>
+  <div class="new-meta-item browse">
+    <a class='notlink'>
+      <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
       <p>
-        <span class="leancloud-visitors-count"></span>
+        <span id="twikoo_visitors">
+          <i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i>
+        </span>
       </p>
       </span>
     </a>
   </div>
-<% } else if (theme.comments.service=='twikoo' && !!page.comments) { %>
+<% } else if (theme.comments.service=='discuss' && !!page.comments) { %>
   <div class="new-meta-item browse">
     <a class='notlink'>
       <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
       <p>
-        <span id="twikoo_visitors"></span>
+        <span id="Discuss-Visitors">
+          <i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i>
+        </span>
       </p>
       </span>
     </a>
   </div>
+<% } else if (theme.comments.service=='artalk' && !!page.comments) { %>
+    <div class="new-meta-item browse">
+      <a class='notlink'>
+        <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
+        <p>
+        <span id="artalk_visitors">
+          <i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i>
+        </span>
+        <%- theme.article.body.meta_library.counter.unit %>
+        </p>
+      </a>
+    </div>
 <% } %>

package/layout/_meta/walinecount.ejs

@@ -5,10 +5,11 @@
     if (path.length > 9 && (path.substring(path.length - 10) == 'index.html')) {
       path = path.substring(0, path.length - 10);
     }
+    if(!!theme.comments.waline.path) path = theme.comments.waline.path
   %>
   <a href="<%- url_for(path) %>#comments">
     <i class="<%- theme.article.body.meta_library.walinecount.icon %> fa-fw"></i>
-    <span id="<%- url_for(path) %>" class="waline-comment-count"></span>
+    <span data-path="<%- url_for(path) %>" class="waline-comment-count"></span>
     <span class="leancloud-comments-count">&nbsp;<%- theme.article.body.meta_library.walinecount.desc %></span>
   </a>
 </div>

package/layout/_partial/article.ejs

@@ -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="fa-solid fa-chevron-left" aria-hidden="true"></i><%- post.prev.title || post.prev.seo_title || '' %></p>
+          <p class='title'><i class="fa-solid fa-chevron-left" aria-hidden="true"></i><%- post.prev.title || post.prev.seo_title || date(post.date, theme.article.body.meta_library.date.format) %></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 || post.next.seo_title || '' %><i class="fa-solid fa-chevron-right" aria-hidden="true"></i></p>
+          <p class='title'><%- post.next.title || post.next.seo_title || date(post.date, theme.article.body.meta_library.date.format) %><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/head.ejs

@@ -1,5 +1,6 @@
 <head hexo-theme='https://github.com/volantis-x/hexo-theme-volantis/tree/<%- theme.info.theme_version %>'>
   <%- meta_generator() %>
+  <meta name="Volantis" content="<%- theme.info.theme_version %>">
   <meta charset="utf-8">
   <!-- SEO相关 -->
   <%- generate_seo(theme, page) %>
@@ -21,19 +22,23 @@
   <meta name="HandheldFriendly" content="True" >
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5">
-  <meta content="<%=config.title%>" name="application-name">
-  <meta content="<%=config.title%>" name="apple-mobile-web-app-title">
   <meta content="black-translucent" name="apple-mobile-web-app-status-bar-style">
   <meta content="telephone=no" name="format-detection">
+  <!-- import head_begin begin -->
+  <%_ if (config.import && config.import.head_begin){ _%>
+    <%_ ([...config.import.head_begin]).forEach(function(item){ _%>
+      <%- item %>
+    <%_ }) _%>
+  <%_ } _%>
+  <!-- import head_begin end -->
+  <!-- Custom Files headBegin begin-->
+  <%- volantis_inject('headBegin') %>
+  <!-- Custom Files headBegin end-->
+  <%_ if (config.favicon) { _%>
+    <link rel="shortcut icon" type='image/x-icon' href="<%- url_for(config.favicon) %>">
+  <%_ } _%>
   <link rel="preload" href="<%- theme.cdn.map.css.style %>" as="style">
   <%- generate_preload_fontfamily(theme) %>
-  <!-- 页面元数据 -->
-  <pjax>
-  <%- generate_title(config, theme, page) %>
-  <%- generate_keywords(config, theme, page) %>
-  <%- generate_description(config, theme, page) %>
-  <%- open_graph(theme.open_graph) %>
-  </pjax>
   <!-- feed -->
   <%_ if (config.feed && config.feed.path){ _%>
     <%_ if (typeof(config.feed.path)=="string"){ _%>
@@ -44,22 +49,11 @@
       <%_ }) _%>
     <%_ } _%>
   <%_ } _%>
-  <!-- import meta -->
-  <%_ if (config.import && config.import.meta){ _%>
-    <%_ (config.import.meta||[]).forEach(function(item){ _%>
-      <%- item %>
-    <%_ }) _%>
-  <%_ } _%>
-  <!-- link -->
-  <%_ if (config.favicon) { _%>
-    <link rel="shortcut icon" type='image/x-icon' href="<%- url_for(config.favicon) %>">
-  <%_ } _%>
-  <!-- import link -->
-  <%_ if (config.import && config.import.link){ _%>
-    <%_ (config.import.link||[]).forEach(function(item){ _%>
-      <%- item %>
-    <%_ }) _%>
-  <%_ } _%>
+  <!-- 页面元数据 -->
+  <%- generate_title(config, theme, page) %>
+  <%- generate_keywords(config, theme, page) %>
+  <%- generate_description(config, theme, page) %>
+  <%- open_graph(theme.open_graph) %>
   <style>
     /* 首屏样式 */
     <%- FirstCSS() %>
@@ -76,7 +70,14 @@
   <%_ } _%>
   <%- partial('../_plugins/end-of-support/script') %>
   <%- partial('scripts/global') %>
-  <!-- Custom Files head begin-->
-  <%- volantis_inject('head') %>
-  <!-- Custom Files head end-->
+  <!-- import head_end begin -->
+  <%_ if (config.import && config.import.head_end){ _%>
+    <%_ ([...config.import.head_end]).forEach(function(item){ _%>
+      <%- item %>
+    <%_ }) _%>
+  <%_ } _%>
+  <!-- import head_end end -->
+  <!-- Custom Files headEnd begin-->
+  <%- volantis_inject('headEnd') %>
+  <!-- Custom Files headEnd end-->
 </head>

package/layout/_partial/header.ejs

@@ -61,7 +61,7 @@
               </li>
             <% } else { %>
               <li>
-                <a class="menuitem flat-box faa-parent animated-hover" 
+                <a class="menuitem flat-box faa-parent animated-hover"
                 <%- value.url ? `href="` + url_for(value.url) + `" title="` + (value.description || value.name) + `"`
                         : ` href="/" onclick="return false;" title="` + (value.description || value.name) + `"` %>
                   <% if (value.rel) { %>