hexo-theme-solitude 1.8.6 → 1.8.8

package/.github/workflows/github-publish.yml

@@ -0,0 +1,30 @@
+name: Node.js Package
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 16
+      - run: npm test
+
+  publish-gpr:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 16
+          registry-url: https://npm.pkg.github.com/
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/.github/workflows/{publish.yml → npm-publish.yml}

@@ -1,9 +1,8 @@
 name: Node.js Package
 
 on:
-  push:
-    branches:
-      - main
+  release:
+    types: [created]
 
 jobs:
   build:

package/_config.yml

@@ -3,10 +3,10 @@
 # Author: Valor Team
 # Github: https://github.com/valor-x/hexo-theme-solitude
 #
-# 配置指南: https://solitude-docs.efu.me/
+# 配置指南: https://docs.efu.me/
 # 你可以从指南中获得更详细的说明
 #
-# Guide: https://solitude-docs.efu.me/
+# Guide: https://docs.efu.me/
 # You can get more detailed help from the guide
 #
 # 赞助：https://afdian.net/a/efu0u0
@@ -130,7 +130,7 @@ hometop:
     title: Solitude 主题文档
     # 点击跳转链接
     # Click the jump link
-    url: https://solitude-docs.efu.me/
+    url: https://docs.efu.me/
     # 显示背景图片
     # Display background image
     img: /img/default.png
@@ -701,7 +701,7 @@ post_ai:
 
 # latex 公式支持
 # latex formula support
-# docs: https://solitude-docs.efu.me/configuration/extra#数学公式
+# docs: https://docs.efu.me/configuration/extra#数学公式
 katex:
   enable: false
   per_page: false # 是否在每页都加载 / Whether to load on each page
@@ -709,12 +709,13 @@ katex:
 
 # 评论
 # comment
-# getting start: http://solitude-docs.efu.me/comments/comment
+# getting start: http://docs.efu.me/comments/comment
 comment:
   use: # waline, twikoo, valine, artalk
   commentBarrage: false # 热评开关 / Hot comment switch
   lazyload: false # 懒加载
   count: false # 评论数展示
+  pv: false # 是否使用評論統計頁面訪問
   avatar: https://cravatar.cn # Gravatar link
   newest_comment:
     enable: false
@@ -794,7 +795,7 @@ extends:
 
 # PWA
 # https://developer.mozilla.org/zh-CN/docs/Web/Progressive_web_apps
-# docs: https://solitude-docs.efu.me/configuration/extra#pwa
+# docs: https://docs.efu.me/configuration/extra#pwa
 pwa:
   enable: false
   manifest: /manifest.json # manifest.json 文件路径

package/layout/includes/inject/body.pug

@@ -48,10 +48,10 @@ div
         script(src=url_for(theme.cdn.efu_ai))
 
     if theme.capsule.enable || theme.music.enable
+        script.
+            var meting_api = '!{theme.meting_api}';
         script(src=url_for(theme.cdn.aplayer_js))
         script(src=url_for(theme.cdn.meting_js))
-        script.
-            const meting_api = '!{theme.meting_api}';
 
     if theme.post.covercolor.enable
         case theme.post.covercolor.mode
@@ -96,7 +96,7 @@ div
                 GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
                 sco.changeTimeFormat(document.querySelectorAll('.bber-info-time time'))
         if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv)
-            script(async src=url_for(theme.cdn.busuanzi_js))
+            script(defer pjax src=url_for(theme.cdn.busuanzi_js))
 
 
 if theme.footer.randomlink

package/layout/includes/inject/head.pug

@@ -27,7 +27,7 @@ include ../head/pwa.pug
 
 script.
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.6",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.8",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"

package/layout/includes/widgets/aside/asideWebInfo.pug

@@ -11,14 +11,14 @@
                 .webinfo-item-title
                     i.item-icon.solitude.st-visitor-line
                     .item-name= __('aside.pv')
-                span#busuanzi_value_site_pv
+                span#busuanzi_site_pv
                     i.solitude.st-loading-line
         if theme.aside.siteinfo.uv
             .webinfo-item
                 .webinfo-item-title
                     i.item-icon.solitude.st-team-fill
                     .item-name= __('aside.uv')
-                span#busuanzi_value_site_uv
+                span#busuanzi_site_uv
                     i.solitude.st-loading-line
     if theme.aside.siteinfo.runtimeenable
         .webinfo-item

package/layout/includes/widgets/post/postMeta.pug

@@ -40,7 +40,7 @@
             if theme.post.meta.pv
                 a.post-meta-pv(href=url_for(page.path), title=_p('post.pv'))
                     i.post-meta-icon.solitude.st-fire-fill
-                    if theme.comment.use
+                    if theme.comment.use && theme.comment.pv
                         case theme.comment.use[0]
                             when "Twikoo"
                                 span#twikoo_visitors
@@ -57,7 +57,7 @@
                                     i.solitude.st-loading-line
                     else
                         if theme.busuanzi
-                            span#busuanzi_value_page_pv
+                            span#busuanzi_page_pv
                                 i.solitude.st-loading-line
             if theme.post.meta.comment && page.comment && theme.comment.count && theme.comment.use
                 span.post-meta-commentcount(title=_p('post.comment'), onclick="sco.scrollTo('post-comment')")

package/layout/includes/widgets/third-party/comments/comment.pug

@@ -5,7 +5,7 @@
         .comment-headline
             i.solitude.st-chat-fill
             span=' ' + _p('comment.title')
