hexo-theme-fluid 1.9.3 → 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.28.0/
+  prismjs: https://lib.baomitu.com/prism/1.29.0/
 
   tocbot: https://lib.baomitu.com/tocbot/4.18.2/
 
@@ -1082,12 +1082,12 @@ static_prefix:
 
   valine: https://lib.baomitu.com/valine/1.5.1/
 
-  waline: https://lib.baomitu.com/waline/2.6.3/
+  waline: https://lib.baomitu.com/waline/2.14.1/
 
   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.6.7/
+  twikoo: https://lib.baomitu.com/twikoo/1.6.8/
 
   hint: https://lib.baomitu.com/hint.css/2.7.0/

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/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/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/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>
 

package/package.json

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

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
@@ -155,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/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/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,