hexo-theme-fluid 1.9.6 → 1.9.8

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

@@ -24,7 +24,7 @@ favicon: /img/fluid.png
 # Icon for Apple touch
 apple_touch_icon: /img/fluid.png
 
-# 浏览器标签页中的标题分隔符，效果： 文章名 - 站点名
+# 浏览器标签页中的标题分隔符，效果：文章名 - 站点名
 # Title separator in browser tab, eg: article - site
 tab_title_separator: " - "
 
@@ -62,7 +62,7 @@ code:
     highlightjs:
       # 在链接中挑选 style 填入
       # Select a style in the link
-      # See: https://highlightjs.org/static/demo/
+      # See: https://highlightjs.org/demo/
       style: "github gist"
       style_dark: "dark"
 
@@ -109,8 +109,10 @@ fun_features:
     element: h1,h2,h3,h4,h5,h6
     # Options: left | right
     placement: left
-    # Options: hover | always | touch
+
+    # Options: hover | always
     visible: hover
+
     # Options: § | # | ❡
     icon: ""
 
@@ -128,7 +130,7 @@ fun_features:
 dark_mode:
   enable: true
   # 默认的选项（当用户手动切换后则不再按照默认模式），选择 `auto` 会优先遵循 prefers-color-scheme，其次按用户本地时间 18 点到次日 6 点之间进入暗色模式
-  # Default option (when the visitor switches manually, the default mode is no longer followed), choosing `auto` will give priority to prefers-color-scheme, and then enter the dark mode from 18:00 to 6:00 in the visitor’s local time
+  # Default option (when the visitor switches manually, the default mode is no longer followed), choosing `auto` will give priority to prefers-color-scheme, and then enter the dark mode from 18:00 to 6:00 in the visitor's local time
   # Options: auto | light | dark
   default: auto
 
@@ -154,7 +156,7 @@ color:
   navbar_text_color_dark: "#d0d0d0"
 
   # 副标题字体色
-  # Color of navigation bar text
+  # Color of subtitle text
   subtitle_color: "#fff"
   subtitle_color_dark: "#d0d0d0"
 
@@ -239,7 +241,7 @@ custom_css:
 
 # 网页访问统计
 # Analysis of website visitors
-web_analytics:  # 网页访问统计
+web_analytics:
   enable: false
 
   # 遵循访客浏览器"请勿追踪"的设置，如果开启则不统计其访问
@@ -265,16 +267,6 @@ web_analytics:  # 网页访问统计
     sid:
     cid:
 
-  # 51.la 站点统计 ID
-  # 51.la analytics
-  # See: https://www.51.la/user/site/index
-  woyaola:  # 51.la 站点统计 ID，参见
-
-  # 友盟/cnzz 站点统计 web_id
-  # cnzz analytics
-  # See: https://web.umeng.com/main.php?c=site&a=show
-  cnzz:
-
   # LeanCloud 计数统计，可用于 PV UV 展示，如果 `web_analytics: enable` 没有开启，PV UV 展示只会查询不会增加
   # LeanCloud count statistics, which can be used for PV UV display. If `web_analytics: enable` is false, PV UV display will only query and not increase
   leancloud:
@@ -290,6 +282,40 @@ web_analytics:  # 网页访问统计
     # If true, ignore localhost & 127.0.0.1
     ignore_local: false
 
