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

package/_config.yml

@@ -1,7 +1,7 @@
 ############################### Volantis ###############################
 info:
   theme_name: Volantis # This is theme's name.
-  theme_version: '5.0.0-rc.7' # This is theme's version.
+  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 调试模式
@@ -35,9 +35,6 @@ csp:
     style-src 'self' https: 'unsafe-inline' *;
   "
   # 可以使用自动程序替换默认的 'unsafe-inline' 和 * 生成更严格的内容安全策略.
-  # hexo_fliter_sha256 用于 hexo g 时替换 'unsafe-inline' 生成 script-src 'sha256-' , 只适用于外层不含有压缩工具得场景.
-  # 如果外层含有压缩工具会改变 hash 导致无效,hexo_fliter_sha256 需设为false, 使用 gulp 方案.
-  hexo_fliter_sha256: false
   # 另可以参考官网的 gulp 方案.
   # gulpfile.js https://github.com/volantis-x/community/blob/main/gulpfile.js
 ############################### CDN ###############################
@@ -892,9 +889,98 @@ plugins:
 ############################### Plugins ############################### > end
 
 ############################### Rightmenu ############################### > start
+
+### 自定义右键 新
+rightmenus:
+  enable: true
+  # 右键菜单项及加载顺序
+  # 内容示例：plugins.[组名], menus.[组名], hr(分割线，推荐去线留白), music(音乐控制器)
+  order: 
+    - plugins.navigation
+    - hr
+    - plugins.inputBox
+    - plugins.seletctText
+    - plugins.elementCheck
+    - menus.link
+    - hr
+    - menus.darkMode
+    - plugins.articlePage
+    - music
+  ############################
+  # - {id: '', name: '', icon: '', link: '', event: '', group: ''}
+  # id: 唯一值
+  # name: 用于菜单名称显示
+  # icon: 用于菜单图标显示
+  # link: 跳转链接
+  # event: 事件，当输入内容不为内置事件时，作 JavaScript 代码执行
+  # group: 菜单项所处分组名称
+  # 注： 
+  # 1. link/event 二选一，同时出现时仅处理 link
+  # 2. 内置事件列表： copyText, copyLink, copyPaste, copyAll, copyCut, copyImg, printMode, readMode
+  # 3. 内置组列表：navigation, inputBox, seletctText, elementCheck, articlePage
+  # 4. plugins 列允许自定义组内项目
+  # 5. menus   列允许自定义组及其内容
+  # 6. 除 navigation 外的内置组，在显示时会隐藏含 link 属性的菜单项
+  ###########################
+  # 基础项设置
+  options:
+    # 图标前缀 fa-solid, fa-regular, fa-light, fa-thin, fa-duotone, fa-brands
+    iconPrefix: fa-solid
+    # 例外，在 articlePage 组显示时（文章页）时依旧显示含 link 属性的菜单项
+    articleShowLink: false
+    # 当设定全局音乐播放器时，是否一直显示音乐控制菜单。false：仅当音乐播放时启用
+    musicAlwaysShow: true
+  # 右键内置组，预置实现
+  plugins:
+    # 导航组件
+    # 横向排列，共用一行，仅显示图标 (原则上支持的数量不限)
+    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'}
+      - {id: 'up', name: '回到顶部', icon: 'fa-solid fa-arrow-up', event: 'VolantisApp.scrolltoElement(volantis.dom.bodyAnchor)', group: 'navigation'}
+      #- {id: 'home', name: '回到首页', icon: 'fa-solid fa-home', link: '/', group: 'navigation'}
+    # 文本输入框相关组件
+    # 生效于 input/textarea，粘贴、剪切、全选
+    inputBox:
+      - {id: 'copyPaste', name: '粘贴文本', icon: 'fa-solid fa-paste', event: 'copyPaste', group: 'inputBox'}
+      - {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__ 为选中的文本。     
+    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__ 为链接地址
+    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'}
+    # 文章页面组件
+    # 生效于 post.article 页面
+    articlePage:
+      - {id: 'printMode', name: '打印页面', icon: 'fa-solid fa-print', event: 'printMode', group: 'articlePage'}
+      - {id: 'readMode', name: '阅读模式', icon: 'fa-solid fa-book-open', event: 'readMode', group: 'articlePage'}
+  # 右键自定义菜单区域
+  menus:
+    link:
+      - {id: 'help', name: '常见问题', icon: 'fa-solid fa-question', link: 'https://volantis.js.org/faqs/', group: 'link'}
+      - {id: 'examples', name: '示例博客', icon: 'fa-solid fa-rss', link: 'https://volantis.js.org/examples/', group: 'link'}
+      - {id: 'contributors', name: '加入社区', icon: 'fa-solid fa-fan', link: 'https://volantis.js.org/contributors/', group: 'link'}
+      - 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: 
+      - {id: 'darkMode', name: '暗黑模式', icon: 'fa-solid fa-moon', event: 'volantis.dark.toggle()', group: 'darkMode'}
+###
+
 # 自定义右键菜单
 rightmenu:
-  enable: true
+  enable: false
   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]
