diff --git a/README.md b/README.md index ce934c9..7589930 100644 --- a/README.md +++ b/README.md @@ -114,5 +114,3 @@ npm i hexo-theme-butterfly ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-2.jpg) ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-3.jpg) ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-4.jpg) -![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png) -![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png) \ No newline at end of file diff --git a/README_CN.md b/README_CN.md index 205d71d..552205b 100644 --- a/README_CN.md +++ b/README_CN.md @@ -114,5 +114,3 @@ theme: butterfly ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-2.jpg) ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-3.jpg) ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/butterfly-readme-screenshots-4.jpg) -![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png) -![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png) diff --git a/package.json b/package.json index 7f86e48..b03744e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "5.0.0-b2", + "version": "5.0.0", "description": "A Simple and Card UI Design theme for Hexo", "main": "package.json", "scripts": { diff --git a/plugins.yml b/plugins.yml index 8ff8f85..9b4bd9a 100644 --- a/plugins.yml +++ b/plugins.yml @@ -1,15 +1,15 @@ abcjs_basic_js: name: abcjs file: dist/abcjs-basic-min.js - version: 6.4.1 + version: 6.4.3 activate_power_mode: name: butterfly-extsrc file: dist/activate-power-mode.min.js - version: 1.1.3 + version: 1.1.4 algolia_search: name: algoliasearch file: dist/algoliasearch-lite.umd.js - version: 4.24.0 + version: 5.7.0 aplayer_css: name: aplayer file: dist/APlayer.min.css @@ -21,11 +21,11 @@ aplayer_js: artalk_css: name: artalk file: dist/Artalk.css - version: 2.8.7 + version: 2.9.1 artalk_js: name: artalk file: dist/Artalk.js - version: 2.8.7 + version: 2.9.1 blueimp_md5: name: blueimp-md5 file: js/md5.min.js @@ -33,23 +33,23 @@ blueimp_md5: canvas_fluttering_ribbon: name: butterfly-extsrc file: dist/canvas-fluttering-ribbon.min.js - version: 1.1.3 + version: 1.1.4 canvas_nest: name: butterfly-extsrc file: dist/canvas-nest.min.js - version: 1.1.3 + version: 1.1.4 canvas_ribbon: name: butterfly-extsrc file: dist/canvas-ribbon.min.js - version: 1.1.3 + version: 1.1.4 clickShowText: name: butterfly-extsrc file: dist/click-show-text.min.js - version: 1.1.3 + version: 1.1.4 click_heart: name: butterfly-extsrc file: dist/click-heart.min.js - version: 1.1.3 + version: 1.1.4 disqusjs: name: disqusjs file: dist/browser/disqusjs.es2015.umd.min.js @@ -62,12 +62,12 @@ docsearch_css: name: '@docsearch/css' other_name: docsearch-css file: dist/style.css - version: 3.6.1 + version: 3.6.2 docsearch_js: name: '@docsearch/js' other_name: docsearch-js file: dist/umd/index.js - version: 3.6.1 + version: 3.6.2 egjs_infinitegrid: name: '@egjs/infinitegrid' other_name: egjs-infinitegrid @@ -86,7 +86,7 @@ fancybox_css: fireworks: name: butterfly-extsrc file: dist/fireworks.min.js - version: 1.1.3 + version: 1.1.4 fontawesome: name: '@fortawesome/fontawesome-free' file: css/all.min.css @@ -107,7 +107,7 @@ instantpage: instantsearch: name: instantsearch.js file: dist/instantsearch.production.min.js - version: 4.73.3 + version: 4.74.2 katex: name: katex file: dist/katex.min.css @@ -133,11 +133,11 @@ medium_zoom: mermaid: name: mermaid file: dist/mermaid.min.js - version: 10.9.1 + version: 11.2.1 meting_js: name: butterfly-extsrc file: metingjs/dist/Meting.min.js - version: 1.1.3 + version: 1.1.4 pace_default_css: name: pace-js other_name: pace @@ -174,11 +174,11 @@ prismjs_lineNumber_js: sharejs: name: butterfly-extsrc file: sharejs/dist/js/social-share.min.js - version: 1.1.3 + version: 1.1.4 sharejs_css: name: butterfly-extsrc file: sharejs/dist/css/share.min.css - version: 1.1.3 + version: 1.1.4 snackbar: name: node-snackbar file: dist/snackbar.min.js @@ -190,7 +190,7 @@ snackbar_css: twikoo: name: twikoo file: dist/twikoo.all.min.js - version: 1.6.38 + version: 1.6.39 typed: name: typed.js file: dist/typed.umd.js @@ -203,9 +203,9 @@ waline_css: name: '@waline/client' file: dist/waline.css other_name: waline - version: 3.3.0 + version: 3.3.2 waline_js: name: '@waline/client' file: dist/waline.js other_name: waline - version: 3.3.0 + version: 3.3.2 diff --git a/source/css/_layout/third-party.styl b/source/css/_layout/third-party.styl index 50c76f5..36806a5 100644 --- a/source/css/_layout/third-party.styl +++ b/source/css/_layout/third-party.styl @@ -44,6 +44,11 @@ if hexo-config('waline.bg') &:focus background-image: none +.twikoo + .tk-content + p + margin: 3px 0 + .fireworks position: fixed top: 0 diff --git a/source/js/main.js b/source/js/main.js index dc6648a..6cd6637 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -341,6 +341,7 @@ document.addEventListener('DOMContentLoaded', () => { } const addJustifiedGallery = async (ele, tabs = false) => { + if (!ele.length) return const init = async () => { for (const item of ele) { if (btf.isHidden(item) || item.classList.contains('loaded')) continue @@ -359,8 +360,6 @@ document.addEventListener('DOMContentLoaded', () => { } } - if (!ele.length) return - if (typeof InfiniteGrid === 'function') { init() } else { @@ -584,19 +583,19 @@ document.addEventListener('DOMContentLoaded', () => { const rightSideFn = { readmode: () => { // read mode const $body = document.body - $body.classList.add('read-mode') const newEle = document.createElement('button') - newEle.type = 'button' - newEle.className = 'fas fa-sign-out-alt exit-readmode' - $body.appendChild(newEle) - const clickFn = () => { + const exitReadMode = () => { $body.classList.remove('read-mode') newEle.remove() - newEle.removeEventListener('click', clickFn) + newEle.removeEventListener('click', exitReadMode) } - newEle.addEventListener('click', clickFn) + $body.classList.add('read-mode') + newEle.type = 'button' + newEle.className = 'fas fa-sign-out-alt exit-readmode' + newEle.addEventListener('click', exitReadMode) + $body.appendChild(newEle) }, darkmode: () => { // switch between light and dark mode const willChangeMode = document.documentElement.getAttribute('data-theme') === 'dark' ? 'light' : 'dark' @@ -812,8 +811,9 @@ document.addEventListener('DOMContentLoaded', () => { if (!switchBtn) return let switchDone = false + const postComment = document.getElementById('post-comment') const handleSwitchBtn = () => { - document.getElementById('post-comment').classList.toggle('move') + postComment.classList.toggle('move') if (!switchDone && typeof loadOtherComment === 'function') { switchDone = true loadOtherComment() diff --git a/source/js/utils.js b/source/js/utils.js index 781f0f0..42db7d2 100644 --- a/source/js/utils.js +++ b/source/js/utils.js @@ -49,9 +49,7 @@ overflowPaddingR: { add: () => { - const innerWidth = window.innerWidth - const clientWidth = document.body.clientWidth - const paddingRight = innerWidth - clientWidth + const paddingRight = window.innerWidth - document.body.clientWidth if (paddingRight > 0) { document.body.style.paddingRight = `${paddingRight}px`