hexo-theme-solitude 2.0.3 → 2.0.5

package/languages/default.yml

@@ -94,19 +94,19 @@ award:
 search:
   empty: No results found
   hit: Found ${query} results for you
-  placeholder: Enter keywords to quickly search
+  placeholder: Enter keywords to search
   count: Total <b>${count}</b> results.
 
 head:
   noscript: Please enable JavaScript to view the site
 
 aside:
-  postcount: 'Posts :'
-  pv: 'PV :'
-  uv: 'UV :'
-  runtime: 'Runtime :'
-  updatetime: 'Last update :'
-  wordcount: 'Word count :'
+  postcount: 'Posts:'
+  pv: 'PV:'
+  uv: 'UV:'
+  runtime: 'Runtime:'
+  updatetime: 'Last update:'
+  wordcount: 'Word count:'
   toc: Table of contents
   tagmore: View all
   avatar: Avatar
@@ -125,7 +125,7 @@ console:
   comment_title: Latest comments
   tag_tip: Tags
   tag_title: Find interesting areas
-  switch_darkmode: Day and night switching
+  switch_darkmode: Day and night mode
   switch_hideAside: Sidebar display control
   switch_keyboard: Keyboard operation
   switch_music: Music switch
@@ -170,7 +170,7 @@ keyboard:
   title: Blog shortcuts
 
 newest_comment:
-  error: Unable to get a comment, please confirm that the relevant configuration is correct.
+  error: Unable to get comments, please check the configuration.
   zero: No comments.
 
 comment:
@@ -196,19 +196,19 @@ right_menu:
   cht_to_chs: 转为简体
   img_error: This image cannot be copied or downloaded.
   barrage:
-    open: OpenBarrage
-    close: CloseBarrage
+    open: Open Barrage
+    close: Close Barrage
   music:
     start: Play
     stop: Pause
     back: Back
     forward: Forward
-    copyMusicName: CopyName
+    copyMusicName: Copy Name
 
 pagination:
   prev: Prev
   next: Next
-  to: To page
+  to: Go to page
 
 about:
   other:

package/languages/en.yml

@@ -77,6 +77,7 @@ post:
     next: Next
     prev: Previous
     
+
 nav:
   site_name_title: Back to home
   backtop: Back to top
@@ -93,19 +94,19 @@ award:
 search:
   empty: No results found
   hit: Found ${query} results for you
-  placeholder: Enter keywords to quickly search
+  placeholder: Enter keywords to search
   count: Total <b>${count}</b> results.
 
 head:
   noscript: Please enable JavaScript to view the site
 
 aside:
-  postcount: 'Posts :'
-  pv: 'PV :'
-  uv: 'UV :'
-  runtime: 'Runtime :'
-  updatetime: 'Last update :'
-  wordcount: 'Word count :'
+  postcount: 'Posts:'
+  pv: 'PV:'
+  uv: 'UV:'
+  runtime: 'Runtime:'
+  updatetime: 'Last update:'
+  wordcount: 'Word count:'
   toc: Table of contents
   tagmore: View all
   avatar: Avatar
@@ -124,7 +125,7 @@ console:
   comment_title: Latest comments
   tag_tip: Tags
   tag_title: Find interesting areas
-  switch_darkmode: Day and night switching
+  switch_darkmode: Day and night mode
   switch_hideAside: Sidebar display control
   switch_keyboard: Keyboard operation
   switch_music: Music switch
@@ -169,7 +170,7 @@ keyboard:
   title: Blog shortcuts
 
 newest_comment:
-  error: Unable to get a comment, please confirm that the relevant configuration is correct.
+  error: Unable to get comments, please check the configuration.
   zero: No comments.
 
 comment:
@@ -195,19 +196,19 @@ right_menu:
   cht_to_chs: 转为简体
   img_error: This image cannot be copied or downloaded.
   barrage:
-    open: OpenBarrage
-    close: CloseBarrage
+    open: Open Barrage
+    close: Close Barrage
   music:
     start: Play
     stop: Pause
     back: Back
     forward: Forward
-    copyMusicName: CopyName
+    copyMusicName: Copy Name
 
 pagination:
   prev: Prev
   next: Next
-  to: To page
+  to: Go to page
 
 about:
   other:

package/layout/archive.pug

@@ -3,8 +3,15 @@ extends includes/layout.pug
 block content
     main.layout#content-inner
         #archive
-            .article-sort-title #{__('page.archives')}<sup>#{site.posts.find({ parent: { $exists: false } }).length}</sup>
-            .article-sort
-                include includes/mixins/articleSort
-            include includes/mixins/pagination
+            .article-sort-title #{__('page.archives')}<sup>#{site.posts.find({parent: {$exists: false}}).length}</sup>
+            case theme.page.archives
+                when 0
+                    .article-sort
+                        include includes/mixins/articleSort
+                    include includes/mixins/pagination
+                when 1
+                    .recent-posts#recent-posts
+                        each post,index in page.posts.find({ parent: { $exists: false } }).data
+                            include includes/widgets/home/postList
+                        include includes/mixins/pagination
         include includes/widgets/aside/aside

package/layout/includes/footer.pug