+  # Umami Analytics，仅支持自部署。如果要展示 PV UV 需要填写所有配置项，否则只填写 `src` 和 `website_id` 即可
+  # Umami Analytics, only Self-host support. If you want to display PV UV need to set all config items, otherwise only set 'src' and 'website_id'
+  # See: https://umami.is/docs/authentication
+  umami:
+    # umami js 文件地址，需要在 umami 后台创建站点后获取
+    # umami js file url, get after create website in umami
+    src:
+
+    # umami 的 website id，需要在 umami 后台创建站点后获取
+    # umami website id, get after create website in umami
+    website_id:
+
+    # 如果你只想统计特定的域名可以填入此字段，多个域名通过逗号分隔，这可以避免统计 localhost。
+    # If you only want to tracker to specific domains you can fill in this field, multiple domain names are separated by commas, which can avoid tracker localhost
+    domains:
+
+    # 用于统计 PV UV 的开始时间，格式为 "YYYY-MM-DD"
+    # statistics on the start time, the format is "YYYY-MM-DD"
+    start_time: 2024-01-01
+
+    # 新建一个 umami viewOnly 用户，然后通过 login api 获取该用户 token
+    # create an umami viewOnly user, and then get user token through the login api
+    token:
+
+    # 填写 umami 部署的服务器地址，如 "https://umami.example.com"
+    # server url of umami deployment, such as "https://umami.example.com"
+    api_server:
+
+# Canonical 用于向 Google 搜索指定规范网址，开启前确保 hexo _config.yml 中配置 `url: http://yourdomain.com`
+# Canonical, to specify a canonical URL for Google Search, need to set up `url: http://yourdomain.com` in hexo _config.yml
+# See: https://support.google.com/webmasters/answer/139066
+canonical:
+  enable: false
+
 # 对页面中的图片和评论插件进行懒加载处理，可见范围外的元素不会提前加载
 # Lazy loading of images and comment plugin on the page
 lazyload:
@@ -309,7 +335,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_lbnruvf0jn.css
+iconfont: //at.alicdn.com/t/c/font_1736178_k526ubmyhba.css
 
 
 #---------------------------
@@ -430,9 +456,9 @@ footer:
   statistics:
     enable: false
 
-    # 统计数据来源，使用 leancloud 需要设置 `web_analytics: leancloud` 中的参数；使用 busuanzi 不需要额外设置，但是有时不稳定，另外本地运行时 busuanzi 显示统计数据很大属于正常现象，部署后会正常
-    # Data source. If use leancloud, you need to set the parameter in `web_analytics: leancloud`
-    # Options: busuanzi | leancloud
+    # 统计数据来源，使用 leancloud, umami 需要设置 `web_analytics` 中对应的参数；使用 busuanzi 不需要额外设置，但是有时不稳定，另外本地运行时 busuanzi 显示统计数据很大属于正常现象，部署后会正常
+    # Data source. If use leancloud, umami, you need to set the parameter in `web_analytics`
+    # Options: busuanzi | leancloud | umami
     source: "busuanzi"
 
   # 国内大陆服务器的备案信息
@@ -463,7 +489,7 @@ index:
   # Available: 0 - 100
   banner_img_height: 100
 
-  # 头图黑色蒙版的不透明度，available: 0 - 1.0， 1 是完全不透明
+  # 头图黑色蒙版的不透明度，available: 0 - 1.0，1 是完全不透明
   # Opacity of the banner mask, 1.0 is completely opaque
   # Available: 0 - 1.0
   banner_mask_alpha: 0.3
@@ -575,7 +601,7 @@ post:
       enable: false
       # 统计数据来源
       # Data Source
-      # Options: busuanzi | leancloud
+      # Options: busuanzi | leancloud | umami
       source: "busuanzi"
 
   # 在文章开头显示文章更新时间，该时间默认是 md 文件更新时间，可通过 front-matter 中 `updated` 手动指定（和 date 一样格式）
@@ -644,7 +670,8 @@ post:
     enable: true
 
     # CreativeCommons license
-    # Options: BY | BY-SA | BY-ND | BY-NC | BY-NC-SA | BY-NC-ND
+    # See: https://creativecommons.org/share-your-work/cclicenses/
+    # Options: BY | BY-SA | BY-ND | BY-NC | BY-NC-SA | BY-NC-ND | ZERO
     license: 'BY'
 
     # 显示作者
@@ -955,7 +982,7 @@ about:
   name: "Fluid"
   intro: "An elegant theme for Hexo"
   # 更多图标可从 https://hexo.fluid-dev.com/docs/icon/ 查找，`class` 代表图标的 css class，添加 `qrcode` 后，图标不再是链接而是悬浮二维码