@@ -949,12 +1035,13 @@ search:
 
 ############################### Color Scheme ############################### > start
 # Accessibility: 背景色和前景色要有足够的对比度 https://web.dev/color-contrast/
+# https://ant.design/docs/spec/colors-cn
 color_scheme:
   # ------------
   # 通用颜色
   common:
     # 主题色
-    theme: '#44D7B6'
+    theme: '#3dd9b6'
     # 链接色
     link: '#1b79c4'
     # 按钮色
@@ -1004,40 +1091,43 @@ color_scheme:
     meta: '#888'
   # ------------
   # 暗色主题
+  # https://www.maijisheji.com/2094.html
   dark:
-    # 网站背景色
-    site_bg: '#222'
+    # 网站最深底色            # Dark Grey 1
+    site_bd: '#121212'
+    # 网站背景色              # Dark Grey 2
+    site_bg: '#1f1f1f'
+    # 卡片背景色              # Dark Grey 3
+    card: '#262626'
     # 网站背景上的文字
     site_inner: '#eee'
     # 网站页脚文字
     site_footer: '#aaa'
-    # 卡片背景色
-    card: '#333'
     # 卡片上的普通文字
     text: '#eee'
 
-    # 区块和代码块背景色
-    block: '#3a3a3a'
-    # 代码块高亮时的背景色
-    codeblock: '#343a3c'
+    # 区块和代码块背景色       # Dark Grey 4
+    block: '#434343'
+    # 代码块高亮时的背景色     # Dark Grey 2
+    codeblock: '#1f1f1f'
     # 行内代码颜色
     inlinecode: '#D56D28'
 
     # 文章部分
-    h1: '#eee'
-    h2: '#eee'
-    h3: '#ddd'
-    h4: '#ddd'
-    h5: '#ddd'
-    h6: '#ddd'
-    p: '#bbb'
-
-    # 列表文字
-    list: '#aaa'
+    h1: '#f5f5f5'            #  Dark Grey 8
+    h2: '#f5f5f5'
+    h3: '#f0f0f0'            #  Dark Grey 7
+    h4: '#f0f0f0'
+    h5: '#f0f0f0'
+    h6: '#f0f0f0'
+    p: '#d9d9d9e6'           #  Dark Grey 6
+
+    # 列表文字                #  Dark Grey 6
+    list: '#d9d9d9d9'
     # 列表 hover 时的文字
     list_hl: 'mix($color-theme, #fff, 80)'
-    # 辅助性文字
-    meta: '#888'
+    # 辅助性文字              #  Dark Grey 5
+    meta: '#bfbfbf'
     # 夜间图片亮度
     brightness: 70%
 ############################### Color Scheme ############################### > end
@@ -1061,11 +1151,11 @@ custom_css:
   navbar:
     height: 64px
     width: auto # auto, max
-    effect: [shadow, blur] # [shadow, floatable, blur]
+    effect: [shadow, floatable, blur] # [shadow, floatable, blur]
   sidebar:
