hexo-theme-fluid 1.9.2 → 1.9.4

package/_config.yml

@@ -1060,7 +1060,7 @@ static_prefix:
 
   bootstrap: https://lib.baomitu.com/twitter-bootstrap/4.6.1/
 
-  prismjs: https://lib.baomitu.com/prism/1.27.0/
+  prismjs: https://lib.baomitu.com/prism/1.29.0/
 
   tocbot: https://lib.baomitu.com/tocbot/4.18.2/
 
@@ -1070,24 +1070,24 @@ static_prefix:
 
   nprogress: https://lib.baomitu.com/nprogress/0.2.0/
 
-  mathjax: https://lib.baomitu.com/mathjax/3.2.1/
+  mathjax: https://lib.baomitu.com/mathjax/3.2.2/
 
-  katex: https://lib.baomitu.com/KaTeX/0.15.6/
+  katex: https://lib.baomitu.com/KaTeX/0.16.2/
 
   busuanzi: https://busuanzi.ibruce.info/busuanzi/2.3/
 
-  clipboard: https://lib.baomitu.com/clipboard.js/2.0.10/
+  clipboard: https://lib.baomitu.com/clipboard.js/2.0.11/
 
   mermaid: https://lib.baomitu.com/mermaid/8.14.0/
 
-  valine: https://lib.baomitu.com/valine/1.4.17/
+  valine: https://lib.baomitu.com/valine/1.5.1/
 
-  waline: https://lib.baomitu.com/waline/2.5.1/
+  waline: https://lib.baomitu.com/waline/2.14.1/
 
-  gitalk: https://lib.baomitu.com/gitalk/1.7.2/
+  gitalk: https://lib.baomitu.com/gitalk/1.8.0/
 
   disqusjs: https://lib.baomitu.com/disqusjs/1.3.0/
 
-  twikoo: https://lib.baomitu.com/twikoo/1.5.11/
+  twikoo: https://lib.baomitu.com/twikoo/1.6.8/
 
   hint: https://lib.baomitu.com/hint.css/2.7.0/

package/languages/ru.yml

@@ -0,0 +1,69 @@
+name: 'Русский'
+
+home:
+  menu: 'Главная'
+  title: 'Главная'
+
+archive:
+  menu: 'Архивы'
+  title: 'Архивы'
+  subtitle: 'Архивы'
+  post_total: '%d сообщений всего'
+
+category:
+  menu: 'Категории'
+  title: 'Категории'
+  subtitle: 'Категории'
+  post_total: '%d сообщений всего'
+  more: 'More...'
+
+tag:
+  menu: 'Теги'
+  title: 'Теги'
+  subtitle: 'Теги'
+  post_total: '%d сообщений всего'
+  
+about:
+  menu: 'О'
+  title: 'О'
+  subtitle: 'О'
+
+links:
+  menu: 'Ссылки'
+  title: 'Ссылки'
+  subtitle: 'Ссылки'
+
+page404:
+  menu: 'Страница не найдена'
+  title: 'Страница не найдена'
+  subtitle: 'Страница не найдена'
+
+post:
+  toc: 'Оглавление'
+  prev_post: 'Предыдущий'
+  next_post: 'Следующий'
+  updated: 'Последнее обновление %s'
+  meta:
+    wordcount: '%s слов'
+    min2read: '%s минут'
+    views: '{} просмотров'
+  copyright:
+    author: 'Автор'
+    posted: 'Опубликовано на'
+    updated: 'Обновлено'
+    license: 'Лицензировано под'
+    CC: 'CC - Creative Commons license'
+    BY: 'BY - Attribution'
+    SA: 'SA - Share-alike'
+    NC: 'NC - Non-commercial'
+    ND: 'ND - No derivative works'
+
+footer:
+  pv: 'Просмотров: {}'
+  uv: 'Посетителей: {}'
+
+search:
+  title: 'Поиск'
+  keyword: 'Ключевое слово'
+
+noscript_warning: 'Блог лучше всего работает с включенным JavaScript'

package/layout/404.ejs