-  # More icons can be found from https://hexo.fluid-dev.com/docs/en/icon/  `class` is the css class of the icon. If adding `qrcode`, The icon is no longer a link, but a hovering QR code
+  # More icons can be found from https://hexo.fluid-dev.com/docs/en/icon/  `class` is the css class of the icon. If adding `qrcode`, the icon is no longer a link, but a hovering QR code
   icons:
     - { class: "iconfont icon-github-fill", link: "https://github.com", tip: "GitHub" }
     - { class: "iconfont icon-douban-fill", link: "https://douban.com", tip: "豆瓣" }
@@ -1057,7 +1084,7 @@ static_prefix:
   internal_css: /css
   internal_img: /img
 
-  anchor: https://lib.baomitu.com/anchor-js/4.3.1/
+  anchor: https://lib.baomitu.com/anchor-js/5.0.0/
 
   github_markdown: https://lib.baomitu.com/github-markdown-css/4.0.0/
 
@@ -1087,7 +1114,7 @@ static_prefix:
 
   valine: https://lib.baomitu.com/valine/1.5.1/
 
-  waline: https://cdn.staticfile.org/waline/2.15.5/
+  waline: https://registry.npmmirror.com/@waline/client/2.15.8/files/dist/
 
   gitalk: https://lib.baomitu.com/gitalk/1.8.0/
 
@@ -1098,3 +1125,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/de.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: 'Alle Aufrufe: {}'

package/languages/en.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: 'Views: {}'

package/languages/eo.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: 'Vidoj: {}'

package/languages/es.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Compartir igual'
     NC: 'NC - No comercial'
     ND: 'ND - Sin obras derivadas'
+    ZERO: 'CC0 - Sin derechos autorales'
 
 footer:
   pv: 'Vistas: {}'

package/languages/ja.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: '閲覧合計数: {}'

package/languages/ru.yml

@@ -22,7 +22,7 @@ tag:
   title: 'Теги'
   subtitle: 'Теги'
   post_total: '%d сообщений всего'
-  
+
 about:
   menu: 'О'
   title: 'О'
@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: 'Просмотров: {}'

package/languages/zh-CN.yml

@@ -42,7 +42,7 @@ post:
   toc: '目录'
   prev_post: '上一篇'
   next_post: '下一篇'
-  updated: '本文最后更新于：%s'
+  updated: '本文最后更新于 %s'
   meta:
     wordcount: '%s 字'
     min2read: '%s 分钟'
@@ -57,6 +57,7 @@ post:
     SA: 'SA - 相同方式共享'
     NC: 'NC - 非商业性使用'
     ND: 'ND - 禁止演绎'
+    ZERO: 'CC0 - 无版权'
 
 footer:
   pv: '总访问量 {} 次'

package/languages/zh-HK.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - 相同方式共享'
     NC: 'NC - 非商業性使用'
     ND: 'ND - 禁止演繹'
+    ZERO: 'CC0 - 無著作權'
 
 footer:
   pv: '總訪問量 {} 次'

package/languages/zh-TW.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - 相同方式共享'
     NC: 'NC - 非商業性使用'
     ND: 'ND - 禁止演繹'
+    ZERO: 'CC0 - 無著作權'
 
 footer:
   pv: '總訪問量 {} 次'

package/layout/_partials/comments/waline.ejs