-    effect: [shadow] # [shadow, floatable, blur]
+    effect: [shadow, floatable, blur] # [shadow, floatable, blur]
   body:
-    effect: [shadow] # [shadow, floatable, blur]
+    effect: [shadow, floatable, blur] # [shadow, floatable, blur]
     highlight:
       language: true # show language of codeblock
       grayscale: false # Enable grayscale effect

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 || '' %></p>
+          <p class='title'><i class="fa-solid fa-chevron-left" aria-hidden="true"></i><%- post.prev.title || post.prev.seo_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="fa-solid fa-chevron-right" aria-hidden="true"></i></p>
+          <p class='title'><%- post.next.title || post.next.seo_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/head.ejs

@@ -28,9 +28,12 @@
   <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"){ _%>

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

@@ -92,6 +92,7 @@
   theme.cdn.addJS("app")
   theme.cdn.addJS("parallax", "plugins/parallax")
   theme.cdn.addJS("rightMenu", "plugins/rightMenu")
+  theme.cdn.addJS("rightMenus", "plugins/rightMenus")
   theme.cdn.addJS("sites","plugins/tags/sites")
   theme.cdn.addJS("friends","plugins/tags/friends")
   theme.cdn.addJS("contributors","plugins/tags/contributors")

package/layout/_partial/scripts/global.ejs

@@ -5,6 +5,7 @@
   volantis.dom = {}; // 页面Dom see: /source/js/app.js etc.
 
   volantis.GLOBAL_CONFIG ={
+    debug: <%- JSON.stringify(theme.debug) %>,
     cdn: <%- JSON.stringify(theme.cdn.map) %>,
     default: <%- JSON.stringify(theme.default) %>,
     lastupdate: new Date(<%- theme.getStartTime %>),
@@ -34,7 +35,8 @@
         layout: <%- JSON.stringify(theme.rightmenu.layout) %>,
         music_alwaysShow: <%- JSON.stringify(theme.rightmenu.music.alwaysShow) %>,
         customPicUrl: <%- JSON.stringify(theme.rightmenu.customPicUrl) %>
-      }
+      },      
+      rightmenus: <%- JSON.stringify(theme.rightmenus) %>
     }
   }
 

package/layout/_partial/scripts/index.ejs

@@ -35,6 +35,10 @@
   <%- partial('../../_plugins/rightmenu/layout') %>
 <% } %>
 
