Merge branch 'dev' into master

更新内容請看 https://github.com/jerryc127/hexo-theme-butterfly/releases

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,7 +12,7 @@ IMPORTANT: Please follow the template to create a new issue.
 重要：請依照該模板來提交。
 
 If you upgrade from the old version, and an error occurs when running, please copy the new content in the config to the butterfly.yml
-如果你是由舊版本升級到新版，執行時出現報錯，請首先把config裡新的內容複製到舊的butterfly設定去（如有）
+如果你是由舊版本升級到新版，執行時出現報錯，請首先把config裡新的內容複製到舊的butterfly設定去
 
 If you are a problem when visit the website, please open your browser 'developer tools (shortcut F12)' and check the console if there is an error, include your website address in the feedback
 如果你是線上訪問出現問題，請檢查瀏覽器‘開發人員工具（快捷鍵F12）’的console是否有報錯，反饋時附上你的網站

README.md

@@ -15,8 +15,6 @@ Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) t
 
 ## Installation
 
-### GIT
-
 Stable branch [recommend]:
 
 ```
@@ -29,16 +27,6 @@ Dev branch:
 git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
 
-### NPM
-
-> It supports Hexo 5.0.0 or later
-
-In Hexo site root directory 
-
-```powershell
-npm i hexo-theme-butterfly
-```
-
 ## Configuration
 
  Set theme in the hexo work folder's root config file `_config.yml`: 

README_CN.md

@@ -16,28 +16,16 @@
 
 ## 安裝
 
-### Git 安裝
+在你的博客根目錄裡安裝穩定版【推薦】
 
-在博客根目錄裡安裝穩定版【推薦】
-
-```powershell
+```
 git clone -b master https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
 
 如果想要安裝比較新的dev分支，可以
 
-```powershell
-git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
-
-### npm 安裝
-
-> 此方法只支持Hexo 5.0.0以上版本
-
-在博客根目錄裡
-
-```powershell
-npm i hexo-theme-butterfly
+git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
 
 ## 應用主題

layout/includes/head/config.pug

@@ -88,7 +88,6 @@
 script.
   var GLOBAL_CONFIG = { 
     root: '!{config.root}',
-    hexoversion: '!{get_hexo_version()}',
     algolia: !{algolia},
     localSearch: !{localSearch},
     translate: !{translate},

layout/includes/third-party/comments/livere.pug

@@ -1,18 +1,13 @@
 script.
   function loadLivere () {
-    if (typeof LivereTower === 'object') {
-      window.LivereTower.init()
-    }
-    else {
-      (function(d, s) {
-          var j, e = d.getElementsByTagName(s)[0];
-          if (typeof LivereTower === 'function') { return; }
-          j = d.createElement(s);
-          j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
-          j.async = true;
-          e.parentNode.insertBefore(j, e);
-      })(document, 'script');
-    }
+    (function(d, s) {
+        var j, e = d.getElementsByTagName(s)[0];
+        if (typeof LivereTower === 'function') { return; }
+        j = d.createElement(s);
+        j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
+        j.async = true;
+        e.parentNode.insertBefore(j, e);
+    })(document, 'script');
   }
 
   if ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) {

layout/includes/third-party/pjax.pug

@@ -1,22 +1,16 @@
 script(src=url_for(theme.CDN.pjax))
 script.
-  let pjaxSelectors = [
-    'title',
-    'meta[name=description]',
-    '#config_change',
-    '#body-wrap',
-    '#rightside-config-hide',
-    '#rightside-config-show',
-    '.js-pjax'
-  ]
-
-  if (!{theme.Open_Graph_meta && theme.comments.use && theme.comments.use.includes('Livere')}) {
-    pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
-  }
-
-  const pjax = new Pjax({
+  var pjax = new Pjax({
     elements: 'a:not([target="_blank"])',
-    selectors: pjaxSelectors,
+    selectors: [
+      'title',
+      'meta[name=description]',
+      '#config_change',
+      '#body-wrap',
+      '#rightside-config-hide',
+      '#rightside-config-show',
+      '.js-pjax'
+    ],
     cacheBust: false,
   })
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "3.0.1",
+  "version": "3.0.0-rc2",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -23,7 +23,7 @@
     "email": "wong@jerryc.me"
   },
   "dependencies": {
-    "hexo-renderer-stylus": "^1.1.0",
+    "hexo-renderer-marked": "^3.0.0",
     "hexo-renderer-pug": "^1.0.0"
   },
   "homepage": "https://demo.jerryc.me/",

scripts/events/log.js

@@ -1,15 +0,0 @@
-hexo.on('ready', () => {
-  const { version } = require('../../package.json')
-  hexo.log.info(`
-  ===================================================================
-                                                                     
-      #####  #    # ##### ##### ###### #####  ###### #      #   #    
-      #    # #    #   #     #   #      #    # #      #       # #     
-      #####  #    #   #     #   #####  #    # #####  #        #     
-      #    # #    #   #     #   #      #####  #      #        #      
-      #    # #    #   #     #   #      #   #  #      #        #    
-      #####   ####    #     #   ###### #    # #      ######   #  
-
-                              ${version}                       
-  ===================================================================`)
-})

scripts/filters/post_lazyload.js

@@ -11,6 +11,5 @@ const urlFor = require('hexo-util').url_for.bind(hexo)
 hexo.extend.filter.register('after_post_render', data => {
   if (!hexo.theme.config.lazyload.enable) return
   const bg = hexo.theme.config.lazyload.post ? urlFor(hexo.theme.config.lazyload.post) : 'data:image/gif;base64,R0lGODdhAQABAPAAAMPDwwAAACwAAAAAAQABAAACAkQBADs='
-  data.content = data.content.replace(/(<img.*? src=)/ig, `$1 "${bg}" data-lazy-src=`)
-  return data
+  return data.content.replace(/(<img.*? src=)/ig, `$1 "${bg}" data-lazy-src=`)
 })

scripts/filters/random_cover.js

@@ -23,7 +23,7 @@ function randomCover () {
   let cover
   let num
 
-  if (theme.cover && theme.cover.default_cover) {
+  if (theme.cover.default_cover) {
     if (!Array.isArray(theme.cover.default_cover)) {
       cover = theme.cover.default_cover
       return cover

scripts/helpers/page.js

@@ -61,7 +61,3 @@ hexo.extend.helper.register('urlNoIndex', function () {
 hexo.extend.helper.register('md5', function (path) {
   return crypto.createHash('md5').update(decodeURI(this.url_for(path))).digest('hex')
 })
-
-hexo.extend.helper.register('get_hexo_version', function () {
-  return hexo.version
-})

source/css/_global/index.styl

@@ -249,7 +249,7 @@ if hexo-config('avatar.effect') == true
 
     for i in 1 2 3 4
       > :nth-child({i})
-        animation: sidebarItem (i / 5)s
+        animation: sidebarItem (i / 5) s
 
 @keyframes scroll-down-effect
   0%

source/js/main.js

@@ -465,7 +465,6 @@ const tocFn = function () {
   // DOM Hierarchy:
   // ol.toc > (li.toc-item, ...)
   // li.toc-item > (a.toc-link, ol.toc-2child > (li.toc-item, ...))
-  const versionBiggerFive = GLOBAL_CONFIG.hexoversion.split('.')[0] >= 5
   const findHeadPosition = function (top) {
     // assume that we are not in the post page if no TOC link be found,
     // thus no need to update the status
@@ -478,8 +477,7 @@ const tocFn = function () {
     list.each(function () {
       const head = $(this)
       if (top > head.offset().top - 25) {
-        if (versionBiggerFive) currentId = '#' + encodeURI($(this).attr('id'))
-        else currentId = '#' + $(this).attr('id')
+        currentId = '#' + encodeURI($(this).attr('id'))
       }
     })