@@ -2,8 +2,8 @@
   <div id="waline"></div>
   <script type="text/javascript">
     Fluid.utils.loadComments('#waline', function() {
-      Fluid.utils.createCssLink('<%= url_join(theme.static_prefix.waline, 'waline.min.css') %>')
-      Fluid.utils.createScript('<%= url_join(theme.static_prefix.waline, 'waline.min.js') %>', function() {
+      Fluid.utils.createCssLink('<%= url_join(theme.static_prefix.waline, 'waline.css') %>')
+      Fluid.utils.createScript('<%= url_join(theme.static_prefix.waline, 'waline.js') %>', function() {
         var options = Object.assign(
           <%- JSON.stringify(theme.waline || {}) %>,
           {

package/layout/_partials/css.ejs

@@ -8,7 +8,7 @@
 
 <!-- 主题依赖的图标库，不要自行修改 -->
 <!-- Do not modify the link that theme dependent icons -->
-<%- css('//at.alicdn.com/t/font_1749284_hj8rtnfg7um.css') %>
+<%- css('//at.alicdn.com/t/c/font_1749284_5i9bdhy70f8.css') %>
 
 <%- css(theme.static_prefix.iconfont || theme.iconfont) %>
 

package/layout/_partials/footer/statistics.ejs

@@ -1,6 +1,6 @@
 <div class="statistics">
-  <% var pv_texts = (theme.footer.statistics.pv_format || __('footer.pv')).split('{}') %>
-  <% var uv_texts = (theme.footer.statistics.uv_format || __('footer.uv')).split('{}') %>
+  <% let pv_texts = (theme.footer.statistics.pv_format || __('footer.pv')).split('{}') %>
+  <% let uv_texts = (theme.footer.statistics.uv_format || __('footer.uv')).split('{}') %>
 
   <% if (theme.footer.statistics.source === 'leancloud') { %>
     <% if (pv_texts.length >= 2) { %>
@@ -35,5 +35,23 @@
       </span>
     <% } %>
     <% import_js(theme.static_prefix.busuanzi, 'busuanzi.pure.mini.js', 'defer') %>
+
+  <% } else if (theme.footer.statistics.source === 'umami') { %>
+    <% if (pv_texts.length >= 2) { %>
+      <span id="umami-site-pv-container" style="display: none">
+        <%- pv_texts[0] %>
+        <span id="umami-site-pv"></span>
+        <%- pv_texts[1] %>
+      </span>
+    <% } %>
+    <% if (uv_texts.length >= 2) { %>
+      <span id="umami-site-uv-container" style="display: none">
+        <%- uv_texts[0] %>
+        <span id="umami-site-uv"></span>
+        <%- uv_texts[1] %>
+      </span>
+    <% } %>
+    <% import_js(theme.static_prefix.internal_js, 'umami-view.js', 'defer') %>
   <% } %>
+
 </div>

package/layout/_partials/footer.ejs

@@ -11,8 +11,4 @@
     <!-- 备案信息 ICP for China -->
     <%- partial('_partials/footer/beian.ejs') %>
   <% } %>
-  <% if(theme.web_analytics.cnzz) { %>
-    <!-- cnzz Analytics Icon -->
-    <span id="cnzz_stat_icon_<%= theme.web_analytics.cnzz %>" style="display: none"></span>
-  <% } %>
 </div>

package/layout/_partials/head.ejs

@@ -15,8 +15,13 @@ var ogConfig = Object.assign({ image: ogImage && url_for(ogImage) }, theme.open_
 
 <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) %>">
+  <% if (theme.canonical.enable) { %>
+    <link rel="canonical" href="<%= url_join(config.url, page.canonical_path.replace('index.html', '')) %>"/>
+  <% } %>
+
   <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) { %>

package/layout/_partials/plugins/analytics.ejs

@@ -15,7 +15,7 @@
     </script>
   <% } %>
 
-  <% if (theme.web_analytics.google){ %>
+  <% if (theme.web_analytics.google && theme.web_analytics.google.measurement_id){ %>
     <!-- Google tag (gtag.js) -->
     <script async>
       if (!Fluid.ctx.dnt) {
@@ -25,12 +25,25 @@
             dataLayer.push(arguments);
           }
           gtag('js', new Date());
-          gtag('config', '<%- theme.web_analytics.google.measurement_id %>');
+          gtag('config', '<%= theme.web_analytics.google.measurement_id %>');
         });
       }
     </script>
   <% } %>
 
+  <% if(theme.web_analytics.umami && theme.web_analytics.umami.src && theme.web_analytics.umami.website_id) { %>
+    <script async>
+      if (!Fluid.ctx.dnt) {
+        let umami = document.createElement('script');
+        umami.async = true;
+        umami.src = "<%= theme.web_analytics.umami.src %>";
+        umami.setAttribute("data-website-id", "<%= theme.web_analytics.umami.website_id %>");
+        umami.setAttribute("data-domains", "<%= theme.web_analytics.umami.domains %>");
+        document.head.appendChild(umami);
+      }
+    </script>
+  <% } %>
+
   <% if(theme.web_analytics.tencent && theme.web_analytics.tencent.sid && theme.web_analytics.tencent.cid) { %>
     <!-- Tencent Analytics -->
     <script async>
@@ -51,24 +64,6 @@
     </script>
   <% } %>
 
-  <% if(theme.web_analytics.woyaola) { %>
-    <!-- 51.la Analytics -->
-    <script async>
-      if (!Fluid.ctx.dnt) {
-        Fluid.utils.createScript('//js.users.51.la/<%= theme.web_analytics.woyaola %>.js');
-      }
-    </script>
-  <% } %>
-
-  <% if(theme.web_analytics.cnzz) { %>
-    <!-- cnzz Analytics -->
-    <script async>
-      if (!Fluid.ctx.dnt) {
-        Fluid.utils.createScript('//s4.cnzz.com/z_stat.php?id=<%= theme.web_analytics.cnzz %>&show=pic');
-      }
-    </script>
-  <% } %>
-
   <% if(theme.web_analytics.leancloud && theme.web_analytics.leancloud.app_id && theme.web_analytics.leancloud.app_key) { %>
     <% import_js(theme.static_prefix.internal_js, 'leancloud.js', 'defer') %>
   <% } %>

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/_partials/post/copyright.ejs

@@ -42,10 +42,16 @@
               <% for (var idx = 0; idx < items.length; idx++) { %>
                 <a class="print-no-link" target="_blank" href="https://creativecommons.org/licenses/<%= license.toLowerCase() %>/4.0/">
                   <span class="hint--top hint--rounded" aria-label="<%- __('post.copyright.' + items[idx]) %>">
-                    <i class="iconfont icon-<%= items[idx].toLowerCase() %>"></i>
+                    <i class="iconfont icon-cc-<%= items[idx].toLowerCase() %>"></i>
                   </span>
                 </a>
               <% } %>
+            <% } else if (license === 'ZERO') {  %>
+              <a class="print-no-link" target="_blank" href="https://creativecommons.org/publicdomain/zero/1.0/">
+                <span class="hint--top hint--rounded" aria-label="<%- __('post.copyright.ZERO') %>">
+                  <i class="iconfont icon-cc-zero"></i>
+                </span>
+              </a>
             <% } else { %>
               <%- license %>
             <% } %>

package/layout/_partials/post/meta-top.ejs

@@ -51,12 +51,20 @@
           <%- views_texts[0] %><span id="leancloud-page-views"></span><%- views_texts[1] %>
         </span>
         <% import_js(theme.static_prefix.internal_js, 'leancloud.js', 'defer') %>
+      
       <% } else if (theme.post.meta.views.source === 'busuanzi')  { %>
         <span id="busuanzi_container_page_pv" style="display: none">
           <i class="iconfont icon-eye" aria-hidden="true"></i>
           <%- views_texts[0] %><span id="busuanzi_value_page_pv"></span><%- views_texts[1] %>
         </span>
         <% import_js(theme.static_prefix.busuanzi, 'busuanzi.pure.mini.js', 'defer') %>
+
+      <% } else if (theme.post.meta.views.source === 'umami')  { %>
+        <span id="umami-page-views-container" class="post-meta" style="display: none">
+          <i class="iconfont icon-eye" aria-hidden="true"></i>
+          <%- views_texts[0] %><span id="umami-page-views"></span><%- views_texts[1] %>
+        </span>
+        <% import_js(theme.static_prefix.internal_js, 'umami-view.js', 'defer') %>
       <% } %>
     <% } %>
   </div>

package/layout/about.ejs

@@ -18,7 +18,7 @@ page.banner_mask_alpha = page.banner_mask_alpha || theme.about.banner_mask_alpha
         <% var isQr = each.qrcode %>
         <a <%= isQr ? '' : ('href=' + url_for(each.link)) %> class="<%= isQr ? 'qr-trigger' : '' %>
            <%= !isQr && each.tip ? 'hint--bottom hint--rounded' : '' %>"
-           <%= !isQr && each.tip ? 'aria-label=' + each.tip : '' %>
+           <% if (!isQr && each.tip) { %>aria-label="<%= each.tip %>"<% } %>
            target="<%= isQr ? '_self' : '_blank' %>"
         >
           <i class="<%= cls %>" aria-hidden="true"></i>

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.6",
+  "version": "1.9.8",
   "description": "An elegant Material-Design theme for Hexo.",
   "main": "package.json",
   "files": [

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/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/wordcount.js

@@ -5,16 +5,13 @@
 const { stripHTML } = require('hexo-util');
 
 const getWordCount = (post) => {
-  const lang = post.lang.toLowerCase();
   // 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) {
-    if (['zh-cn', 'zh-hk', 'zh-tw'].includes(lang)) {
-      post.wordcount = (content.match(/[\u4E00-\u9FA5]/g) || []).length;
-    } else {
-      post.wordcount = (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;
-    }
+    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,15 @@ 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';
+  const content = hexo.render.renderSync({ text: text, engine: 'markdown' }).replace(/(<p>)|(<\/p>)/g, '').replace(/<br>/g, '');
 
   return `${!inline ? '<div>' : ''}
-            <input type="checkbox" ${enabled ? '' : 'disabled'} ${checked ? 'checked="checked"' : ''}>${text}
+            <input type="checkbox" ${disabled ? 'disabled' : ''} ${checked ? 'checked="checked"' : ''}>${content}
           ${!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

@@ -11,8 +11,10 @@ hexo.extend.tag.register('fold', (args, content) => {
       <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-content collapse' id="${id}">
-        ${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}
+      <div class="fold-collapse collapse" id="${id}">
+        <div class="fold-content">
+          ${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}
+        </div>
       </div>
     </div>`;
 }, {

package/source/css/_pages/_base/_widget/header.styl

@@ -24,6 +24,7 @@
 
     i
       font-size 0.875rem
+      line-height inherit
 
     i:only-child
       margin 0 .2rem

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

@@ -42,8 +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
-  --fold-border-color $line-color
+  --fold-title-color $text-color-dark
+  --fold-border-color $line-color-dark
 
   img
     -webkit-filter brightness(.9)

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

@@ -8,11 +8,17 @@
     padding-left 2rem
     padding-right 2rem
 
+  .page-content, .post-content
+    overflow hidden
+
 @media (max-width: 424px)
   .post-content, post-custom
     padding-left 1rem
     padding-right 1rem
 
+  .page-content, .post-content
+    overflow hidden
+
   .anchorjs-link-left
     opacity 0 !important
 
@@ -20,17 +26,13 @@
   strong
     font-weight bold
 
-  & > *:first-child
+  & > *:nth-child(2)
     margin-top 0
 
   img
     object-fit cover
     max-width 100%
 
-@media (max-width: 767px)
-  .page-content, .post-content
-    overflow-x hidden
-
 .post-metas
   display flex
   flex-wrap wrap

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

@@ -23,30 +23,31 @@
       transition transform .3s ease-out
 
   .fold-content
-    & > *
-      margin 0
+    padding 1rem 1rem
 
-    & > p
-      padding 1rem 1rem
+    & > *:last-child
+      margin-bottom 0
 
-.fold-default
-  background rgba(#bbbbbb, 0.25)
+.fold-default, .fold-secondary
+  background-color rgba(#bbbbbb, 0.25)
 
 .fold-primary
-  background rgba(#b7a0e0, 0.25)
+  background-color rgba(#b7a0e0, 0.25)
 
 .fold-info
-  background rgba(#a0c5e4, 0.25)
+  background-color rgba(#a0c5e4, 0.25)
 
 .fold-success
-  background rgba(#aedcae, 0.25)
+  background-color rgba(#aedcae, 0.25)
 
 .fold-warning
-  background rgba(#f8d6a6, 0.25)
+  background-color rgba(#f8d6a6, 0.25)
 
 .fold-danger
-  background rgba(#eca9a7, 0.25)
+  background-color rgba(#eca9a7, 0.25)
 
+.fold-light
+  background-color rgba(#fefefe, 0.25)
 
 // note
 .note
@@ -65,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
@@ -103,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

@@ -248,7 +248,7 @@
           theme: giscusTheme,
         }
       };
-      giscus.style.cssText += 'color-scheme: normal;';
+      // giscus.style.cssText += 'color-scheme: normal;';
       giscus.contentWindow.postMessage({ 'giscus': message }, 'https://giscus.app');
     }
   }

package/source/js/events.js

@@ -125,7 +125,7 @@ Fluid.events = {
       var url = src.match(/\((.*?)\)/)[1].replace(/(['"])/g, '');
       var img = new Image();
       img.onload = function() {
-        window.NProgress && window.NProgress.inc(0.2);
+        window.NProgress && window.NProgress.status !== null && window.NProgress.inc(0.2);
       };
       img.src = url;
       if (img.complete) { img.onload(); }
@@ -137,7 +137,7 @@ Fluid.events = {
       const old = img.onload;
       img.onload = function() {
         old && old();
-        window.NProgress && window.NProgress.inc(0.5 / total);
+        window.NProgress && window.NProgress.status !== null && window.NProgress.inc(0.5 / total);
       };
       if (img.complete) { img.onload(); }
     }
@@ -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 |
+|                                               |
+-------------------------------------------------
     `);
   }
 };

package/source/js/umami-view.js

@@ -0,0 +1,99 @@
+// 从配置文件中获取 umami 的配置
+const website_id = CONFIG.web_analytics.umami.website_id;
+// 拼接请求地址
+const request_url = `${CONFIG.web_analytics.umami.api_server}/websites/${website_id}/stats`;
+
+const start_time = new Date(CONFIG.web_analytics.umami.start_time).getTime();
+const end_time = new Date().getTime();
+const token = CONFIG.web_analytics.umami.token;
+
+// 检查配置是否为空
+if (!website_id) {
+  throw new Error("Umami website_id is empty");
+}
+if (!request_url) {
+  throw new Error("Umami request_url is empty");
+}
+if (!start_time) {
+  throw new Error("Umami start_time is empty");
+}
+if (!token) {
+  throw new Error("Umami token is empty");
+}
+
+// 构造请求参数
+const params = new URLSearchParams({
+  startAt: start_time,
+  endAt: end_time,
+});
+// 构造请求头
+const request_header = {
+  method: "GET",
+  headers: {
+    "Content-Type": "application/json",
+    "x-umami-api-key": "oZKCH3msvqt10VlXKwoJvHclmaS4bVx0",
+  },
+};
+
+// 获取站点统计数据
+async function siteStats() {
+  try {
+    const response = await fetch(`${request_url}?${params}`, request_header);
+    const data = await response.json();
+    const uniqueVisitors = data.uniques.value; // 获取独立访客数
+    const pageViews = data.pageviews.value; // 获取页面浏览量
+
+    let pvCtn = document.querySelector("#umami-site-pv-container");
+    if (pvCtn) {
+      let ele = document.querySelector("#umami-site-pv");
+      if (ele) {
+        ele.textContent = pageViews; // 设置页面浏览量
+        pvCtn.style.display = "inline"; // 将元素显示出来
+      }
+    }
+
+    let uvCtn = document.querySelector("#umami-site-uv-container");
+    if (uvCtn) {
+      let ele = document.querySelector("#umami-site-uv");
+      if (ele) {
+        ele.textContent = uniqueVisitors;
+        uvCtn.style.display = "inline";
+      }
+    }
+  } catch (error) {
+    console.error(error);
+    return "-1";
+  }
+}
+
+// 获取页面浏览量
+async function pageStats(path) {
+  try {
+    const response = await fetch(`${request_url}?${params}&url=${path}`, request_header);
+    const data = await response.json();
+    const pageViews = data.pageviews.value;
+
+    let viewCtn = document.querySelector("#umami-page-views-container");
+    if (viewCtn) {
+      let ele = document.querySelector("#umami-page-views");
+      if (ele) {
+        ele.textContent = pageViews;
+        viewCtn.style.display = "inline";
+      }
+    }
+  } catch (error) {
+    console.error(error);
+    return "-1";
+  }
+}
+
+siteStats();
+
+// 获取页面容器
+let viewCtn = document.querySelector("#umami-page-views-container");
+// 如果页面容器存在，则获取页面浏览量
+if (viewCtn) {
+  let path = window.location.pathname;
+  let target = decodeURI(path.replace(/\/*(index.html)?$/, "/"));
+  pageStats(target);
+}