+<% if (theme.rightmenus.enable) { %>
+  <%- partial('../../_plugins/rightmenus/layout') %>
+<% } %>
+
 <!-- rightmenu要在darkmode之前（ToggleButton） darkmode要在comments之前（volantis.dark.push）-->
 <% if (theme.plugins.darkmode.enable) { %>
   <%- partial('../../_plugins/darkmode/script') %>

package/layout/_plugins/aplayer/script.ejs

@@ -4,7 +4,7 @@
     // APlayer 需要在  MetingJS 之前加载
     await volantis.js("<%- theme.plugins.aplayer.js.aplayer %>")
     await volantis.js("<%- theme.plugins.aplayer.js.meting %>")
-  <% if (theme.rightmenu.enable && theme.rightmenu.layout.includes('music')) { %>
+  <% if ((theme.rightmenu.enable || theme.rightmenus.enable) && theme.rightmenu.layout.includes('music')) { %>
     // 右键 music 需要在 APlayer  MetingJS 之后加载
     await volantis.js('<%- theme.cdn.addJS("plugins/aplayer") %>')
   <% } %>

package/layout/_plugins/pjax/index.ejs

@@ -19,10 +19,6 @@
       pjax = new Pjax({
         elements: 'a[href]:not([href^="#"]):not([href="javascript:void(0)"]):not([pjax-fancybox]):not([onclick="return false;"]):not([onclick="return!1"]):not([target="_blank"]):not([target="view_window"]):not([href$=".xml"])',
         selectors: [
-          "head title",
-          "head meta[name='description']",
-          "head meta[name='keywords']",
-          "head meta[property^='og']",
           <% if (!theme.plugins.pjax.cover){ %>"#l_cover",<% } %>
           "#l_main",
           "#pjax-header-nav-list",

package/layout/_plugins/pjax/pdata.ejs

@@ -31,7 +31,6 @@ if (page && page.layout == 'post' && page.title) {
 <script>
   window.pdata={}
   pdata.ispage=<%=ispage%>;
-  pdata.postTitle="<%=postTitle%>";
   pdata.commentPath="<%=commentPath%>";
   pdata.commentPlaceholder="<%=commentPlaceholder%>";
   pdata.commentConfig=<%- JSON.stringify(commentConfig) %>;

package/layout/_plugins/rightmenus/layout.ejs

@@ -0,0 +1,137 @@
+<%
+  const rightMenu = {
+    defaultEvent: ['copyText', 'copyLink', 'copyPaste', 'copyAll', 'copyCut', 'copyImg', 'printMode', 'readMode'],
+    defaultGroup: ['navigation', 'inputBox', 'seletctText', 'elementCheck', 'articlePage'],
+    dataGet: (data, keyStr) => {
+      const keys = keyStr.split('.');
+      let currentData = data;
+      for (const key of keys) {
+        currentData = currentData?.[key];
+      }
+      return currentData;
+    },
+    initMenu: () => {
+      theme.rightmenus.order.forEach(item => {
+        let data = rightMenu.dataGet(theme.rightmenus, item);
+        if(item.includes('navigation')) {
+          rightMenu.loadNavigation(data)
+        } else if (item === 'music') {
+          rightMenu.loadMusic()
+        } else {
+          if(Array.isArray(data)) {
+            data.forEach(item => {
+              rightMenu.loadMenu(item) 
+            })  
+          } else {
+            rightMenu.loadMenu(data)   
+          }
+        }
+      })
+    },
+    initFunction: () => {
+      theme.rightmenus.order.forEach(item => {
+        let data = rightMenu.dataGet(theme.rightmenus, item);
+        if(Array.isArray(data)) {
+          data.forEach(item => {
+            rightMenu.rederFunction(item) 
+          })  
+        } else {
+          rightMenu.rederFunction(data)   
+        }
+      })
+    }
+  }
+%>
+
+<% rightMenu.loadMenu = item => { %>
+<%   if(item === undefined) { %>
+  <hr class="menuLoad-Content" >
+<%   } else if(item['id'] === undefined) { %>
+    <hr class="menuLoad-Content" >
+<%   } else if(item['link'] === undefined) { %>
+  <li class="menuLoad-Content">
+    <span class="vlts-menu fix-cursor-default event" id="<%- item.id %>" data-event="<%- item.event %>" data-group="<%- item.group %>">
+      <i class="<%- item.icon %> fa-fw"></i>
+      <%- item.name %>
+    </span>
+  </li> 
+<%   } else { %>
+  <li class="menuLoad-Content">
+    <a class="vlts-menu fix-cursor-default" id="<%- item.id %>" href="<%- item.link %>" data-group="<%- item.group %>">
+      <i class="<%- item.icon %> fa-fw"></i>
+      <%- item.name %>
+    </a>
+  </li> 
+<%   } %>
+<% } %>
+
+
+<% rightMenu.loadNavigation = objs => { %>
+  <li class='navigation menuNavigation-Content'>
+<%   objs.forEach(item => { %>
+<%     if(item.link === undefined) { %> 
+    <a class="nav icon-only fix-cursor-default" onclick="<%- item.event %>"><i class="<%- item.icon %> fa-fw"></i></a>
+<%     } else { %>
+    <a class="nav icon-only fix-cursor-default" href="<%- item.link %>"><i class="<%- item.icon %> fa-fw"></i></a>
+<%     } %>
+<%   }) %>
+  </li>
+<% } %>
+
+
+<% rightMenu.rederFunction = item => { %> 
+<%   if (!!item && !!item['event'] && item['group'] !== 'navigation') { %>
+<%     if (rightMenu.defaultEvent.some(value => { return value === item['event'] })) { %>
+  <!-- RightMenusFunction['<%- item.id %>'] = (fun) => {fun()} -->
+<%     } else if (item['group'] === 'seletctText') { %>  
+  RightMenusFunction['<%- item.id %>'] = (__text__) => {<%- item.event %>}
+<%     } else if (item['group'] === 'elementCheck') { %>  
+  RightMenusFunction['<%- item.id %>'] = (__link__) => {<%- item.event %>}
+<%     } else { %>  
+  RightMenusFunction['<%- item.id %>'] = () => {<%- item.event %>}
+<%     } %>  
+<%   } %>  
+<% } %>
+
+
+<% rightMenu.loadMusic = () => { %>
+<div id="menuMusic">
+  <li class='music name menuOption-Content'>
+    <p class='nav music-title fix-cursor-default'></p>
+  </li>
+  <li class='music ctrl'>
+    <a class='nav icon-only backward fix-cursor-default' href="/" onclick="return false;" title="backward">
+      <i class='<%= theme.rightmenus.options.iconPrefix %> fa-step-backward fa-fw'></i>
+    </a>
+    <a class='nav icon-only toggle fix-cursor-default' href="/" onclick="return false;" title="toggle">
+      <i class='<%= theme.rightmenus.options.iconPrefix %> fa-play fa-fw'></i>
+    </a>
+    <a class='nav icon-only forward fix-cursor-default' href="/" onclick="return false;" title="forward">
+      <i class='<%= theme.rightmenus.options.iconPrefix %> fa-step-forward fa-fw'></i>
+    </a>
+  </li>
+  <li class='music volume'>
+    <div class='nav volume'>
+      <div class="aplayer-volume-bar-wrap">
+        <div class="aplayer-volume-bar fix-cursor-pointer">
+          <div class="aplayer-volume"></div>
+          <i class='left <%= theme.rightmenus.options.iconPrefix %> fa-volume-off fa-fw'></i>
+          <i class='right <%= theme.rightmenus.options.iconPrefix %> fa-volume-up fa-fw'></i>
+        </div>
+      </div>
+    </div>
+  </li>
+</div>
+<% } %>
+
+
+<div id="rightmenu-wrapper">
+  <ul class="list-v rightmenu" id="rightmenu-content">
+    <% rightMenu.initMenu() %>
+  </ul>
+</div>
+<script src="<%- theme.cdn.map.js.rightMenus %>"></script>
+<script>
+  const RightMenusFunction = {};
+  <% rightMenu.initFunction() %>
+</script>

package/layout/_plugins/search/script.ejs

@@ -1,7 +1,7 @@
 <script>
-  const SearchServiceDataPathRoot = ("<%- config.root %>" || "/").endsWith("/")
-    ? "<%- config.root %>" || "/"
-    : "<%- config.root %>/" || "/";
+  const SearchServiceDataPathRoot = ("<%- config.root %>" || "/").endsWith("/") ?
+    "<%- config.root %>" || "/" :
+    "<%- config.root %>/" || "/";
   const SearchServiceDataPath = SearchServiceDataPathRoot + "content.json";
 
   function loadSearchScript() {
@@ -16,16 +16,23 @@
     });
 
     document.querySelectorAll(".u-search-form").forEach((e) => {
-      e.addEventListener("submit", (event)=>{event.preventDefault();}, false);
+      e.addEventListener("submit", (event) => {
+        event.preventDefault();
+      }, false);
     });
   }
 
   // 打开并搜索 字符串 s
   function OpenSearch(s) {
-    loadSearchScript().then(() => {
+    if (typeof SearchService === 'undefined')
+      loadSearchScript().then(() => {
+        SearchService.setQueryText(s);
+        SearchService.search();
+      });
+    else {
       SearchService.setQueryText(s);
       SearchService.search();
-    });
+    }
   }
 
   // 访问含有 ?s=xxx  的链接时打开搜索 // 与搜索引擎 structured data 相关: /scripts/helpers/structured-data/lib/config.js
@@ -40,4 +47,4 @@
   document.querySelectorAll(".input.u-search-input").forEach((e) => {
     e.addEventListener("focus", loadSearchService, false);
   });
-</script>
+</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-volantis",
-  "version": "5.0.0-rc.7",
+  "version": "5.0.0-rc.8",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/helpers/head/generate_title__keywords__description.js

@@ -78,14 +78,24 @@ hexo.extend.helper.register("generate_keywords", function (config, theme, page)
   }
   return `<meta name="keywords" content="${keywords}">`
 });
-// open_graph() 函数会生成一个 description 标签???  https://github.com/hexojs/hexo/blob/92b979f4a3fa8714aebd3d11c3295d466b870905/lib/plugins/helper/open_graph.js#L98
+
 hexo.extend.helper.register("generate_description", function (config, theme, page) {
   const hexo = this;
   let data = init(hexo, config, theme, page);
   let description = data.description
   if (!description) {
-    description += config.description
+    if (config.description) {
+      description = config.description
+    }else{
+      description = config.title
+    }
   }
   description += ` - ${config.author} - ${config.title}`
-  return `<meta name="description" content="${description}">`
-});
+  return `<meta desc name="description" content="${description}">`
+});
+// open_graph() 函数会生成一个 description 标签???  https://github.com/hexojs/hexo/blob/92b979f4a3fa8714aebd3d11c3295d466b870905/lib/plugins/helper/open_graph.js#L98
+// 移除 open_graph() 函数会生成的 description
+hexo.extend.filter.register('after_render:html', function(data) {
+  data = data.replace(/<meta name="description".*>/g, "");
+  return data;
+},99);