@@ -9,7 +9,7 @@ page.banner_mask_alpha = theme.page404.banner_mask_alpha
 
 <script>
   function redirect() {
-    location.href = "/";
+    location.href = "<%- url_for('/') %>";
   }
 
   <% if (theme.page404.redirect_delay) { %>

package/layout/_partials/category-list.ejs

@@ -2,7 +2,7 @@
   <% return curCats.each((cat) => { %>
     <% var subCats = site.categories.find({ parent: cat._id }).sort(params.orderBy || 'name').filter(cat => cat.length) %>
     <% var collapsed = subCats.length === 0 || depth >= theme.category.collapse_depth %>
-    <% if ((params.activeIds || []).includes(cat._id)) collapsed = false %>
+    <% if ((params.filterIds || []).includes(cat._id)) collapsed = false %>
     <div class="<%= depth <= 0 ? 'category' : 'category-sub' %> row nomargin-x">
       <a class="<%= depth <= 0 ? 'category-item' : 'category-subitem' %> <%= collapsed ? 'collapsed' : '' %>
           list-group-item category-item-action col-10 col-md-11 col-xm-11" title="<%= cat.name.trim() %>"
@@ -49,7 +49,7 @@
       <% } else { %>
         <a href="<%= url_for(post.path) %>" title="<%= post.title %>"
            class="list-group-item list-group-item-action
-           <%= (params.activeIds || []).includes(post._id) ? 'active' : ''  %>">
+           <%= (params.filterIds || []).includes(post._id) ? 'active' : ''  %>">
           <span class="category-post"><%= post.title %></span>
         </a>
       <% } %>

package/layout/_partials/comments.ejs

@@ -1,5 +1,8 @@
 <% if ((!is_post() && !is_page()) || (is_post() && theme.post.comments.enable && page.comments) || (is_page() && page.comments)) { %>
-  <article id="comments">
-    <%- partial('_partials/comments/' + (typeof page.comment === 'string' && page.comment !== '' ? page.comment : theme.post.comments.type)) %>
-  </article>
+  <% var commentType = typeof page.comment === 'string' && page.comment !== '' ? page.comment : theme.post.comments.type %>
+  <% if (commentType) { %>
+    <article id="comments">
+      <%- partial('_partials/comments/' + commentType) %>
+    </article>
+  <% } %>
 <% } %>

package/layout/_partials/head.ejs

@@ -7,7 +7,7 @@ if (keywords instanceof Array) {
 }
 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, ' ')
+  description = 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)

package/layout/_partials/header/navigation.ejs

@@ -24,7 +24,7 @@
               <a class="nav-link dropdown-toggle" target="_self" href="javascript:;" role="button"
                  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <%- each.icon ? '<i class="' + each.icon + '"></i>' : '' %>
-                <%- text %>
+                <span><%- text %></span>
               </a>
               <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                 <% for(const subEach of each.submenu || []) { %>
@@ -35,7 +35,7 @@
                   } %>
                   <a class="dropdown-item" href="<%= url_for(subEach.link) %>">
                     <%- subEach.icon ? '<i class="' + subEach.icon + '"></i>' : '' %>
-                    <%- subText %>
+                    <span><%- subText %></span>
                   </a>
                 <% } %>
               </div>
@@ -44,7 +44,7 @@
             <li class="nav-item">
               <a class="nav-link" href="<%= url_for(each.link) %>">
                 <%- each.icon ? '<i class="' + each.icon + '"></i>' : '' %>
-                <%- text %>
+                <span><%- text %></span>
               </a>
             </li>
           <% } %>
@@ -52,15 +52,16 @@
         <% if(theme.search.enable) { %>
           <li class="nav-item" id="search-btn">
             <a class="nav-link" target="_self" href="javascript:;" data-toggle="modal" data-target="#modalSearch" aria-label="Search">
-              &nbsp;<i class="iconfont icon-search"></i>&nbsp;
+              <i class="iconfont icon-search"></i>
             </a>
           </li>
           <% import_js(theme.static_prefix.internal_js, 'local-search.js') %>
         <% } %>
         <% if(theme.dark_mode && theme.dark_mode.enable) { %>
           <li class="nav-item" id="color-toggle-btn">
-            <a class="nav-link" target="_self" href="javascript:;" aria-label="Color Toggle">&nbsp;<i
-                class="iconfont icon-dark" id="color-toggle-icon"></i>&nbsp;</a>
+            <a class="nav-link" target="_self" href="javascript:;" aria-label="Color Toggle">
+              <i class="iconfont icon-dark" id="color-toggle-icon"></i>
+            </a>
           </li>
         <% } %>
       </ul>

package/layout/_partials/plugins/anchorjs.ejs