-            if count
+            if count && is_post()
                 span.count
                     = ' ('
                     each name in use

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.8.6",
+  "version": "1.8.8",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the efu.",
   "main": "package.json",
   "scripts": {

package/plugins.yml

@@ -78,9 +78,9 @@ swiper_js:
   version: 11.0.5
   other_name: Swiper
 busuanzi_js:
-  name: busuanzi
-  file: bsz.pure.mini.js
-  version: 2.3.0
+  name: pearssauce-busuanzi
+  file: bsz.pure.min.js
+  version: 1.0.0
 snackbar:
   name: node-snackbar
   file: dist/snackbar.min.js

package/source/css/_layout/article-container.styl

@@ -67,9 +67,6 @@
     text-align left
     letter-spacing .6px
 
-    img
-      margin auto
-
     a
       &:not(.fancybox)
         text-decoration none

package/source/js/main.js

@@ -37,14 +37,12 @@ const sidebarFn = () => {
 const scrollFn = function () {
     const innerHeight = window.innerHeight;
     if (document.body.scrollHeight <= innerHeight) return;
-
     let initTop = 0;
     const $header = document.getElementById('page-header');
-    window.addEventListener('scroll', utils.throttle(function (e) {
-        initThemeColor()
+    const throttledScroll = utils.throttle(function (e) {
+        initThemeColor();
         const currentTop = window.scrollY || document.documentElement.scrollTop;
         const isDown = scrollDirection(currentTop);
-
         if (currentTop > 0) {
             if (isDown) {
                 if ($header.classList.contains('nav-visible')) $header.classList.remove('nav-visible');
@@ -53,12 +51,15 @@ const scrollFn = function () {
             }
             $header.classList.add('nav-fixed');
         } else {
-            if (currentTop ===0){
             $header.classList.remove('nav-fixed', 'nav-visible');
-            }
         }
-    }, 200));
-
+    }, 200);
+    window.addEventListener('scroll', function(e) {
+        throttledScroll(e);
+        if (window.scrollY === 0) {
+            $header.classList.remove('nav-fixed', 'nav-visible');
+        }
+    });
     function scrollDirection(currentTop) {
         const result = currentTop > initTop;
         initTop = currentTop;
@@ -67,34 +68,26 @@ const scrollFn = function () {
 }
 
 const percent = () => {
-    let scrollTop = document.documentElement.scrollTop || window.pageYOffset
-    let totalHeight = Math.max(document.body.scrollHeight, document.documentElement.scrollHeight, document.body.offsetHeight, document.documentElement.offsetHeight, document.body.clientHeight, document.documentElement.clientHeight) - document.documentElement.clientHeight
-    let scrollPercent = Math.round(scrollTop / totalHeight * 100)
-    let percentElement = document.querySelector("#percent")
-    let viewportBottom = window.scrollY + document.documentElement.clientHeight
-    let remainingScroll = totalHeight - scrollTop
-
-    if ((document.getElementById("post-comment") || document.getElementById("footer"))?.offsetTop < viewportBottom || scrollPercent > 90) {
-        document.querySelector("#nav-totop").classList.add("long")
-        percentElement.innerHTML = GLOBAL_CONFIG.lang.backtop
+    const docEl = document.documentElement;
+    const body = document.body;
+    const scrollPos = window.pageYOffset || docEl.scrollTop;
+    const scrollHeight = Math.max(body.scrollHeight, docEl.scrollHeight, body.offsetHeight, docEl.offsetHeight, body.clientHeight, docEl.clientHeight);
+    const viewportHeight = docEl.clientHeight;
+    const totalScrollableHeight = scrollHeight - viewportHeight;
+    const scrolledPercent = Math.round((scrollPos / totalScrollableHeight) * 100);
+    const navToTop = document.querySelector("#nav-totop");
+    const percentDisplay = document.querySelector("#percent");
+    const commentOrFooter = document.getElementById("post-comment") || document.getElementById("footer");
+    const isNearEnd = (window.scrollY + viewportHeight) >= commentOrFooter.offsetTop;
+    if (isNearEnd || scrolledPercent > 90) {
+        navToTop.classList.add("long");
+        percentDisplay.textContent = GLOBAL_CONFIG.lang.backtop;
     } else {
-        document.querySelector("#nav-totop").classList.remove("long")
-        if (scrollPercent >= 0) {
-            percentElement.innerHTML = scrollPercent + ""
-        }
+        navToTop.classList.remove("long");
+        percentDisplay.textContent = scrolledPercent;
     }
-
-    let elementsToHide = document.querySelectorAll(".needEndHide")
-    if (remainingScroll < 100) {
-        elementsToHide.forEach(function (element) {
-            element.classList.add("hide")
-        })
-    } else {
-        elementsToHide.forEach(function (element) {
-            element.classList.remove("hide")
-        })
-    }
-
+    const elementsToHide = document.querySelectorAll(".needEndHide");
+    elementsToHide.forEach(item => item.classList.toggle("hide", totalScrollableHeight - scrollPos < 100));
     window.onscroll = percent
 }
 
@@ -892,12 +885,12 @@ window.refreshFn = () => {
 
 document.addEventListener('DOMContentLoaded', function () {
     sco.initAdjust()
-    percent()
     initObserver()
     addCopyright()
     sco.initConsoleState()
     window.refreshFn()
     asideStatus()
+    percent()
 })
 
 window.onkeydown = function (e) {