diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 850acf3..00656fe 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.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是否有報錯,反饋時附上你的網站 diff --git a/README.md b/README.md index 7184e82..af0c3b1 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) t ## Installation +### GIT + Stable branch [recommend]: ``` @@ -27,6 +29,16 @@ 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`: diff --git a/README_CN.md b/README_CN.md index 6d5955a..6d4750a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -16,18 +16,30 @@ ## 安裝 -在你的博客根目錄裡安裝穩定版【推薦】 +### 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 +``` + ## 應用主題 修改hexo配置文件`_config.yml`,把主題改為`Butterfly` diff --git a/layout/includes/third-party/comments/livere.pug b/layout/includes/third-party/comments/livere.pug index faaa60e..45dc99e 100644 --- a/layout/includes/third-party/comments/livere.pug +++ b/layout/includes/third-party/comments/livere.pug @@ -1,13 +1,18 @@ script. function loadLivere () { - (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 (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'); + } } if ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) { diff --git a/package.json b/package.json index baa77f4..c8bac68 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "3.0.0-rc2", + "version": "3.0.0", "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-marked": "^3.0.0", + "hexo-renderer-stylus": "^1.1.0", "hexo-renderer-pug": "^1.0.0" }, "homepage": "https://demo.jerryc.me/", diff --git a/scripts/events/log.js b/scripts/events/log.js new file mode 100644 index 0000000..4fcf7e7 --- /dev/null +++ b/scripts/events/log.js @@ -0,0 +1,15 @@ +hexo.on('ready', () => { + const { version } = require('../../package.json') + hexo.log.info(` + =================================================================== + + ##### # # ##### ##### ###### ##### ###### # # # + # # # # # # # # # # # # # + ##### # # # # ##### # # ##### # # + # # # # # # # ##### # # # + # # # # # # # # # # # # + ##### #### # # ###### # # # ###### # + + ${version} + ===================================================================`) +}) diff --git a/scripts/filters/random_cover.js b/scripts/filters/random_cover.js index 2cb87f7..7252d1d 100644 --- a/scripts/filters/random_cover.js +++ b/scripts/filters/random_cover.js @@ -23,7 +23,7 @@ function randomCover () { let cover let num - if (theme.cover.default_cover) { + if (theme.cover && theme.cover.default_cover) { if (!Array.isArray(theme.cover.default_cover)) { cover = theme.cover.default_cover return cover