@@ -18,6 +18,21 @@ import_script(`
       window.anchors.options.class = 'anchorjs-link-left';
     }
     window.anchors.add(res.join(', '));
+
+    Fluid.events.registerRefreshCallback(function() {
+      if ('anchors' in window) {
+        anchors.removeAll();
+        var el = (CONFIG.anchorjs.element || 'h1,h2,h3,h4,h5,h6').split(',');
+        var res = [];
+        for (var item of el) {
+          res.push('.markdown-body > ' + item.trim());
+        }
+        if (CONFIG.anchorjs.placement === 'left') {
+          anchors.options.class = 'anchorjs-link-left';
+        }
+        anchors.add(res.join(', '));
+      }
+    });
   });
 </script>
 `)

package/layout/_partials/plugins/encrypt.ejs

@@ -6,8 +6,8 @@ import_script(`
         var hbePrefix = document.querySelector('hbe-prefix');
         hbePrefix.parentElement.classList.add('markdown-body');
         Fluid.utils.retry(function() {
-          if (Fluid.boot && Fluid.boot.refreshPlugins) {
-            Fluid.boot.refreshPlugins();
+          if (Fluid.boot && Fluid.boot.refresh) {
+            Fluid.boot.refresh();
             return true;
           }
         }, 100, 10);

package/layout/_partials/plugins/math.ejs

@@ -31,6 +31,15 @@
           MathJax.typeset();
           MathJax.typesetPromise();
         }
+
+        Fluid.events.registerRefreshCallback(function() {
+          if ('MathJax' in window && MathJax.startup.document && typeof MathJax.startup.document.state === 'function') {
+            MathJax.startup.document.state(0);
+            MathJax.texReset();
+            MathJax.typeset();
+            MathJax.typesetPromise();
+          }
+        });
       </script>
     `)
 

package/layout/_partials/plugins/mermaid.ejs

@@ -1,5 +1,11 @@
 <script>
   Fluid.utils.createScript('<%= url_join(theme.static_prefix.mermaid, 'mermaid.min.js') %>', function() {
     mermaid.initialize(<%- JSON.stringify(theme.post.mermaid.options || {}) %>);
+
+    Fluid.events.registerRefreshCallback(function() {
+      if ('mermaid' in window) {
+        mermaid.init();
+      }
+    });
   });
 </script>

package/layout/_partials/post/category-bar.ejs

@@ -1,17 +1,17 @@
 <%
-var parent = page.categories
+var parent = page.categories.filter(c => !c.parent)
 if (Array.isArray(page.category_bar)) {
-  parent = parent.filter(cat => page.category_bar.indexOf(cat.name) !== -1)
+  parent = page.categories.filter(cat => page.category_bar.indexOf(cat.name) !== -1)
 }
