hexo-theme-fluid 1.9.5 → 1.9.7

package/README.md

@@ -135,7 +135,7 @@ layout: about
 
 英文文档翻译：[@EatRice](https://eatrice.top/) [@橙子杀手](https://ruru.eatrice.top) [@Sinetian](https://sinetian.github.io/)
 
-其他贡献：[@zhugaoqi](https://github.com/zhugaoqi) [@julydate](https://github.com/julydate)
+其他贡献：[@zhugaoqi](https://github.com/zhugaoqi) [@julydate](https://github.com/julydate) [@xiyuvi](https://xiyu.pro/)
 
 如你也想贡献代码，可参照[贡献指南](https://hexo.fluid-dev.com/docs/contribute/)
 

package/_config.yml

@@ -1098,3 +1098,5 @@ static_prefix:
   discuss: https://lib.baomitu.com/discuss/1.2.1/
 
   hint: https://lib.baomitu.com/hint.css/2.7.0/
+
+  moment: https://lib.baomitu.com/moment.js/2.29.4/

package/languages/zh-CN.yml

@@ -42,7 +42,7 @@ post:
   toc: '目录'
   prev_post: '上一篇'
   next_post: '下一篇'
-  updated: '本文最后更新于：%s'
+  updated: '本文最后更新于 %s'
   meta:
     wordcount: '%s 字'
     min2read: '%s 分钟'

package/layout/_partials/header/navigation.ejs

@@ -33,7 +33,7 @@
                   <% if (subText.indexOf('.title') !== -1) {
                     subText = subEach.key
                   } %>
-                  <a class="dropdown-item" href="<%= url_for(subEach.link) %>">
+                  <a class="dropdown-item" href="<%= url_for(subEach.link) %>" target="<%= subEach.target || '_self' %>">
                     <%- subEach.icon ? '<i class="' + subEach.icon + '"></i>' : '' %>
                     <span><%- subText %></span>
                   </a>
@@ -42,7 +42,7 @@
             </li>
           <% } else { %>
             <li class="nav-item">
-              <a class="nav-link" href="<%= url_for(each.link) %>">
+              <a class="nav-link" href="<%= url_for(each.link) %>" target="<%= each.target || '_self' %>">
                 <%- each.icon ? '<i class="' + each.icon + '"></i>' : '' %>
                 <span><%- text %></span>
               </a>

package/layout/_partials/plugins/moment.ejs

@@ -0,0 +1,30 @@
+<%
+var lang = (config.language || 'zh-cn').toLowerCase();
+
+import_script(`
+<script>
+  var relativeDate = function() {
+    var updatedTime = document.getElementById('updated-time');
+    if (updatedTime) {
+      var text = updatedTime.textContent;
+      var reg = /\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:Z|[+-]\\d{2}:\\d{2})/;
+      var matchs = text.match(reg);
+      if (matchs) {
+        var relativeTime = moment(matchs[0]).fromNow();
+        updatedTime.textContent = text.replace(reg, relativeTime);
+      }
+      updatedTime.style.display = '';
+    }
+  };
+  Fluid.utils.createScript('${url_join(theme.static_prefix.moment, 'moment.min.js')}', function() {
+    if (!'${lang}'.startsWith('en')) {
+      Fluid.utils.createScript('${url_join(theme.static_prefix.moment, 'locale/' + lang + '.min.js')}', function() {
+        relativeDate();
+      });
+    } else {
+      relativeDate();
+    }
+  });
+</script>
+`)
+%>

package/layout/index.ejs

@@ -27,7 +27,7 @@ page.banner_mask_alpha = theme.index.banner_mask_alpha
         </a>
       </h2>
 
-      <% var excerpt = post.description || post.excerpt || (theme.index.auto_excerpt.enable && post.content) %>
+      <% var excerpt = post.description || post.excerpt || (theme.index.auto_excerpt.enable && !post.encrypt && post.content) %>
       <a class="index-excerpt <%= index_img ? '' : 'index-excerpt__noimg' %>" href="<%= post_url %>" target="<%- theme.index.post_url_target %>">
         <div>
           <%- strip_html(excerpt).substring(0, 200).trim().replace(/\n/g, ' ') %>

package/layout/post.ejs

@@ -16,14 +16,15 @@ page.banner_mask_alpha = page.banner_mask_alpha || theme.post.banner_mask_alpha
           <article class="post-content mx-auto">
             <h1 id="seo-header"><%= page.subtitle || page.title %></h1>
             <% if (theme.post.updated.enable && theme.post.updated && compare_date(page.date, page.updated)) { %>
-              <p class="note note-<%= theme.post.updated.note_class || 'info' %>">
+              <p id="updated-time" class="note note-<%= theme.post.updated.note_class || 'info' %>" style="<%= theme.post.updated.relative ? 'display: none' : '' %>">
                 <% if (theme.post.updated.relative) { %>
                   <% if (theme.post.updated.content) { %>
                     <!-- compatible with older versions-->
-                    <%- theme.post.updated.content %><%- relative_date(page.updated, theme.post.updated.date_format) %>
+                    <%- theme.post.updated.content %><%- date(page.updated, 'YYYY-MM-DDTHH:mm:ssZ') %>
                   <% } else { %>
-                    <%- __('post.updated', relative_date(page.updated, theme.post.updated.date_format)) %>
+                    <%- __('post.updated', date(page.updated, 'YYYY-MM-DDTHH:mm:ssZ')) %>
                   <% } %>
+                  <%- partial('_partials/plugins/moment.ejs') %>
                 <% } else { %>
                   <% if (theme.post.updated.content) { %>
                     <!-- compatible with older versions-->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-fluid",
-  "version": "1.9.5",
+  "version": "1.9.7",
   "description": "An elegant Material-Design theme for Hexo.",
   "main": "package.json",
   "files": [

package/scripts/events/lib/footnote.js

@@ -94,7 +94,7 @@ module.exports = (hexo) => {
       html += '<li><span id="fn:' + item.index + '" class="footnote-text">';
       html += '<span>';
       const fn = hexo.render.renderSync({ text: item.content, engine: 'markdown' });
-      html += fn.replace(/(<p>)|(<\/p>)/g, '');
+      html += fn.replace(/(<p>)|(<\/p>)/g, '').replace(/<br>/g, '');
       html += '<a href="#fnref:' + item.index + '" rev="footnote" class="footnote-backref"> ↩</a></span></span></li>';
     });
 

package/scripts/events/lib/hello.js

@@ -16,7 +16,7 @@ module.exports = (hexo) => {
 |     _| |_     | | | \\_/ |, | || \\__/  |      |
 |    |_____|   [___]'.__.'_/[___]'.__.;__]     |
 |                                              |
-|             感谢使用 Fluid 主题 !            |
+|             感谢使用 Fluid 主题              |
 |    文档: https://hexo.fluid-dev.com/docs/    |
 |                                              |
 ------------------------------------------------
@@ -32,7 +32,7 @@ module.exports = (hexo) => {
 |     _| |_     | | | \\_/ |, | || \\__/  |      |
 |    |_____|   [___]'.__.'_/[___]'.__.;__]     |
 |                                              |
-|       Thank you for using Fluid theme !      |
+|       Thank you for using Fluid theme        |
 |   Docs: https://hexo.fluid-dev.com/docs/en/  |
 |                                              |
 ------------------------------------------------

package/scripts/events/lib/highlight.js

@@ -85,6 +85,7 @@ module.exports = (hexo) => {
       auto_detect: true,
       line_number: config.code.highlight.line_number || false
     });
+    hexo.config.syntax_highlighter = 'highlight.js';  // hexo v7.0.0+ config
     hexo.theme.config.code.highlight.highlightjs = objUtil.merge({}, hexo.theme.config.code.highlight.highlightjs, {
       light: resolveHighlight(hexo.theme.config.code.highlight.highlightjs.style),
       dark : hexo.theme.config.dark_mode.enable && resolveHighlight(hexo.theme.config.code.highlight.highlightjs.style_dark)
@@ -124,6 +125,7 @@ module.exports = (hexo) => {
       preprocess : config.code.highlight.prismjs.preprocess || false,
       line_number: config.code.highlight.line_number || false
     });
+    hexo.config.syntax_highlighter = 'prismjs';  // hexo v7.0.0+ config
     hexo.theme.config.code.highlight.prismjs = objUtil.merge({}, hexo.theme.config.code.highlight.prismjs, {
       light: resolvePrism(hexo.theme.config.code.highlight.prismjs.style),
       dark : hexo.theme.config.dark_mode.enable && resolvePrism(hexo.theme.config.code.highlight.prismjs.style_dark)

package/scripts/filters/post-filter.js

@@ -49,5 +49,7 @@ hexo.extend.generator.register('post', function(locals) {
 hexo.extend.filter.register('after_post_render', (page) => {
   // 移除 hexo-renderer-pandoc 生成的 <colgroup>
   page.content = page.content.replace(/<colgroup>.+?<\/colgroup>/gims, '');
+  // 移除 hexo-renderer-pandoc 生成的 <span class="footnote-text">...<br>...</span>
+  page.content = page.content.replace(/(class="footnote-text".+?)<br.+?>(.+?rev="footnote")/gims, '$1$2');
   return page;
 });

package/scripts/helpers/utils.js

@@ -2,12 +2,12 @@
 
 'use strict';
 
-const crypto = require('crypto');
+const md5 = require('../utils/crypto');
 const { decodeURL } = require('hexo-util');
 const compareVersions = require('../../scripts/utils/compare-versions');
 
 hexo.extend.helper.register('md5', function(string) {
-  return crypto.createHash('md5').update(string).digest('hex');
+  return md5(string);
 });
 
 hexo.extend.helper.register('require_version', function(current, require) {

package/scripts/helpers/wordcount.js

@@ -5,8 +5,13 @@
 const { stripHTML } = require('hexo-util');
 
 const getWordCount = (post) => {
+  // post.origin is the original post content of hexo-blog-encrypt
+  const content = stripHTML(post.origin || post.content).replace(/\r?\n|\r/g, '').replace(/\s+/g, '');
+
   if (!post.wordcount) {
-    post.wordcount = stripHTML(post.content).replace(/\r?\n|\r/g, '').replace(/\s+/g, '').length;
+    const zhCount = (content.match(/[\u4E00-\u9FA5]/g) || []).length;
+    const enCount = (content.replace(/[\u4E00-\u9FA5]/g, '').match(/[a-zA-Z0-9_\u0392-\u03c9\u0400-\u04FF]+|[\u4E00-\u9FFF\u3400-\u4dbf\uf900-\ufaff\u3040-\u309f\uac00-\ud7af\u0400-\u04FF]+|[\u00E4\u00C4\u00E5\u00C5\u00F6\u00D6]+|\w+/g) || []).length;
+    post.wordcount = zhCount + enCount
   }
   return post.wordcount;
 };

package/scripts/tags/checkbox.js

@@ -16,14 +16,14 @@ const checkbox = (args) => {
 
   const checked = (args[1] || '').length > 0 && args[1].trim() !== 'false';
   const inline = (args[2] || '').length > 0 && args[2].trim() !== 'false';
-  const enabled = (args[3] || '').length > 0 && args[3].trim() === 'false';
+  const disabled = (args[3] || '').length > 0 && args[3].trim() !== 'false';
 
   return `${!inline ? '<div>' : ''}
-            <input type="checkbox" ${enabled ? '' : 'disabled'} ${checked ? 'checked="checked"' : ''}>${text}
+            <input type="checkbox" ${disabled ? 'disabled' : ''} ${checked ? 'checked="checked"' : ''}>${text}
           ${!inline ? '</div>' : ''}`;
 
 };
 
-// {% cb text, checked?, inline? %}
+// {% cb text, checked?, inline?, disabled? %}
 hexo.extend.tag.register('checkbox', checkbox, { ends: false });
 hexo.extend.tag.register('cb', checkbox, { ends: false });

package/scripts/tags/fold.js

@@ -0,0 +1,22 @@
+const md5 = require('../utils/crypto');
+
+hexo.extend.tag.register('fold', (args, content) => {
+  args = args.join(' ').split('@');
+  const classes = args[0] || 'default';
+  const text = args[1] || '';
+  const id = 'collapse-' + md5(content).slice(0, 8);
+
+  return `
+    <div class="fold">
+      <div class="fold-title fold-${classes.trim()} collapsed" data-toggle="collapse" href="#${id}" role="button" aria-expanded="false" aria-controls="${id}">
+        <div class="fold-arrow">▶</div>${text}
+      </div>
+      <div class="fold-collapse collapse" id="${id}">
+        <div class="fold-content">
+          ${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}
+        </div>
+      </div>
+    </div>`;
+}, {
+  ends: true
+});

package/scripts/utils/crypto.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const crypto = require('crypto');
+
+const md5 = (content) => {
+  return crypto.createHash('md5').update(content).digest('hex');
+}
+
+module.exports = md5;

package/source/css/_pages/_base/color-schema.styl

@@ -19,6 +19,8 @@
   --button-hover-bg-color $button-hover-bg-color
   --highlight-bg-color $highlight-bg-color
   --inlinecode-bg-color $inlinecode-bg-color
+  --fold-title-color $text-color
+  --fold-border-color $line-color
 
 dark-colors()
   --body-bg-color $body-bg-color-dark
@@ -40,6 +42,8 @@ dark-colors()
   --button-hover-bg-color $button-hover-bg-color-dark
   --highlight-bg-color $highlight-bg-color-dark
   --inlinecode-bg-color $inlinecode-bg-color-dark
+  --fold-title-color $text-color-dark
+  --fold-border-color $line-color-dark
 
   img
     -webkit-filter brightness(.9)
@@ -59,7 +63,7 @@ dark-colors()
     transition background-color .2s ease-in-out
 
 if (hexo-config("dark_mode.enable"))
-  @media not print and (prefers-color-scheme: dark)
+  @media (prefers-color-scheme: dark)
     :root
       --color-mode "dark"
 
@@ -69,3 +73,7 @@ if (hexo-config("dark_mode.enable"))
   @media not print
     [data-user-color-scheme="dark"]
       dark-colors()
+
+  @media print
+    :root
+      --color-mode "light"

package/source/css/_pages/_index/index.styl

@@ -41,7 +41,7 @@
 
 .index-excerpt
   color var(--sec-text-color)
-  margin 0.5rem 0 0.5rem 0
+  margin 0.5rem 0
   height calc(1.4rem * 3)
   overflow hidden
   display flex
@@ -73,3 +73,8 @@
 
     .index-pin
       font-size 1.25rem
+
+  .index-excerpt
+    height auto
+    max-height calc(1.4rem * 3)
+    margin 0.25rem 0

package/source/css/_pages/_post/post-page.styl

@@ -20,7 +20,7 @@
   strong
     font-weight bold
 
-  & > *:first-child
+  & > *:nth-child(2)
     margin-top 0
 
   img

package/source/css/_pages/_post/post-tag.styl

@@ -1,3 +1,54 @@
+// fold
+.fold
+  margin 1rem 0
+  border 0.5px solid var(--fold-border-color)
+  position relative
+  clear both
+  border-radius 0.125rem
+
+  .fold-title
+    color var(--fold-title-color)
+    padding 0.5rem 0.75rem
+    font-size 0.9rem
+    font-weight bold
+    border-radius 0.125rem
+
+    &:not(.collapsed) > .fold-arrow
+      transform rotate(90deg)
+      transform-origin center center
+
+    .fold-arrow
+      display inline-block
+      margin-right 0.35rem
+      transition transform .3s ease-out
+
+  .fold-content
+    padding 1rem 1rem
+
+    & > *:last-child
+      margin-bottom 0
+
+.fold-default, .fold-secondary
+  background-color rgba(#bbbbbb, 0.25)
+
+.fold-primary
+  background-color rgba(#b7a0e0, 0.25)
+
+.fold-info
+  background-color rgba(#a0c5e4, 0.25)
+
+.fold-success
+  background-color rgba(#aedcae, 0.25)
+
+.fold-warning
+  background-color rgba(#f8d6a6, 0.25)
+
+.fold-danger
+  background-color rgba(#eca9a7, 0.25)
+
+.fold-light
+  background-color rgba(#fefefe, 0.25)
+
 // note
 .note
   padding 0.75rem
@@ -15,14 +66,14 @@
   *:last-child
     margin-bottom 0
 
+.note-default, .note-secondary
+  background-color rgba(#bbbbbb, 0.25)
+  border-color #777
+
 .note-primary
   background-color rgba(#b7a0e0, 0.25)
   border-color #6f42c1
 
-.note-secondary, note-default
-  background-color rgba(#bbbbbb, 0.25)
-  border-color #777
-
 .note-success
   background-color rgba(#aedcae, 0.25)
   border-color #5cb85c
@@ -53,23 +104,23 @@
   color var(--text-color)
   transition color .2s ease-in-out
 
-.label-default
-  background rgba(#bbbbbb, 0.25)
+.label-default, .label-secondary
+  background-color rgba(#bbbbbb, 0.25)
 
 .label-primary
-  background rgba(#b7a0e0, 0.25)
+  background-color rgba(#b7a0e0, 0.25)
 
 .label-info
-  background rgba(#a0c5e4, 0.25)
+  background-color rgba(#a0c5e4, 0.25)
 
 .label-success
-  background rgba(#aedcae, 0.25)
+  background-color rgba(#aedcae, 0.25)
 
 .label-warning
-  background rgba(#f8d6a6, 0.25)
+  background-color rgba(#f8d6a6, 0.25)
 
 .label-danger
-  background rgba(#eca9a7, 0.25)
+  background-color rgba(#eca9a7, 0.25)
 
 // button
 .markdown-body .btn

package/source/js/color-schema.js

@@ -11,6 +11,7 @@
   var defaultColorSchemaAttributeName = 'data-default-color-scheme';
   var colorToggleButtonSelector = '#color-toggle-btn';
   var colorToggleIconSelector = '#color-toggle-icon';
+  var iframeSelector = 'iframe';
 
   function setLS(k, v) {
     try {
@@ -247,6 +248,7 @@
           theme: giscusTheme,
         }
       };
+      giscus.style.cssText += 'color-scheme: normal;';
       giscus.contentWindow.postMessage({ 'giscus': message }, 'https://giscus.app');
     }
   }
@@ -276,4 +278,9 @@
       }
     }
   });
+
+  Fluid.utils.waitElementLoaded(iframeSelector, function() {
+    applyCustomColorSchemaSettings();
+  });
+  
 })(window, document);

package/source/js/events.js

@@ -166,19 +166,19 @@ Fluid.events = {
     }
     // eslint-disable-next-line no-console
     console.log(`
-------------------------------------------------
-|                                              |
-|     ________  __            _        __      |
-|    |_   __  |[  |          (_)      |  ]     |
-|      | |_ \\_| | | __   _   __   .--.| |      |
-|      |  _|    | |[  | | | [  |/ /'\`\\' |      |
-|     _| |_     | | | \\_/ |, | || \\__/  |      |
-|    |_____|   [___]'.__.'_/[___]'.__.;__]     |
-|                                              |
-|           Powered by Hexo x Fluid            |
-|         GitHub: https://git.io/JqpVD         |
-|                                              |
-------------------------------------------------
+-------------------------------------------------
+|                                               |
+|      ________  __            _        __      |
+|     |_   __  |[  |          (_)      |  ]     |
+|       | |_ \\_| | | __   _   __   .--.| |      |
+|       |  _|    | |[  | | | [  |/ /'\`\\' |      |
+|      _| |_     | | | \\_/ |, | || \\__/  |      |
+|     |_____|   [___]'.__.'_/[___]'.__.;__]     |
+|                                               |
+|            Powered by Hexo x Fluid            |
+| https://github.com/fluid-dev/hexo-theme-fluid |
+|                                               |
+-------------------------------------------------
     `);
   }
 };