1.3.4

- fix(queue): remove load idle - fix(info): fix isolation_info
iblh · Apr 9, 2017 · 2ae8a85 · 2ae8a85
2 parents 588a1bc + 55992a7
commit 2ae8a85
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@
 
 [![Author](https://img.shields.io/badge/author-Viosey-blue.svg?style=flat-square)](https://viosey.com)
 [![QQ Group](https://img.shields.io/badge/QQ%20%E7%BE%A4-566308505-blue.svg?style=flat-square)](http://jq.qq.com/?_wv=1027&k=40Vdy24)
-[![Version](https://img.shields.io/badge/version-1.3.3-green.svg?style=flat-square)]()
+[![Version](https://img.shields.io/badge/version-1.3.4-green.svg?style=flat-square)]()
 [![Hexo](https://img.shields.io/badge/hexo-3.0+-green.svg?style=flat-square)](https://hexo.io)
 [![Build Status](https://img.shields.io/travis/viosey/hexo-theme-material.svg?style=flat-square)](https://travis-ci.org/viosey/hexo-theme-material)
 

diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
@@ -2,7 +2,7 @@
     <!--
         © Material Theme
         https://github.com/viosey/hexo-theme-material
-        Version: 1.3.3 -->
+        Version: 1.3.4 -->
 
     <!-- Title -->
     <%

diff --git a/layout/_partial/import_js.ejs b/layout/_partial/import_js.ejs
@@ -67,10 +67,8 @@
 
     <!-- Start Queue -->
     $(document).ready(function(){
-        setTimeout(function(){
-            setInterval(function(){
-                queue.execNext();
-            },200);
-        },3000);
+        setInterval(function(){
+            queue.execNext();
+        },200);
     });
 </script>
diff --git a/layout/_partial/isolate_info.ejs b/layout/_partial/isolate_info.ejs
@@ -32,7 +32,13 @@
         </span>
 
         <p class="header-slogan header-item">
-            <%= theme.uiux.slogan %>
+        <% if(theme.uiux.slogan) { %>
+            <% if(Array.isArray(theme.uiux.slogan)) { %>
+                <%- theme.uiux.slogan.join('<br>') %>
+            <% } else { %>
+                <%- theme.uiux.slogan %>
+            <% } %>
+        <% } %>
         </p>
 
         <!-- Header Nav -->
@@ -43,14 +49,15 @@
                 </a>
             </span>
 
-          <!-- Independent Pages -->
-          <% for (var i in theme.pages) { %>
-              <span class="header-nav-item">
-                  <a href="<%= theme.pages[i] || '#' %>" title="<%= i %>">
-                      <span><%= i %></span>
-                  </a>
-              </span>
-          <% } %>
+            <!-- Pages  -->
+            <% for (var i in theme.sidebar.pages) { %>
+                <span class="header-nav-item">
+                    <a href="<%= theme.sidebar.pages[i] || '#' %>" title="<%= i %>">
+                        <span><%= i %></span>
+                    </a>
+                </span>
+            <% } %>
+
         </nav>
 
         <!-- Header SNS -->

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-material",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Material Design Theme for Hexo",
   "scripts": {
     "test": "echo \"Error: no test specified\"",