hexo-theme-fluid 1.8.10 → 1.8.14

package/README.md

@@ -122,13 +122,11 @@ layout: about
 
 ## 支持
 
-你可以通过[爱发电](https://afdian.net/@zkqiang)支持我们的开源创作，资金将用于服务器开销以及今后的公共接口服务
+你可以扫描下方微信赞赏码支持我们的开源创作，资金将用于服务器及域名开销以及今后的公共接口服务。
 
-<a title="支持我们" href="https://afdian.net/@zkqiang" target="_blank">
-  <img src="https://github.com/fluid-dev/static/blob/master/hexo-theme-fluid/afdian.png?s=300&v=4" width="300" alt="爱发电">
-</a>
+<img src="https://github.com/fluid-dev/static/blob/master/hexo-theme-fluid/sponsor.png?s=200&v=4" width="200" alt="微信赞赏码">
 
-其他商业赞助可发送邮件至 zkqiang#126.com (#替换为@)
+同时我们正在寻找商业赞助商，如果贵司想在本页展示广告位（每月 6K+ Views 定向流量曝光），或者有其他赞助形式，可将联系方式发送邮件至 zkqiang#126.com (#替换为@)。
 
 ## 鸣谢
 

package/_config.yml

@@ -183,11 +183,19 @@ color:
   board_color: "#fff"
   board_color_dark: "#252d38"
 
+  # 滚动条颜色
+  # Color of scrollbar
+  scrollbar_color: "#c4c6c9"
+  scrollbar_color_dark: "#687582"
+  scrollbar_hover_color: "#a6a6a6"
+  scrollbar_hover_color_dark: "#9da8b3"
+
 # 主题字体配置
 # Font
 font:
   font_size: 16px
   font_family:
+  letter_spacing: 0.02em
   code_font_size: 85%
 
 # 指定自定义 .js 文件路径，支持列表；路径是相对 source 目录，如 /js/custom.js 对应存放目录 source/js/custom.js
@@ -251,6 +259,12 @@ web_analytics:  # 网页访问统计
     # REST API 服务器地址，国际版不填
     # Only the Chinese mainland users need to set
     server_url:
+    # 统计页面时获取路径的属性
+    # Get the attribute of the page path during statistics
+    path: window.location.pathname
+    # 开启后不统计本地路径( localhost 与 127.0.0.1 )
+    # If ture, ignore localhost & 127.0.0.1
+    ignore_local: false
 
 # 对页面中的图片和评论插件进行懒加载处理，可见范围外的元素不会提前加载
 # Lazy loading of images and comment plugin on the page
@@ -271,7 +285,7 @@ lazyload:
 
 # 图标库，包含了大量社交类图标，主题依赖的不包含在内，因此可自行修改，详见 https://hexo.fluid-dev.com/docs/icon/
 # Icon library, which includes many social icons, does not include those theme dependent, so your can modify link by yourself. See: https://hexo.fluid-dev.com/docs/en/icon/
-iconfont: //at.alicdn.com/t/font_1736178_kmeydafke9r.css
+iconfont: //at.alicdn.com/t/font_1736178_lbnruvf0jn.css
 
 
 #---------------------------
@@ -362,6 +376,17 @@ scroll_down_arrow:
 scroll_top_arrow:
   enable: true
 
+# Open Graph metadata
+# See: https://hexo.io/docs/helpers.html#open-graph
+open_graph:
+  enable: true
+  twitter_card: summary_large_image
+  twitter_id:
+  twitter_site:
+  google_plus:
+  fb_admins:
+  fb_app_id:
+
 
 #---------------------------
 # 页脚
@@ -518,13 +543,16 @@ post:
       format: "{} 字"
 
     # 估计阅读全文需要的时长
-    # Estimate the time required to read the full text
+    # Estimated reading time
     min2read:
       enable: true
       format: "{} 分钟"
-      # 每分钟阅读多少字，如果是技术文章，建议降低
-      # Words read per minute
-      words: 100
+      # 每个字词的长度，建议：中文≈2，英文≈5，中英混合可自行调节
+      # Average word length (chars count in word), ZH ≈ 2, EN ≈ 5
+      awl: 2
+      # 每分钟阅读字数，如果大部分是技术文章可适度调低
+      # Words per minute
+      wpm: 60
 
     # 浏览量计数
     # Number of visits
@@ -627,7 +655,7 @@ post:
     enable: false
     # 指定的插件，需要同时设置对应插件的必要参数
     # The specified plugin needs to set the necessary parameters at the same time
-    # Options: utterances | disqus | gitalk | valine | waline | changyan | livere | remark42 | twikoo
+    # Options: utterances | disqus | gitalk | valine | waline | changyan | livere | remark42 | twikoo | cusdis
     type: disqus
 
 
@@ -679,28 +707,32 @@ gitalk:
   pagerDirection: last
   distractionFreeMode: false
   createIssueManually: true
-  # 默认 proxy 已失效，解决方法请见下方链接
-  # The default proxy is invalid, please see the links for the solution
+  # 默认 proxy 可能会失效，解决方法请见下方链接
+  # The default proxy may be invalid, refer to the links for solutions
   # https://github.com/gitalk/gitalk/issues/429
   # https://github.com/Zibri/cloudflare-cors-anywhere
-  proxy: <your own proxy>/https://github.com/login/oauth/access_token
+  proxy: https://cors-anywhere.azm.workers.dev/https://github.com/login/oauth/access_token
 
 # Valine
 # 基于 LeanCloud
 # Based on LeanCloud
-# See: https://valine.js.org/configuration.html
+# See: https://valine.js.org/
 valine:
-  appid:
-  appkey:
-  placeholder: 说点什么
+  appId:
+  appKey:
   path: window.location.pathname
-  avatar: retro
+  placeholder:
+  avatar: 'retro'
   meta: ['nick', 'mail', 'link']
+  requiredFields: []
   pageSize: 10
-  lang: zh-CN
+  lang: 'zh-CN'
   highlight: false
   recordIP: false
-  serverURLs:
+  serverURLs: ''
+  emojiCDN:
+  emojiMaps:
+  enableQQ: false
 
 # Waline
 # 从 Valine 衍生而来，额外增加了服务端和多种功能
@@ -708,19 +740,19 @@ valine:
 # See: https://waline.js.org/
 waline:
   serverURL: ''
-  placeholder: 说点什么
   path: window.location.pathname
-  avatar: retro
+  placeholder:
   meta: ['nick', 'mail', 'link']
+  requiredMeta: ['nick']
+  lang: 'zh-CN'
+  emoji: ['https://cdn.jsdelivr.net/gh/walinejs/emojis/weibo']
+  dark: 'html[data-user-color-scheme="dark"]'
+  avatar: 'retro'
+  avatarCDN: 'https://seccdn.libravatar.org/avatar/'
+  avatarForce: false
+  wordLimit: 0
   pageSize: 10
-  lang: zh-CN
   highlight: true
-  avatarCDN:
-  avatarForce: false
-  requiredFields: []
-  emojiCDN: ''
-  emojiMaps: {}
-  anonymous:
 
 # 畅言 Changyan
 # 基于第三方的服务
@@ -746,6 +778,7 @@ remark42:
   site_id:
   max_shown_comments: 10
   locale: zh
+  components: ['embed']
 
 # Twikoo
 # 基于腾讯云开发
@@ -756,6 +789,15 @@ twikoo:
   region: ap-shanghai
   path: window.location.pathname
 
+# Cusdis
+# 基于第三方服务或自托管服务
+# Based on third-party or self-hosted service
+# See https://cusdis.com
+cusdis:
+  host:
+  app_id:
+  lang: zh-cn
+
 #---------------------------
 # 归档页
 # Archive Page
@@ -909,7 +951,7 @@ links:
     enable: false
     # 指定的插件，需要同时设置对应插件的必要参数
     # The specified plugin needs to set the necessary parameters at the same time
-    # Options: utterances | disqus | gitalk | valine | waline | changyan | livere | remark42 | twikoo
+    # Options: utterances | disqus | gitalk | valine | waline | changyan | livere | remark42 | twikoo | cusdis
     type: disqus
 
 
@@ -930,44 +972,44 @@ static_prefix:
   internal_css: /css
   internal_img: /img
 
-  anchor: https://cdn.jsdelivr.net/npm/anchor-js@4.3.0/
+  anchor: https://cdn.jsdelivr.net/npm/anchor-js@4/
 
-  github_markdown: https://cdn.jsdelivr.net/npm/github-markdown-css@4.0.0/
+  github_markdown: https://cdn.jsdelivr.net/npm/github-markdown-css@4/
 
-  jquery: https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/
+  jquery: https://cdn.jsdelivr.net/npm/jquery@3/dist/
 
-  bootstrap: https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/
+  bootstrap: https://cdn.jsdelivr.net/npm/bootstrap@4/dist/
 
-  highlightjs: https://cdn.jsdelivr.net/npm/highlight.js@10.6.0/
+  highlightjs: https://cdn.jsdelivr.net/npm/highlight.js@10/
 
-  prismjs: https://cdn.jsdelivr.net/npm/prismjs@1.23.0/
+  prismjs: https://cdn.jsdelivr.net/npm/prismjs@1/
 
-  tocbot: https://cdn.jsdelivr.net/npm/tocbot@4.12.2/dist/
+  tocbot: https://cdn.jsdelivr.net/npm/tocbot@4/dist/
 
-  typed: https://cdn.jsdelivr.net/npm/typed.js@2.0.11/lib/
+  typed: https://cdn.jsdelivr.net/npm/typed.js@2/lib/
 
-  fancybox: https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@3.5.7/dist/
+  fancybox: https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@3/dist/
 
-  nprogress: https://cdn.jsdelivr.net/npm/nprogress@0.2.0/
+  nprogress: https://cdn.jsdelivr.net/npm/nprogress@0/
 
-  mathjax: https://cdn.jsdelivr.net/npm/mathjax@3.1.2/es5/
+  mathjax: https://cdn.jsdelivr.net/npm/mathjax@3/es5/
 
-  katex: https://cdn.jsdelivr.net/npm/katex@0.13.0/dist/
+  katex: https://cdn.jsdelivr.net/npm/katex@0/dist/
 
   busuanzi: https://busuanzi.ibruce.info/busuanzi/2.3/
 
-  clipboard: https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/
+  clipboard: https://cdn.jsdelivr.net/npm/clipboard@2/dist/
 
-  mermaid: https://cdn.jsdelivr.net/npm/mermaid@8.9.2/dist/
+  mermaid: https://cdn.jsdelivr.net/npm/mermaid@8/dist/
 
-  valine: https://cdn.jsdelivr.net/npm/valine@1.4.14/dist/
+  valine: https://cdn.jsdelivr.net/npm/valine@1/dist/
 
-  waline: https://cdn.jsdelivr.net/npm/@waline/client@0.14.8/dist/
+  waline: https://cdn.jsdelivr.net/npm/@waline/client@1/dist/
 
-  gitalk: https://cdn.jsdelivr.net/npm/gitalk@1.7.2/dist/
+  gitalk: https://cdn.jsdelivr.net/npm/gitalk@1/dist/
 
-  disqusjs: https://cdn.jsdelivr.net/npm/disqusjs@1.3.0/dist/
+  disqusjs: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/
 
-  twikoo: https://cdn.jsdelivr.net/npm/twikoo@1.3.0/dist/
+  twikoo: https://cdn.jsdelivr.net/npm/twikoo@1/dist/
 
-  hint: /lib/hint/
+  hint: https://cdn.jsdelivr.net/npm/hint.css@2/

package/languages/eo.yml

@@ -0,0 +1,44 @@
+search:
+  title: Serĉi
+  keyword: ŝlosivorto
+  status:
+    success: v
+    error: x
+
+postTotal: Entute %d afiŝoj
+
+paginator:
+  pre: Antaŭa paĝo
+  next: Sekva paĝo
+
+post:
+  toc: Enhavtabelo
+  pre: Antaŭa afiŝo
+  next: Sekva afiŝo
+
+home:
+  title: Hejmpaĝo
+
+archive:
+  title: Arkivoj
+  subtitle: Arkivo
+
+tag:
+  title: Etikedoj
+  subtitle: Etikedo
+
+category:
+  title: Kategorioj
+  subtitle: Kategorio
+
+about:
+  title: Pri
+  subtitle: Pri
+
+page404:
+  title: Paĝo ne trovita
+  subtitle: Ho ve, Paĝo ne trovita~
+
+links:
+  title: Ligoj
+  subtitle: Ligoj de amikeco

package/layout/_partial/archive-list.ejs

@@ -7,9 +7,9 @@
       <% dateCursor = date(post.date, "YYYY") %>
       <p class="h5"><%= dateCursor %></p>
     <% } %>
