hexo-theme-solitude 2.0.4 → 2.0.5

package/README.md

@@ -64,7 +64,7 @@ Check out the [Documentation](https://solitude.js.org/) for more information.
 
 <div align="center">
 
-[![buy me a coffee](https://img.shields.io/badge/buy%20me%20a%20coffee-support-FFDD00?logo=buy-me-a-coffee&logoColor=white&style=for-the-badge)](https://ko-fi.com/everfu)
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/W7W1YSMOK)
 
 </div>
 
@@ -81,4 +81,4 @@ Check out the [Documentation](https://solitude.js.org/) for more information.
 
 ## License
 
-[MIT](./LICENSE) License &copy; 2023-PRESENT [Ever Fu](https://github.com/everfu)
+[MIT](./LICENSE) License &copy; 2023-PRESENT [Ever Fu](https://github.com/everfu)

package/README_zh-Hans.md

@@ -65,7 +65,7 @@
 
 <div align="center">
 
-[![buy me a coffee](https://img.shields.io/badge/请我喝杯咖啡-支持一下-3399FF?logo=buy-me-a-coffee&logoColor=white&style=for-the-badge)](https://ko-fi.com/everfu)
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/W7W1YSMOK)
 
 </div>
 

package/README_zh-Hant.md

@@ -62,7 +62,7 @@
 
 <div align="center">
 
-[![buy me a coffee](https://img.shields.io/badge/請我喝杯咖啡-支援一下-3399FF?logo=buy-me-a-coffee&logoColor=white&style=for-the-badge)](https://ko-fi.com/everfu)
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/W7W1YSMOK)
 
 </div>
 
@@ -79,4 +79,4 @@
 
 ## 版權
 
-[MIT](./LICENSE) License &copy; 2023-至今 [Efu](https://github.com/everfu)
+[MIT](./LICENSE) License &copy; 2023-至今 [Efu](https://github.com/everfu)

package/layout/includes/inject/body.pug

@@ -16,12 +16,12 @@ div
     script(src=url_for(theme.cdn.waterfall))
     script(src=url_for(theme.cdn.pjax))
 
-    if theme.mermaid
-        script(src=url_for(theme.cdn.mermaid_js))
-
     if theme.post.share.enable && theme.post.share.list && theme.post.share.list.includes('qrcode')
         script(src=url_for(theme.cdn.qrcode))
 
+    if theme.mermaid
+        script(src=url_for(theme.cdn.mermaid_js))
+
     if theme.display_mode.universe
         script(src=url_for(theme.cdn.universe_js))
         script.
@@ -115,4 +115,4 @@ if theme.footer.randomlink
 include ../body/mode
 
 // google adsense
-include ../body/gadsense
+include ../body/gadsense

package/layout/includes/loading.pug

@@ -4,22 +4,34 @@ div(id="loading-box" onclick="preloader.endLoading();" style="zoom:1")
 
 script.
     const preloader = {
+        isLoaded: false,
         endLoading: () => {
-            document.getElementById('loading-box').classList.toggle('loaded');
+            if (!preloader.isLoaded) {
+                document.getElementById('loading-box').classList.add('loaded');
+                preloader.isLoaded = true;
+            }
         },
         initLoading: () => {
             document.getElementById('loading-box').classList.remove('loaded');
+            preloader.isLoaded = false;
         },
         removePaceDone: () => {
             document.getElementById('body').classList = 'pace-done';
         }
     }
+
     window.addEventListener('load', () => {
         preloader.endLoading();
     });
+
     window.addEventListener('pjax:send', () => {
         preloader.initLoading();
     });
+
     document.addEventListener('pjax:complete', () => {
         preloader.endLoading();
-    });
+    });
+
+    setTimeout(() => {
+        preloader.endLoading();
+    }, 5000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {
@@ -19,8 +19,8 @@
     "url": "https://github.com/everfu/hexo-theme-solitude"
   },
   "dependencies": {
-    "hexo-renderer-stylus": "^3.0.0",
-    "hexo-renderer-pug": "^3.0.0"
+    "hexo-renderer-pug": "^3.0.0",
+    "hexo-renderer-stylus": "^3.0.0"
   },
   "bugs": {
     "url": "https://github.com/everfu/hexo-theme-solitude/issues",
@@ -28,5 +28,8 @@
   },
   "homepage": "https://everfu.github.io/Solitude/",
   "author": "Hexo-Theme-Solitude<o@everfu.org>",
-  "license": "MIT"
-}
+  "license": "MIT",
+  "devDependencies": {
+    "@types/node": "^22.0.0"
+  }
+}

package/scripts/helper/stylus.js

@@ -22,4 +22,4 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     style.define('$prismjs_enable', prismjsEnable)
     style.define('$prismjs_line_number', prismjsLineNumber)
     style.define('$language', config.language)
-});
+});

package/scripts/tags/mermaid.js

@@ -6,4 +6,4 @@ function postMermaid(args, content) {
     return `<div class="mermaid">${escapeHTML(content)}</div>`;
 }
 
-hexo.extend.tag.register('mermaid', postMermaid, {ends: true});
+hexo.extend.tag.register('mermaid', postMermaid, {ends: true});

package/scripts/tags/tabs.js

@@ -5,20 +5,18 @@
 
 'use strict'
 
-function postTabs (args, content) {
+function postTabs ([name, active], content) {
   const tabBlock = /<!--\s*tab (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtab\s*-->/g
 
-  args = args.join(' ').split(',')
-  const tabName = args[0]
-  const tabActive = Number(args[1]) || 0
-
   const matches = []
   let match
   let tabId = 0
   let tabNav = ''
   let tabContent = ''
 
-  !tabName && hexo.log.warn('Tabs block must have unique name!')
+  if (typeof active === 'undefined') {
+    active = 0
+  }
 
   while ((match = tabBlock.exec(content)) !== null) {
     matches.push(match[1])
@@ -33,29 +31,27 @@ function postTabs (args, content) {
     let tabHref = ''
 
     postContent = hexo.render.renderSync({ text: postContent, engine: 'markdown' }).trim()
+    tabHref = (name + ' ' + tabId).toLowerCase().split(' ').join('-');
 
-    tabId += 1
-    tabHref = (tabName + ' ' + tabId).toLowerCase().split(' ').join('-');
-
-    ((tabCaption.length === 0) && (tabIcon.length === 0)) && (tabCaption = tabName + ' ' + tabId)
+    ((tabCaption.length === 0) && (tabIcon.length === 0)) && (tabCaption = name + ' ' + tabId)
 
     const isOnlyicon = tabIcon.length > 0 && tabCaption.length === 0 ? ' style="text-align: center;"' : ''
     const icon = tabIcon.trim()
     tabIcon.length > 0 && (tabIcon = `<i ${isOnlyicon} class="tab solitude ${icon}"></i>`)
 
-    const toTop = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="solitude st-arrow-up-line"></i></button>'
-
-    const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : ''
+    const toTop = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="solitude fas fa-arrow-up"></i></button>'
+    const isActive = active === tabId ? ' active' : ''
     tabNav += `<li class="tab${isActive}"><button type="button" data-href="#${tabHref}">${tabIcon + tabCaption.trim()}</button></li>`
     tabContent += `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent + toTop}</div>`
+    tabId += 1
   }
 
   tabNav = `<ul class="nav-tabs">${tabNav}</ul>`
   tabContent = `<div class="tab-contents">${tabContent}</div>`
 
-  return `<div class="tabs" id="${tabName.toLowerCase().split(' ').join('-')}">${tabNav + tabContent}</div>`
+  return `<div class="tabs" id="${name.toLowerCase().split(' ').join('-')}">${tabNav + tabContent}</div>`
 }
 
 hexo.extend.tag.register('tabs', postTabs, { ends: true })
 hexo.extend.tag.register('subtabs', postTabs, { ends: true })
-hexo.extend.tag.register('subsubtabs', postTabs, { ends: true })
+hexo.extend.tag.register('subsubtabs', postTabs, { ends: true })

package/source/css/_tags/mermaid.styl

@@ -3,4 +3,4 @@
   justify-content center
 
   text
-    fill var(--efu-fontcolor) !important
+    fill var(--efu-fontcolor) !important

package/source/css/_tags/tabs.styl

@@ -96,7 +96,7 @@
   > .tab-contents .tab-item-content.active
     animation tabshow 0s
     -webkit-animation tabshow 0s
-    padding 1.2rem 1.2rem
+    padding 1.2rem
     border-radius 8px
 
     +maxWidth768()

package/source/js/main.js

@@ -465,7 +465,7 @@ const addHighlight = () => {
     const expandClass = !expand === true ? 'closed' : ''
     const $syntaxHighlight = syntax === 'highlight.js' ? document.querySelectorAll('figure.highlight') : document.querySelectorAll('pre[class*="language-"]')
     if (!(($isShowTool || limit) && $syntaxHighlight.length)) return
-    const copyEle = copy ? `<i class="solitude far fa-copy copy-button"></i>` : '<i></i>';
+    const copyEle = copy ? `<i class="solitude fas fa-copy copy-button"></i>` : '<i></i>';
     const expandEle = `<i class="solitude fas fa-angle-down expand"></i>`;
     const limitEle = limit ? `<i class="solitude fas fa-angles-down"></i>` : '<i></i>';
     const alertInfo = (ele, text) => utils.snackbarShow(text, false, 2000)
@@ -713,4 +713,4 @@ window.onkeydown = e => {
 };
 document.addEventListener('copy', () => {
     utils.snackbarShow(GLOBAL_CONFIG.lang.copy.success, false, 3000);
-});
+});

package/scripts/tags/btns.js

@@ -1,35 +0,0 @@
-"use strict";
-
-function postBtns(args, content) {
-    return `<div class="btns ${args.join(" ")}">
-            ${content}
-          </div>`;
-}
-
-function postCell(args, content) {
-    args = args.join(" ").split(",");
-    let text = args[0] || "";
-    let url = args[1] || "";
-    text = text.trim();
-    url = url.trim();
-    if (url.length > 0) {
-        url = "href='" + url + "'";
-    }
-    let icon = "";
-    let img = "https://npm.elemecdn.com/hexo-butterfly-tag-plugins-plus/lib/assets/default.svg";
-    if (args.length > 2) {
-        if (args[2].indexOf(" solitude") > -1) {
-            icon = args[2].trim();
-        } else {
-            img = args[2].trim();
-        }
-    }
-    if (icon.length > 0) {
-        return `<a class="button no-text-decoration" ${url} title='${text}'><i class='${icon}'></i>${text}</a>`;
-    } else {
-        return `<a class="button no-text-decoration" ${url} title='${text}'><img src='${img}'>${text}</a>`;
-    }
-}
-
-hexo.extend.tag.register("btns", postBtns, { ends: true });
-hexo.extend.tag.register("cell", postCell);

package/scripts/tags/button.js

@@ -1,21 +0,0 @@
-"use strict";
-
-const urlFor = require("hexo-util").url_for.bind(hexo);
-
-function btn(args) {
-    args = args.join(" ").split(",");
-    let url = args[0] || "";
-    let text = args[1] || "";
-    let icon = args[2] || "";
-    let option = args[3] || "";
-
-    url = url.trim();
-    text = text.trim();
-    icon = icon.trim();
-    option = option.trim();
-
-    return `<button class="btn-sco ${option}" onclick="${url.startsWith("http") ? `window.open('${url}')` : `pjax.loadUrl('${urlFor(url)}')`}" 
-  title="${text}">${icon.length ? `<i class="solitude ${icon}"></i>` : ""}${text.length ? `<span>${text}</span>` : ""}</button>`;
-}
-
-hexo.extend.tag.register("btn", btn, { ends: false });

package/scripts/tags/bvideo.js

@@ -1,7 +0,0 @@
-'use strict'
-
-function bilibili(args) {
-  return `<iframe class="bvideo" width="100%" height="600" src="//player.bilibili.com/player.html?autoplay=0&bvid=${args}" border="0" frameBorder="no" framespacing="0" allowFullScreen="true"></iframe>`
-}
-
-hexo.extend.tag.register('bvideo', bilibili, {ends: false})

package/scripts/tags/checkbox.js

@@ -1,51 +0,0 @@
-'use strict';
-
-function postCheckbox(args) {
-    args = args.join(' ').split(',')
-    var cls = ''
-    var text = ''
-    var checked = false
-    if (args.length > 1) {
-        cls = (args[0] || '').trim()
-        if (cls.length > 0) {
-            cls = ' ' + cls
-        }
-        if (cls.indexOf('checked') > -1) {
-            checked = true
-        }
-        text = (args[1] || '').trim()
-    } else if (args.length > 0) {
-        text = (args[0] || '').trim()
-    }
-    if (text.length > 0) {
-        return `<div class='checkbox${cls}'><input type="checkbox" ${ checked ? 'checked="checked"' : '' }/>
-            ${hexo.render.renderSync({text: text, engine: 'markdown'}).split('\n').join('')}
-            </div>`
-    }
-}
-function postRadio(args) {
-    args = args.join(' ').split(',')
-    var cls = ''
-    var text = ''
-    var checked = false
-    if (args.length > 1) {
-        cls = (args[0] || '').trim()
-        if (cls.length > 0) {
-            cls = ' ' + cls
-        }
-        if (cls.indexOf('checked') > -1) {
-            checked = true
-        }
-        text = (args[1] || '').trim()
-    } else if (args.length > 0) {
-        text = (args[0] || '').trim()
-    }
-    if (text.length > 0) {
-        return `<div class='checkbox${cls}'><input type="radio" ${ checked ? 'checked="checked"' : '' }/>
-            ${hexo.render.renderSync({text: text, engine: 'markdown'}).split('\n').join('')}
-            </div>`
-    }
-}
-
-hexo.extend.tag.register('checkbox', postCheckbox);
-hexo.extend.tag.register('radio', postRadio);

package/scripts/tags/fold.js

@@ -1,13 +0,0 @@
-'use strict'
-
-function postTabs(args, content) {
-    const title = args[0] ? args[0] : ""
-    const open = args[1] ? args[1] : ""
-
-    return `<details ${open}><summary>${title}</summary><div class="content">${hexo.render.renderSync({
-        text: content,
-        engine: 'markdown'
-    })}</div></details>`
-}
-
-hexo.extend.tag.register('fold', postTabs, {ends: true})

package/scripts/tags/image.js

@@ -1,75 +0,0 @@
-'use strict';
-
-hexo.extend.tag.register('image', function(args) {
-    args = args.join(' ').split(',');
-    let url = args[0].trim();
-    let alt = '';
-    let bg = '';
-    let style = '';
-    if (args.length > 1) {
-        for (let i = 1; i < args.length; i++) {
-            let tmp = args[i].trim();
-            if (tmp.includes('alt=')) {
-                alt = tmp.substring(4, tmp.length);
-            } else if (tmp.includes('width=')) {
-                style += 'width:' + tmp.substring(6, tmp.length) + ';';
-            } else if (tmp.includes('height=')) {
-                style += 'height:' + tmp.substring(7, tmp.length) + ';';
-            } else if (tmp.includes('bg=')) {
-                bg = tmp.substring(3, tmp.length);
-            }
-        }
-    }
-    function img(url, alt, style) {
-        let img = '';
-        img += '<img class="img" src="' + url + '"';
-        if (alt.length > 0) {
-            img += ' alt="' + alt + '"';
-        }
-        if (style.length > 0) {
-            img += ' style="' + style + '"';
-        }
-        img += '/>';
-        return img;
-    }
-
-    let ret = '';
-    ret += '<div class="img-wrap">';
-    ret += '<div class="img-bg"';
-    if (bg.length > 0) {
-        ret += ' style="background:' + bg + '"';
-    }
-    ret += '>';
-    ret += img(url, alt, style);
-    ret += '</div>';
-
-    if (alt.length > 0) {
-        ret += '<span class="image-caption">' + alt + '</span>';
-    }
-
-    ret += '</div>';
-    return ret;
-});
-
-hexo.extend.tag.register('inlineimage', function(args) {
-    args = args.join(' ').split(', ');
-    let url = args[0].trim();
-    let ret = '';
-    ret += '<img no-lazy class="inline" src="' + url + '"';
-    let style = '';
-    if (args.length > 1) {
-        for (let i = 1; i < args.length; i++) {
-            let tmp = args[i].trim();
-            if (tmp.includes('height=')) {
-                style += 'height:' + tmp.substring(7, tmp.length) + ';';
-            }
-        }
-    }
-    if (style.length > 0) {
-        ret += ' style="' + style + '"';
-    } else {
-        ret += ' style="height:1.5em"';
-    }
-    ret += '/>';
-    return ret;
-});

package/scripts/tags/inline-image.js

@@ -1,12 +0,0 @@
-'use strict'
-
-const urlFor = require('hexo-util').url_for.bind(hexo)
-
-function inlineImg (args) {
-    const img = args[0]
-    const height = args[1] ? `style="height:${args[1]}"` : ''
-
-    return `<img class="inline-img" src="${urlFor(img)}" ${height}/>`
-}
-
-hexo.extend.tag.register('inlineimage', inlineImg, { ends: false })

package/scripts/tags/label.js

@@ -1,10 +0,0 @@
-'use strict'
-
-function addLabel (args, content) {
-    const text = args[0]
-    const className = args[1] || 'default'
-
-    return `<label class="hl-label bg-${className}">${text}</label> `
-}
-
-hexo.extend.tag.register('label', addLabel, { ends: false })

package/scripts/tags/link.js

@@ -1,50 +0,0 @@
-const urlFor = require("hexo-util").url_for.bind(hexo);
-function link(args) {
-    const themeConfig = hexo.theme.config;
-    args = args.join(" ").split(",");
-    let title = args[0];
-    let sitename = args[1];
-    let link = args[2];
-    let imgUrl = args[3] || "";
-    let favicon = themeConfig.site.siteIcon;
-    let insideStation = false;
-
-    link = link.trim();
-    imgUrl = imgUrl.trim();
-    favicon = favicon.trim();
-
-    try {
-        new URL(link);
-        insideStation = false;
-    } catch (err) {
-        insideStation = true;
-    }
-
-    if ((imgUrl === "") && (insideStation === false)) {
-        let domain = new URL(link).hostname
-        if (domain) {
-            imgUrl_online = "https://api.iowen.cn/favicon/" + domain + ".png";
-        }
-    }
-
-    return `<a class="tag-link" target="_blank" href="${urlFor(link)}">
-    <div class="tag-link-tips">${insideStation ? "站内链接" : "引用站外链接"
-        }</div>
-    <div class="tag-link-bottom">
-        <div class="tag-link-left" style="${insideStation
-            ? `background-image: url(${imgUrl ? imgUrl : favicon})`
-            : `background-image: url(${imgUrl ? imgUrl : imgUrl_online})`
-        }">
-            <i class="solitude st-link-m-line" style="${`(imgUrl) || (imgUrl_online)` ? "display: none" : ""
-        }"></i>
-        </div>
-        <div class="tag-link-right">
-            <div class="tag-link-title">${title}</div>
-            <div class="tag-link-sitename">${sitename}</div>
-        </div>
-        <i class="solitude st-arrow-right-bold"></i>
-    </div>
-    </a>`;
-}
-
-hexo.extend.tag.register("link", link, { ends: false });

package/scripts/tags/media.js

@@ -1,29 +0,0 @@
-'use strict';
-
-function postAudio(args) {
-    let src = args[0].trim()
-    return `<div class="audio"><audio controls preload><source src='${src}' type='audio/mp3'>Your browser does not support the audio tag.</audio></div>`;
-}
-
-function postVideo(args) {
-    let src = args[0].trim()
-    return `<div class="video"><video controls preload><source src='${src}' type='video/mp4'>Your browser does not support the video tag.</video></div>`;
-}
-
-function postVideos(args, content) {
-    args = args.join(' ').split(',')
-    var cls = args[0]
-    if (cls.length > 0) {
-        cls = ' ' + cls
-    }
-    var col = Number(args[1]) || 0;
-    if (col > 0) {
-        return `<div class="videos${cls}" col='${col}'>${content}</div>`
-    } else {
-        return `<div class="videos${cls}">${content}</div>`
-    }
-}
-
-hexo.extend.tag.register('audio', postAudio);
-hexo.extend.tag.register('video', postVideo);
-hexo.extend.tag.register('videos', postVideos, {ends: true});

package/scripts/tags/note.js

@@ -1,13 +0,0 @@
-/**
- * note.js
- * transplant from hexo-theme-next
- * modified by @efu
- */
-
-hexo.extend.tag.register('note', function (types, content) {
-    let type = ""
-    for (let i = 0; i < types.length; i++) {
-        type += " " + types[i]
-    }
-    return `<div class="note ${type}">${hexo.render.renderSync({text: content, engine: 'markdown'})}</div>`
-}, {ends: true});

package/scripts/tags/span.js

@@ -1,17 +0,0 @@
-'use strict';
-
-function postP(args) {
-    args = args.join(' ').split(',')
-    let p0 = args[0].trim()
-    let p1 = args[1].trim()
-    return `<p class='p ${p0}'>${p1}</p>`;
-}
-function postSpan(args) {
-    args = args.join(' ').split(',')
-    let p0 = args[0].trim()
-    let p1 = args[1].trim()
-    return `<span class='p ${p0}'>${p1}</span>`;
-}
-
-hexo.extend.tag.register('p', postP);
-hexo.extend.tag.register('span', postSpan);

package/scripts/tags/timeline.js

@@ -1,22 +0,0 @@
-"use strict"
-
-function postTimeline(args, content) {
-    if (args.length > 0) {
-        return `<div class="timeline"><h1>${args}</h1>${content}</div>`;
-    } else {
-        return `<div class="timeline">${content}</div>`;
-    }
-}
-
-function postTimenode(args, content) {
-    args = args.join(" ").split(",");
-    var time = args[0];
-    return `<div class="timenode"><div class="meta"><p>${time}</p></div><div class="body">${hexo.render
-        .renderSync({ text: content, engine: "markdown" })
-        .split("\n")
-        .join("")}</div></div>`;
-}
-
-hexo.extend.tag.register("timeline", postTimeline, { ends: true });
-
-hexo.extend.tag.register("timenode", postTimenode, { ends: true });