package/source/css/_defines/color.styl

@@ -65,8 +65,29 @@ $color-list-hl = convert(hexo-config('color_scheme.light.list_hl'))
 $color-meta = convert(hexo-config('color_scheme.light.meta'))
 
 // 深色配色方案在 darkmode.styl 中按需加载
-
-
+$color-dark-site-body = convert(hexo-config('color_scheme.dark.site_bd'))                    // Dark Grey 1
+$color-dark-read-bkg = convert(hexo-config('color_scheme.dark.site_bg'))
+$color-dark-read-post = convert(hexo-config('color_scheme.dark.card'))
+$color-dark-site-bg = convert(hexo-config('color_scheme.dark.site_bg'))                      // Dark Grey 2
+$color-dark-site-inner = convert(hexo-config('color_scheme.dark.site_inner'))
+$color-dark-site-footer = convert(hexo-config('color_scheme.dark.site_footer'))
+$color-dark-card = convert(hexo-config('color_scheme.dark.card'))                            // Dark Grey 3
+$color-dark-text = convert(hexo-config('color_scheme.dark.text'))
+
+$color-dark-block = convert(hexo-config('color_scheme.dark.block'))                           // Dark Grey 4
+$color-dark-codeblock = convert(hexo-config('color_scheme.dark.codeblock'))
+$color-dark-inlinecode = convert(hexo-config('color_scheme.dark.inlinecode'))
+$color-dark-h1 = convert(hexo-config('color_scheme.dark.h1'))
+$color-dark-h2 = convert(hexo-config('color_scheme.dark.h2'))
+$color-dark-h3 = convert(hexo-config('color_scheme.dark.h3'))
+$color-dark-h4 = convert(hexo-config('color_scheme.dark.h4'))
+$color-dark-h5 = convert(hexo-config('color_scheme.dark.h5'))
+$color-dark-h6 = convert(hexo-config('color_scheme.dark.h6'))
+$color-dark-p = convert(hexo-config('color_scheme.dark.p'))
+$color-dark-list = convert(hexo-config('color_scheme.dark.list'))
+$color-dark-list-hl = convert(hexo-config('color_scheme.dark.list_hl'))
+$color-dark-meta = convert(hexo-config('color_scheme.dark.meta'))
+$color-dark-link = convert(hexo-config('color_scheme.dark.meta'))
 
 bgcolor($c, $mix = 10)
   return mix($c, $color-card, $mix)

package/source/css/_first/base_first.styl

@@ -26,6 +26,7 @@
   outline: none
   margin: 0
   padding: 0
+  scrollbar()
 
 html
   color: var(--color-text)