-    <a href="<%- url_for(post.path) %>" class="list-group-item list-group-item-action">
+    <a href="<%= url_for(post.path) %>" class="list-group-item list-group-item-action">
       <span class="archive-post-title"><%= post.title %></span>
-      <time style="float: right;"><%- date(post.date, "MM-DD") %></time>
+      <time style="float: right;"><%= date(post.date, "MM-DD") %></time>
     </a>
   <% }) %>
 </div>

package/layout/_partial/beian.ejs

@@ -10,14 +10,14 @@
       <% if(theme.footer.beian.police_code) { %>
         <span>
           <a
-            href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=<%- theme.footer.beian.police_code %>"
+            href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=<%= theme.footer.beian.police_code %>"
             rel="nofollow noopener"
             class="beian-police"
             target="_blank"
           >
             <% if(theme.footer.beian.police_icon) { %>
               <span style="visibility: hidden; width: 0">|</span>
-              <img src="<%- url_for(theme.footer.beian.police_icon) %>" alt="police-icon"/>
+              <img src="<%= url_for(theme.footer.beian.police_icon) %>" alt="police-icon"/>
             <% } %>
             <span><%- theme.footer.beian.police_text %></span>
           </a>
@@ -26,7 +26,7 @@
         <span class="beian-police">
           <% if(theme.footer.beian.police_icon) { %>
             <span style="visibility: hidden; width: 0">|</span>
-            <img src="<%- url_for(theme.footer.beian.police_icon) %>" alt="police-icon"/>
+            <img src="<%= url_for(theme.footer.beian.police_icon) %>" alt="police-icon"/>
           <% } %>
           <span class="beian-police"><%- theme.footer.beian.police_text %></span>
         </span>

package/layout/_partial/comments/changyan.ejs

@@ -2,19 +2,9 @@
   <div id="SOHUCS" sid='<%= page.permalink %>'></div>
   <script type="text/javascript">
     Fluid.utils.loadComments('#SOHUCS', function() {
-      var appid = '<%= theme.changyan.appid %>';
-      var conf = '<%= theme.changyan.appkey %>';
-      var width = window.innerWidth || document.documentElement.clientWidth;
-      if (width < 960) {
-        window.document.write('<script id="changyan_mobile_js" charset="utf-8" type="text/javascript" src="http://changyan.sohu.com/upload/mobile/wap-js/changyan_mobile.js?client_id=' + appid + '&conf=' + conf + '"><\/script>');
-      } else {
-        Fluid.utils.createScript("https://changyan.sohu.com/upload/changyan.js", function() {
-          window.changyan.api.config({
-            appid: appid,
-            conf: conf
-          })
-        });
-      }
+      Fluid.utils.createScript("https://changyan.sohu.com/upload/changyan.js", function() {
+        window.changyan.api.config(<%- JSON.stringify(theme.changyan || {}) %>)
+      });
     });
   </script>
   <noscript>Please enable JavaScript to view the comments</noscript>

package/layout/_partial/comments/cusdis.ejs

@@ -0,0 +1,25 @@
+<% if (theme.cusdis.host && theme.cusdis.app_id) { %>
+  <div class="cusdis" style="width:100%">
+    <div id="cusdis_thread"
+      data-host="<%= theme.cusdis.host %>"
+      data-app-id="<%= theme.cusdis.app_id %>"
+      data-page-id="<%= md5(page.path) %>"
+      data-page-url="<%= page.path %>"
+      data-page-title="<%= page.title %>"
+      data-theme="<%= theme.dark_mode.default %>"
+    >
+    </div>
+  </div>
+  <script type="text/javascript">
+    Fluid.utils.loadComments('#cusdis_thread', function() {
+      Fluid.utils.createScript('<%= url_join(theme.cusdis.host,
+        `/js/widget/lang/${ String(theme.cusdis.lang || 'zh-cn').toLowerCase() }.js`) %>');
+      Fluid.utils.createScript('<%= url_join(theme.cusdis.host, 'js/cusdis.es.js') %>');
+      var schema = document.documentElement.getAttribute('data-user-color-scheme');
+      if (schema) {
+        document.querySelector('#cusdis_thread').dataset.theme = schema
+      }
+    });
+  </script>
+  <noscript>Please enable JavaScript to view the comments</noscript>
+<% } %>

package/layout/_partial/comments/disqus.ejs

@@ -21,7 +21,7 @@
         };
         Fluid.utils.loadComments('#disqus_thread', function() {
           var d = document, s = d.createElement('script');
-          s.src = '//' + '<%- theme.disqus.shortname %>' + '.disqus.com/embed.js';
+          s.src = '//' + '<%= theme.disqus.shortname %>' + '.disqus.com/embed.js';
           s.setAttribute('data-timestamp', new Date());
           (d.head || d.body).appendChild(s);
         });