-var activeIds = page.categories.map(c => c._id)
-activeIds.push(page._id)
+var filterIds = page.categories.map(c => c._id)
+filterIds.push(page._id)
 %>
 
 <%- partial('_partials/category-list', {
   curCats  : parent,
   params: {
     type     : 'post',
-    activeIds: activeIds,
+    filterIds: filterIds,
     postLimit: theme.post.category_bar.post_limit,
     postOrderBy: theme.post.category_bar.post_order_by || config.index_generator.order_by
   }

package/layout/_partials/post/copyright.ejs

@@ -1,6 +1,6 @@
 <% if (theme.post.copyright.enable && page.copyright !== false) { %>
   <%
-    var license = theme.post.copyright.license
+    var license = theme.post.copyright.license || ''
     if (typeof page.copyright === 'string') {
       license = page.copyright
     } else if (typeof page.license === 'string') {
@@ -33,23 +33,25 @@
           <div><%= full_date(page.updated, theme.post.copyright.update_date.format || 'LL') %></div>
         </div>
       <% } %>
-      <div class="license-meta-item">
-        <div><%- __('post.copyright.licensed') %></div>
-        <div>
-          <% if (['BY', 'BY-SA', 'BY-ND', 'BY-NC', 'BY-NC-SA', 'BY-NC-ND'].indexOf(license) !== -1) { %>
-            <% var items = license.split('-') %>
-            <% for (var idx = 0; idx < items.length; idx++) { %>
-              <a 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>
-              </span>
-              </a>
+      <% if (license) { %>
+        <div class="license-meta-item">
+          <div><%- __('post.copyright.licensed') %></div>
+          <div>
+            <% if (['BY', 'BY-SA', 'BY-ND', 'BY-NC', 'BY-NC-SA', 'BY-NC-ND'].indexOf(license) !== -1) { %>
+              <% var items = license.split('-') %>
+              <% for (var idx = 0; idx < items.length; idx++) { %>
+                <a 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>
+                  </span>
+                </a>
+              <% } %>
+            <% } else { %>
+              <%- license %>
             <% } %>
-          <% } else { %>
-            <%- license %>
-          <% } %>
+          </div>
         </div>
-      </div>
+      <% } %>
     </div>
     <div class="license-icon iconfont"></div>
   </div>

package/layout/_partials/post/toc.ejs

@@ -1,5 +1,8 @@
 <div id="toc">
-  <p class="toc-header"><i class="iconfont icon-list"></i>&nbsp;<%- __('post.toc') %></p>
+  <p class="toc-header">
+    <i class="iconfont icon-list"></i>
+    <span><%- __('post.toc') %></span>
+  </p>
   <div class="toc-body" id="toc-body"></div>
 </div>
 
@@ -12,22 +15,34 @@ import_script(`
     var boardCtn = jQuery('#board-ctn');
     var boardTop = boardCtn.offset().top;
 
-    window.tocbot.init({
+    window.tocbot.init(Object.assign({
       tocSelector     : '#toc-body',
       contentSelector : '.markdown-body',
-      headingSelector : CONFIG.toc.headingSelector || 'h1,h2,h3,h4,h5,h6',
       linkClass       : 'tocbot-link',
       activeLinkClass : 'tocbot-active-link',
       listClass       : 'tocbot-list',
       isCollapsedClass: 'tocbot-is-collapsed',
       collapsibleClass: 'tocbot-is-collapsible',
-      collapseDepth   : CONFIG.toc.collapseDepth || 0,
       scrollSmooth    : true,
-      headingsOffset  : -boardTop
-    });
+      includeTitleTags: true,
+      headingsOffset  : -boardTop,
+    }, CONFIG.toc));
     if (toc.find('.toc-list-item').length > 0) {
       toc.css('visibility', 'visible');
     }
+
+    Fluid.events.registerRefreshCallback(function() {
+      if ('tocbot' in window) {
+        tocbot.refresh();
+        var toc = jQuery('#toc');
+        if (toc.length === 0 || !tocbot) {
+          return;
+        }
+        if (toc.find('.toc-list-item').length > 0) {
+          toc.css('visibility', 'visible');
+        }
+      }
+    });
   });
 </script>
 `)

package/layout/index.ejs

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

package/package.json

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

package/scripts/helpers/scope.js

@@ -7,20 +7,26 @@ const pageInScope = (page, scope) => {
     case 'home':
       return Boolean(page.__index);
     case 'post':
+    case 'posts':
       return Boolean(page.__post);
-    case 'archives' || 'archive':
+    case 'archives':
+    case 'archive':
       return Boolean(page.archive);
-    case 'categories' || 'category':
+    case 'categories':
+    case 'category':
       return page.layout === 'categories' || page.layout === 'category';
-    case 'tags' || 'tag':
+    case 'tags':
+    case 'tag':
       return page.layout === 'tags' || page.layout === 'tag';
     case 'about':
       return page.layout === 'about';
-    case 'links' || 'link':
+    case 'links':
+    case 'link':
       return page.layout === 'links';
     case '404':
       return page.layout === '404';
-    case 'page' || 'custom':
+    case 'page':
+    case 'custom':
       return Boolean(page.__page);
   }
 };

package/scripts/helpers/wordcount.js

@@ -5,6 +5,9 @@
 const { stripHTML } = require('hexo-util');
 
 const getWordCount = (post) => {
+  if (!post.wordcount) {
+    post.wordcount = stripHTML(post.content).replace(/\r?\n|\r/g, '').replace(/\s+/g, '').length;
+  }
   return post.wordcount;
 };
 
@@ -32,10 +35,3 @@ hexo.extend.helper.register('wordtotal', (site) => {
   });
   return symbolsCount(count);
 });
-
-hexo.extend.filter.register('after_post_render', (page) => {
-  const meta = hexo.theme.config.post.meta;
-  if (meta.wordcount.enable || meta.min2read.enable) {
-    page.wordcount = stripHTML(page.content).replace(/\r?\n|\r/g, '').replace(/\s+/g, '').length;
-  }
-}, 0);

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

@@ -25,6 +25,9 @@
     i
       font-size 0.875rem
 
+    i:only-child
+      margin 0 .2rem
+
   .navbar-toggler
     border-width 0
     outline 0
@@ -52,6 +55,7 @@
     color var(--navbar-text-color)
     background-color rgba(0, 0, 0, 0.3)
     border none
+    min-width 8rem
     -webkit-transition background .5s ease-in-out,padding .5s ease-in-out
     transition background .5s ease-in-out,padding .5s ease-in-out
 
@@ -154,6 +158,9 @@
   width 80%
   overflow-wrap break-word
 
+  .typed-cursor
+    margin 0 .2rem
+
 @media (max-width: 767px)
   #subtitle, .typed-cursor
     font-size 1.5rem

package/source/css/_pages/_category/category-bar.styl

@@ -46,8 +46,7 @@
       &::before
         content "\e61f"
         font-weight initial
-        position absolute
-        left -1.25rem
+        margin-right .25rem
 
   .list-group-count
     margin-left .2rem

package/source/css/_pages/_post/highlight.styl

@@ -10,10 +10,12 @@
     padding-bottom 1.45rem
     padding-right 1rem
     line-height 1.5
+    margin-bottom 1rem
 
   .code-wrapper
     position relative
     border-radius 4px
+    margin-bottom 1rem
 
   .hljs, .highlight pre, .code-wrapper pre, figure.highlight td.gutter
     transition color .2s ease-in-out, background-color .2s ease-in-out

package/source/js/boot.js

@@ -11,43 +11,11 @@ Fluid.boot.registerEvents = function() {
   Fluid.events.registerImageLoadedEvent();
 };
 
-Fluid.boot.refreshPlugins = function() {
+Fluid.boot.refresh = function() {
   Fluid.plugins.fancyBox();
   Fluid.plugins.codeWidget();
-
-  if ('tocbot' in window) {
-    tocbot.refresh();
-    var toc = jQuery('#toc');
-    if (toc.length === 0 || !tocbot) { return; }
-    if (toc.find('.toc-list-item').length > 0) {
-      toc.css('visibility', 'visible');
-    }
-  }
-
-  if ('anchors' in window) {
-    anchors.removeAll();
-    var el = (CONFIG.anchorjs.element || 'h1,h2,h3,h4,h5,h6').split(',');
-    var res = [];
-    for (var item of el) {
-      res.push('.markdown-body > ' + item.trim());
-    }
-    if (CONFIG.anchorjs.placement === 'left') {
-      anchors.options.class = 'anchorjs-link-left';
-    }
-    anchors.add(res.join(', '));
-  }
-
-  if ('MathJax' in window && MathJax.startup.document && typeof MathJax.startup.document.state === 'function') {
-    MathJax.startup.document.state(0);
-    MathJax.texReset();
-    MathJax.typeset();
-    MathJax.typesetPromise();
-  }
-
-  if ('mermaid' in window) {
-    mermaid.init();
-  }
-}
+  Fluid.events.refresh();
+};
 
 document.addEventListener('DOMContentLoaded', function() {
   Fluid.boot.registerEvents();

package/source/js/color-schema.js

@@ -176,6 +176,10 @@
           }
         });
       }