@@ -56,11 +56,12 @@ div#footer-bar
         div.footer-bar-right
             each item in theme.footer.links
                 a.footer-bar-link(href=url_for(item.url), alt=item.name)!= item.name
-            a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright')
-                i.solitude.fa-solid.fa-copyright
-                i.solitude.fa-brands.fa-creative-commons-by
-                i.solitude.fa-brands.fa-creative-commons-nc
-                i.solitude.fa-brands.fa-creative-commons-nd
+            if theme.footer.license
+                a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright')
+                    i.solitude.fa-solid.fa-copyright
+                    i.solitude.fa-brands.fa-creative-commons-by
+                    i.solitude.fa-brands.fa-creative-commons-nc
+                    i.solitude.fa-brands.fa-creative-commons-nd
 if theme.footer.privacy
     div.needEndHide#cookies-window
         div.cookies-window-title= __('cookies.title')

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/layout/includes/widgets/home/categoryBar.pug

@@ -12,4 +12,5 @@ div.category-bar-right
     if wordcount > 40 || categories.data.length > 10
         .category-bar-next#category-bar-next(onclick="sco.scrollCategoryBarToRight()")
             i.solitude.fa-solid.fa-angles-right
-    a.category-bar-more(href=url_for('/categories/'))= __('more')
+    if theme.page.categories
+        a.category-bar-more(href=url_for('/categories/'))= __('more')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.0.3",
+  "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/event/merge_config.js

@@ -112,6 +112,7 @@ hexo.extend.filter.register('before_generate', () => {
             error: true,
             tags: true,
             categories: true,
+            archives: 0,
             default: {
                 cover: ['/img/default.avif'],
             }

package/scripts/filter/post_image.js

@@ -4,7 +4,6 @@ hexo.extend.filter.register('before_post_render', data => {
   const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
   let { cover: coverVal } = data
 
-  // Add path to top_img and cover if post_asset_folder is enabled
   if (hexo.config.post_asset_folder) {
     if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = `${data.path}${coverVal}`
   }

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/_layout/aside.styl

@@ -81,7 +81,7 @@
 
     / [data-theme=dark] &
       background #00000015
-      color var(--efu-black)
+      color var(--efu-white)
 
       &:hover
         color var(--efu-white)

package/source/css/_layout/header.styl

@@ -19,13 +19,22 @@
         &:hover
           color var(--efu-card-bg)
 
-    &:not(.nav-fixed)
-      #nav
-        background var(--efu-none)
-        transition .3s
+  &:not(.nav-fixed)
+    #nav
+      background var(--efu-none)
+      transition .3s
 
-        +maxWidth768()
-          transition 0s
+      +maxWidth768()
+        transition 0s
+
+      .post &
+
+        #nav-right
+          .nav-button
+            .console_switchbutton
+              label
+                i
+                  background var(--efu-white)
 
 #page-header
   #site-title
@@ -141,7 +150,8 @@
         padding 0
 
       .nav-button
-        margin-left .5rem
+        margin-left 12px
+        cursor pointer
 
         a
           height 35px
@@ -151,6 +161,9 @@
           justify-content center
           border-radius 40px
 
+          i
+            font-size 20px
+
           &.totopbtn
             width 25px
             height 25px
@@ -163,7 +176,7 @@
             transition .3s
 
           &.console_switchbutton
-            padding 10px 8px
+            padding 10px 7.5px
 
             &:hover
               label
@@ -195,9 +208,6 @@
                 border-radius 12px
                 background var(--efu-fontcolor)
 
-                .post &
-                  background var(--efu-white)
-
                 &.left
                   top 0
                   width 100%
@@ -611,9 +621,6 @@
       +maxWidth899()
         display none !important
 
-.nav-button
-  cursor pointer
-
 #site-logo
   width 121px
 
@@ -795,7 +802,7 @@ if hexo-config('nav.group')
         +minWidth900()
           align-items center
 
-      &:before
+      i.fa-solid.fa-home
         color var(--efu-white)
 
   .nav-fixed

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/css/var.styl

@@ -3,7 +3,7 @@ error_img = hexo-config('errorpage.img')
 $dark_theme = convert(hexo-config('theme_color.dark'))
 $dark_theme_op = convert(hexo-config('theme_color.dark_op'))
 $dark_theme_op_deep = convert(hexo-config('theme_color.dark_op_deep'))
-$dark_theme_none = hexo-config('theme_color.dark_none')
+$dark_theme_none = convert(hexo-config('theme_color.dark_none'))
 $light_theme = convert(hexo-config('theme_color.light'))
 $light_theme_op = convert(hexo-config('theme_color.light_op'))
 $light_theme_op_deep = convert(hexo-config('theme_color.light_op_deep'))

package/source/js/main.js

@@ -198,6 +198,7 @@ const sco = {
     },
     initConsoleState() {
         const consoleHideAside = document.querySelector("#consoleHideAside");
+        if(!consoleHideAside) return;
         consoleHideAside.classList.toggle("on", document.documentElement.classList.contains("hide-aside"));
     },
     changeSayHelloText() {
@@ -464,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)
@@ -712,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})