package/layout/_partial/comments/gitalk.ejs

@@ -3,22 +3,14 @@
   <script type="text/javascript">
     Fluid.utils.loadComments('#gitalk-container', function() {
       Fluid.utils.createCssLink('<%= url_join(theme.static_prefix.internal_css, 'gitalk.css') %>')
-      Fluid.utils.createScript('<%= url_join(theme.static_prefix.gitalk, 'gitalk.min.js') %>', function () {
-        var gitalk = new Gitalk({
-          clientID: '<%= theme.gitalk.clientID %>',
-          clientSecret: '<%= theme.gitalk.clientSecret %>',
-          repo: '<%= theme.gitalk.repo %>',
-          owner: '<%= theme.gitalk.owner %>',
-          admin: <%- JSON.stringify(theme.gitalk.admin || []) %>,
-          id: '<%= md5(page.path) %>',
-          language: '<%= theme.gitalk.language %>',
-          labels: <%- JSON.stringify(theme.gitalk.labels || []) %>,
-          perPage: <%= theme.gitalk.perPage %>,
-          pagerDirection: '<%= theme.gitalk.pagerDirection %>',
-          createIssueManually: <%= theme.gitalk.createIssueManually %>,
-          distractionFreeMode: <%= theme.gitalk.distractionFreeMode %>,
-          proxy: '<%= theme.gitalk.proxy %>'
-        });
+      Fluid.utils.createScript('<%= url_join(theme.static_prefix.gitalk, 'gitalk.min.js') %>', function() {
+        var options = Object.assign(
+          <%- JSON.stringify(theme.gitalk || {}) %>,
+          {
+            id: '<%= md5(page.path) %>'
+          }
+        )
+        var gitalk = new Gitalk(options);
         gitalk.render('gitalk-container');
       });
     });

package/layout/_partial/comments/remark42.ejs

@@ -5,16 +5,14 @@
     if (schema !== 'light' && schema !== 'dark') {
       schema = 'light';
     }
-    var remark_config = {
-      host: '<%= theme.remark42.host %>',
-      site_id: '<%= theme.remark42.site_id %>',
-      components: ['embed'],
-      url: '<%= url_for(page.path) %>',
-      max_shown_comments: '<%= theme.remark42.max_shown_comments %>',
-      theme: schema,
-      page_title: '<%= page.title %>',
-      locale: '<%= theme.remark42.locale %>'
-    };
+    var remark_config = Object.assign(
+      <%- JSON.stringify(theme.remark42 || {}) %>,
+      {
+        url: '<%= url_for(page.path) %>',
+        page_title: '<%= page.title %>',
+        theme: schema,
+      }
+    );
 
     Fluid.utils.loadComments('#remark42', function() {
       (function (c) {

package/layout/_partial/comments/twikoo.ejs

@@ -3,12 +3,17 @@
   <script type="text/javascript">
     Fluid.utils.loadComments('#comments', function() {
       Fluid.utils.createScript('<%= url_join(theme.static_prefix.twikoo, 'twikoo.all.min.js') %>', function() {
-        twikoo.init({
-          el: '#twikoo',
-          envId: '<%= theme.twikoo.envId %>',
-          region: '<%= theme.twikoo.region %>',
-          path: '<%= theme.twikoo.path %>',
-        })
+        var options = Object.assign(
+          <%- JSON.stringify(theme.twikoo || {}) %>,
+          {
+            el: '#twikoo',
+            path: '<%= theme.twikoo.path %>',
+            onCommentLoaded: function() {
+              Fluid.plugins.initFancyBox('#twikoo .tk-content img:not(.tk-owo-emotion)');
+            }
+          }
+        )
+        twikoo.init(options)
       });
     });
   </script>

package/layout/_partial/comments/valine.ejs

@@ -1,22 +1,19 @@
-<% if (theme.valine.appid && theme.valine.appkey) { %>
+<% if (theme.valine.appId && theme.valine.appKey) { %>
   <div id="valine"></div>
   <script type="text/javascript">
     Fluid.utils.loadComments('#valine', function() {
-      Fluid.utils.createScript('<%= url_join(theme.static_prefix.valine, 'Valine.min.js') %>', function () {
-        new Valine({
-          el: "#valine",
-          app_id: "<%= theme.valine.appid %>",
-          app_key: "<%= theme.valine.appkey %>",
-          placeholder: "<%= theme.valine.placeholder %>",
-          path: <%= theme.valine.path %>,
-          avatar: "<%= theme.valine.avatar %>",
-          meta: <%- JSON.stringify(theme.valine.meta || []) %>,
-          pageSize: "<%= theme.valine.pageSize %>",
-          lang: "<%= theme.valine.lang %>",
-          highlight: <%= theme.valine.highlight %>,
-          recordIP: <%= theme.valine.recordIP %>,
-          serverURLs: "<%= theme.valine.serverURLs %>",
-        });
+      Fluid.utils.createScript('<%= url_join(theme.static_prefix.valine, 'Valine.min.js') %>', function() {
+        var options = Object.assign(
+          <%- JSON.stringify(theme.valine || {}) %>,
+          {
+            el: "#valine",
+            path: <%= theme.valine.path %>
+          }
+        )
+        new Valine(options);
+        Fluid.utils.waitElementVisible('#valine .vcontent', () => {
+          Fluid.plugins.initFancyBox('#valine .vcontent img:not(.vemoji)');
+        })
       });
     });
   </script>

package/layout/_partial/comments/waline.ejs

@@ -2,24 +2,18 @@
   <div id="waline"></div>
   <script type="text/javascript">
     Fluid.utils.loadComments('#waline', function() {
-      Fluid.utils.createScript('<%= url_join(theme.static_prefix.waline, 'Waline.min.js') %>', function () {
-        new Waline({
-          el: "#waline",
-          placeholder: "<%= theme.waline.placeholder %>",
-          path: <%= theme.waline.path %>,
-          avatar: "<%= theme.waline.avatar %>",
-          meta: <%- JSON.stringify(theme.waline.meta || []) %>,
-          pageSize: "<%= theme.waline.pageSize %>",
-          lang: "<%= theme.waline.lang %>",
-          highlight: <%= theme.waline.highlight %>,
-          serverURL: "<%= theme.waline.serverURL %>",
-          avatarCDN: "<%= theme.waline.avatarCDN %>",
-          avatarForce: <%= theme.waline.avatarForce %>,
-          requiredFields: <%- JSON.stringify(theme.waline.requiredFields || []) %>,
-          emojiCDN: "<%= theme.waline.emojiCDN %>",
-          emojiMaps: <%- JSON.stringify(theme.waline.emojiMaps) %>,
-          anonymous: <%= theme.waline.anonymous || 'null' %>,
-        });
+      Fluid.utils.createScript('<%= url_join(theme.static_prefix.waline, 'Waline.min.js') %>', function() {
+        var options = Object.assign(
+          <%- JSON.stringify(theme.waline || {}) %>,
+          {
+            el: '#waline',
+            path: <%= theme.waline.path %>
+          }
+        )
+        new Waline(options);
+        Fluid.utils.waitElementVisible('#waline .vcontent', () => {
+          Fluid.plugins.initFancyBox('#waline .vcontent img:not(.vemoji)');
+        })
       });
     });
   </script>

package/layout/_partial/css.ejs

@@ -7,7 +7,7 @@
   <% if (theme.code.highlight.enable) { %>
     <% var cssName %>
     <% if (theme.code.highlight.lib === 'highlightjs') { %>
-      <% cssName = theme.code.highlight.highlightjs.style.toLowerCase().replace(/(?<!([0-9]))\s(?!([0-9]))/g, '-').replace(/\s/g, '') %>
+      <% cssName = theme.code.highlight.highlightjs.style.toLowerCase().replace(/([^0-9])\s([^0-9])/g, '$1-$2').replace(/\s/g, '') %>
       <%- css_ex(theme.static_prefix.highlightjs, `/styles/${ cssName }.min.css`) %>
     <% } else if (theme.code.highlight.lib === 'prismjs') { %>
       <% var style = theme.code.highlight.prismjs.style %>
@@ -29,10 +29,9 @@
     <% } %>
   <% } %>
 
-  <% if ((is_post() || (is_page() && page.image_zoom)) && theme.post.image_zoom.enable) { %>
+  <% if (theme.post.image_zoom.enable && page.image_zoom !== false) { %>
     <%- css_ex(theme.static_prefix.fancybox, 'jquery.fancybox.min.css') %>
   <% } %>
-
 <% } %>
 
 <!-- 主题依赖的图标库，不要自行修改 -->

package/layout/_partial/footer.ejs

@@ -6,6 +6,6 @@
   <%- partial('_partial/beian.ejs') %>
   <% if(theme.web_analytics.cnzz) { %>
     <!-- cnzz Analytics Icon -->
-    <span id="cnzz_stat_icon_<%- theme.web_analytics.cnzz %>" style="display: none"></span>
+    <span id="cnzz_stat_icon_<%= theme.web_analytics.cnzz %>" style="display: none"></span>
   <% } %>
 </footer>

package/layout/_partial/head.ejs

@@ -5,28 +5,31 @@ var keywords = page.keywords || config.keywords
 if (keywords instanceof Array) {
   keywords = keywords.join(',')
 }
-var description = config.description
-if (page.description) {
-  description = page.description
-} else if(page.excerpt) {
-  description = strip_html(page.excerpt).substr(0, 200)
+var description = page.description || page.excerpt || (is_post() && page.content) || config.description
+if (description) {
+  description = escape_html(strip_html(description).substring(0, 200).trim()).replace(/\n/g, ' ')
 }
+var ogImage = page.og_img || page.index_img
+var ogConfig = Object.assign({ image: ogImage && url_for(ogImage) }, theme.open_graph)
 %>
 
 <head>
   <meta charset="UTF-8">
-  <link rel="apple-touch-icon" sizes="76x76" href="<%- url_for(theme.apple_touch_icon) %>">
-  <link rel="icon" href="<%- url_for(theme.favicon) %>">
-  <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no">
+  <link rel="apple-touch-icon" sizes="76x76" href="<%= url_for(theme.apple_touch_icon) %>">
+  <link rel="icon" href="<%= url_for(theme.favicon) %>">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0, shrink-to-fit=no">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <% if (theme.force_https) { %>
     <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
   <% } %>
   <meta name="theme-color" content="<%= theme.color.navbar_bg_color %>">
-  <meta name="description" content="<%= description %>">
   <meta name="author" content="<%= page.author || config.author %>">
   <meta name="keywords" content="<%= keywords %>">
+  <% if (theme.open_graph.enable) { %>
+    <%- open_graph(ogConfig) %>
+  <% } else { %>
+    <meta name="description" content="<%= description %>">
+  <% } %>
   <% if (theme.custom_head) { %>
     <%- theme.custom_head %>
   <% } %>