+      if (document.documentElement.getAttribute('data-user-color-scheme')) {
+        var color = getComputedStyle(document.documentElement).getPropertyValue('--navbar-bg-color').trim()
+        document.querySelector('meta[name="theme-color"]').setAttribute('content', color)
+      }
     }
   }
 

package/source/js/events.js

@@ -143,6 +143,23 @@ Fluid.events = {
     }
   },
 
+  registerRefreshCallback: function(callback) {
+    if (!Array.isArray(Fluid.events._refreshCallbacks)) {
+      Fluid.events._refreshCallbacks = [];
+    }
+    Fluid.events._refreshCallbacks.push(callback);
+  },
+
+  refresh: function() {
+    if (Array.isArray(Fluid.events._refreshCallbacks)) {
+      for (var callback of Fluid.events._refreshCallbacks) {
+        if (callback instanceof Function) {
+          callback();
+        }
+      }
+    }
+  },
+
   billboard: function() {
     if (!('console' in window)) {
       return;

package/source/js/plugins.js

@@ -14,7 +14,7 @@ Fluid.plugins = {
     var typed = new window.Typed('#subtitle', {
       strings: [
         '  ',
-        text + ' '
+        text
       ],
       cursorChar: CONFIG.typing.cursorChar,
       typeSpeed : CONFIG.typing.typeSpeed,