hexo-theme-solitude 2.1.0 → 2.1.2

package/_config.yml

@@ -169,15 +169,6 @@ aside:
     backcolor: "var(--efu-blue)" # Background color
   # --------------------------- end ---------------------------
 
-  # --------------------------- start ---------------------------
-  # recent comments(⚠️ Comments need to be configured first.)
-  # 最新评论(⚠️ 需要先配置评论)
-  newest_comment:
-    enable: true
-    storage: .5 # 缓存时间 1: 1天 / .5 : 半天 / Cache time 1: 1 day .5 : half a day
-    limit: 5 # 评论数 / Number of comments
-  # --------------------------- end ---------------------------
-
   # --------------------------- start ---------------------------
   # article table of contents
   # 文章目录
@@ -727,6 +718,12 @@ comment:
     enable: false
     # Number of hot comments
     count: 3
+  # recent comments(⚠️ Comments need to be configured first.)
+  # 最新评论(⚠️ 需要先配置评论)
+  newest_comment:
+    enable: true
+    storage: .5 # 缓存时间 1: 1天 / .5 : 半天 / Cache time 1: 1 day .5 : half a day
+    limit: 5 # 评论数 / Number of comments
 # Twikoo: https://solitude.js.org/comment/twikoo
 twikoo: # https://twikoo.js.org/
   envId: # url: https://twikoo.sondy.top/
@@ -963,10 +960,12 @@ translate:
 # 右下角悬停导航栏
 rightside:
   enable: false
+  percent: false
   hide:
     enable: false
     translate: false
     mode: false
+    aside: false
 # --------------------------- start ---------------------------
 
 # --------------------------- start ---------------------------

package/languages/default.yml

@@ -242,4 +242,5 @@ rightside:
     top: Top
   hide:
     translate: 简繁转换
-    mode: Mode
+    mode: Mode
+    aside: Sidebar

package/languages/en.yml

@@ -243,4 +243,5 @@ rightside:
     top: Top
   hide:
     translate: 简繁转换
-    mode: Mode
+    mode: Mode
+    aside: Sidebar

package/languages/zh-CN.yml

@@ -114,7 +114,7 @@ aside:
   back: 欢迎再次回来，
   sticker: 心情贴纸
   newpost: 最近发布
-  newcomment: 最新评论
+  newcomment: 最近评论
   card:
     posts: '累计文章数:'
     tags: '标签总数:'
@@ -242,4 +242,5 @@ rightside:
     top: 返回顶部
   hide:
     translate: 简繁转换
-    mode: 显示模式切换
+    mode: 显示模式切换
+    aside: 侧边栏

package/languages/zh-TW.yml

@@ -114,7 +114,7 @@ aside:
   back: 歡迎再次回來，
   sticker: 心情貼紙
   newpost: 最近發佈
-  newcomment: 最新評論
+  newcomment: 最近評論
   card:
     posts: '累計文章數:'
     tags: '標籤總數:'
@@ -241,4 +241,5 @@ rightside:
     top: 返回頂部
   hide:
     translate: 簡繁轉換
-    mode: 顯示模式切換
+    mode: 顯示模式切換
+    aside: 側邊欄

package/layout/includes/head/config.pug

@@ -115,15 +115,20 @@
             }
         }
         if (theme.translate.enable) {
-            rightMenu.translate = {
-                translateDelay: theme.translate.translateDelay,
-                defaultEncoding: theme.translate.defaultEncoding
-            }
+            rightMenu.translate = theme.right_menu.translate
         }
         if (theme.right_menu.ctrlOriginalMenu)
             rightMenu.ctrlOriginalMenu = _p('right_menu.ctrl_original_menu')
     }
 
+    let translate = false
+    if (theme.translate.enable) {
+        translate = {
+            translateDelay: theme.translate.translateDelay,
+            defaultEncoding: theme.translate.defaultEncoding
+        }
+    }
+
     let highlight = false
     if (theme.highlight.enable) {
         highlight = {
@@ -187,6 +192,7 @@ script.
         lightbox: '!{ theme.mediumZoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null")}',
         post_ai: !{post_ai},
         right_menu: !{rightMenu ? JSON.stringify(rightMenu) : false},
+        translate: !{translate ? JSON.stringify(translate) : false},
         lure: !{lure ? JSON.stringify(lure) : false},
         expire: !{expire ? JSON.stringify(expire) : false},
     };

package/layout/includes/widgets/nav/right.pug

@@ -18,11 +18,11 @@ if theme.console.enable
                 i.left
                 i.center
                 i.right
-
-.nav-button#nav-totop(onclick="sco.toTop()")
-    a.totopbtn
-        i.solitude.fa-solid.fa-arrow-up
-        span#percent= "0"
+if !theme.rightside.percent
+    .nav-button#nav-totop(onclick="sco.toTop()")
+        a.totopbtn
+            i.solitude.fa-solid.fa-arrow-up
+            span#percent= "0"
 #toggle-menu
     a.site-page
         i.solitude.fa-solid.fa-bars

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

@@ -2,9 +2,9 @@
 .post-copyright
     .post-copyright__author_group
         a.post-copyright__author_img(href=url_for(copyright.author.url))
-            img.post-copyright__author_img_front(src=copyright.author.img || theme.site.icon)
-        .post-copyright__author_name= config.title
-        .post-copyright__author_desc= config.subtitle
+            img.post-copyright__author_img_front(src=page.avatar || copyright.author.img || theme.site.icon)
+        .post-copyright__author_name= page.author || config.title
+        .post-copyright__author_desc= page.desc || config.subtitle
     .post-tools#post-tools
         .post-tools-left
             #quit-box(onclick="RemoveRewardMask()")

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

@@ -18,7 +18,7 @@
         .meta-secondline
             if theme.post.meta.date
                 span.post-meta-date(title=_p('post.posted') + ' ' + full_date(page.date))
-                    i.post-meta-icon.solitude.fa-solid.fa-clock
+                    i.post-meta-icon.solitude.fas.fa-calendar-days
                     time(datetime=date_xml(page.date))= date_xml(page.date)
             if theme.post.meta.updated
                 span.post-meta-date(title=_p('post.updated') + ' ' + full_date(page.updated))

package/layout/includes/widgets/rightside/hide.pug

@@ -3,4 +3,7 @@
         button.translate(type='button' title=_p('rightside.hide.translate'))= '简'
     if theme.rightside.hide.mode 
         button.mode(type='button' title=_p('rightside.hide.mode') onclick='sco.switchDarkMode()')
-            i.fas.fa-circle-half-stroke
+            i.fas.fa-circle-half-stroke
+    if theme.rightside.hide.aside
+        button.aside.pc(type='button' title=_p('rightside.hide.aside') onclick='sco.switchHideAside()')
+            i.fas.fa-arrows-alt-h

package/layout/includes/widgets/rightside/show.pug

@@ -9,4 +9,5 @@
         button.comment(type='button' title=_p('rightside.show.comment') onclick="sco.scrollTo('post-comment')")
             i.fas.fa-comment
     button.top(type='button' title=_p('rightside.show.top') onclick='sco.toTop()')
-        i.fas.fa-arrow-up
+        i.fas.fa-arrow-up
+        span#percent= "0"

package/layout/includes/widgets/third-party/news-comment/newest-comment.pug

@@ -1,4 +1,4 @@
-- var limit = theme.aside.newest_comment.limit ? theme.aside.newest_comment.limit : 5
+- var limit = theme.comment.newest_comment.limit ? theme.comment.newest_comment.limit : 5
 if theme.comment.use
     case theme.comment.use[0]
         when 'Twikoo'

package/package.json

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

package/scripts/event/merge_config.js

@@ -412,6 +412,7 @@ hexo.extend.filter.register('before_generate', () => {
     },
     rightside: {
       enable: false,
+      percent: false,
       hide: {
         enable: false,
         translate: false,

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

@@ -136,13 +136,13 @@
 
         &:before
           margin 0
-          top 0.78em
-          width 0.42em
-          height 0.42em
-          border-radius 0.42em
+          top .9em
+          width .2em
+          height .2em
+          border-radius 50%
           background 0 0
           content ""
-          line-height .42em
+          line-height .2em
           border 0.21em solid var(--efu-lighttext)
           background var(--efu-lighttext)
 

package/source/css/_layout/aside.styl

@@ -193,7 +193,7 @@
     +maxWidth1200()
         position: fixed
         right: 3rem
-        bottom: 2rem
+        bottom: 10px
         z-index: 100
         max-width: 380px
         max-height: calc(100% - 60px)
@@ -1040,7 +1040,7 @@ backcolor = convert(hexo-config('aside.flip.backcolor'))
   .card-widget.card-adsense
     padding 0
 
-if hexo-config('aside.newest_comment.enable')
+if hexo-config('comment.newest_comment.enable')
   .card-recent-comment
     .recent-comment-more
       margin-left auto
@@ -1060,7 +1060,7 @@ if hexo-config('aside.newest_comment.enable')
       position: relative
 
       &:not(:last-child)
-        border-bottom 1px dashed rgba(255, 255, 255, .1)
+        border-bottom var(--style-border-dashed)
 
       .thumbnail img
         width: 60px

package/source/css/_layout/capsule.styl

@@ -57,6 +57,11 @@ if hexo-config('capsule.enable')
 
                 .aplayer-played
                   animation-play-state running
+                  height: 100%;
+                  opacity: .1;
+                  background-color: var(--efu-white) !important;
+                  animation: lightBar 5s ease infinite;
+                  animation-play-state: paused;
 
       #nav-music-hoverTips
         opacity 0

package/source/css/_layout/rightside.styl

@@ -2,7 +2,7 @@ if hexo-config('rightside.enable')
     #rightside
         position: fixed
         right: -2.5rem
-        bottom: 2.5rem
+        bottom: 20px
         z-index: 1000
         opacity: 0
         transition: all .5s
@@ -18,11 +18,30 @@ if hexo-config('rightside.enable')
             text-align: center
             font-size: 16px
 
+            &.pc
+                display: blok
+                +maxWidth900()
+                    display: none
+
             &.mobile
                 display: none
 
                 +maxWidth900()
                     display: block
+            
+            &.top
+                &:hover
+                    #percent
+                        display: none
+                    i
+                        display: block
+                        transition: all .3s
+                        transform: scale(1.3)
+                i
+                    transition: all .3s
+                    display: none
+                    &.show
+                        display: block
 
         .rs_hide
             transform: translate(45px, 0)

package/source/css/_page/_home/home-top.styl

@@ -259,11 +259,6 @@
   flex-wrap wrap
   height 120px
 
-  +maxWidth1200()
-    flex-direction row
-    left 2rem
-    height 60px
-
 .banners-link-btn
   display flex
   flex-direction row

package/source/css/_page/equipment.styl

@@ -55,7 +55,6 @@
           line-height 1
           margin-bottom 8px
           white-space nowrap
-          overflow hidden
           text-overflow ellipsis
           width fit-content
 

package/source/css/_page/other.styl

@@ -171,6 +171,7 @@ div#banners
   color var(--efu-white)
   overflow hidden
   margin-top 0
+  margin-bottom: 12px
 
 .author-content-item
   flex 4

package/source/css/_page/recentcomment.styl

@@ -1,7 +1,7 @@
 div.console_recentcomments
   display flex
   flex-wrap wrap
-  gap 8px
+  gap 12px
   min-height 100px
   width 100%
 
@@ -15,7 +15,7 @@ div.console_recentcomments
   cursor pointer
   transition .3s
   overflow hidden
-  gap 8px
+  gap .5rem
   display flex
   flex-direction column
 

package/source/css/_post/commentBarrage.styl

@@ -1,7 +1,10 @@
 .comment-barrage
   position fixed
   bottom 0
-  right 20px
+  if hexo-config('rightside.enable')
+    right 2.5rem
+  else
+    right 20px
   padding 0 0 20px 10px
   display none
   flex-direction column

package/source/css/_post/copyright.styl

@@ -51,7 +51,8 @@
         text-align center
         font-size 14px
         color var(--efu-secondtext)
-        margin-top 4px
+        margin 4px 10px 0
+        line-height 1.5
 
     .post-copyright__notice
       font-size 12px

package/source/css/_post/meta.styl

@@ -206,7 +206,7 @@
         transition all .3s ease-out 0s
 
       i
-        font-size 13px
+        font-size 14px
         margin-right 4px
 
       > div
@@ -241,7 +241,6 @@
           margin 0 1rem 0 0
 
         .post-meta-pv
-          margin-right 8px
           padding 0 8px
           display flex
           align-items center
@@ -264,7 +263,7 @@
           cursor pointer
           transition .3s
           border-radius 12px
-          padding 8px
+          padding: 8px
 
           &:hover
             opacity 1

package/source/css/_post/tools.styl

@@ -59,7 +59,8 @@
           border-radius: 8px
           line-height: 39px
           box-shadow: var(--efu-shadow-red)
-          display: inline-block
+          display: flex
+          align-items: center
           cursor: pointer
           transition: all .4s ease 0s
 
@@ -181,6 +182,8 @@
         height: 40px
         line-height: 39px
         box-shadow: var(--efu-shadow-green)
+        display: flex
+        align-items: center
         border-radius: 8px
         cursor: pointer
         text-align: center

package/source/css/_tags/tabs.styl

@@ -47,7 +47,7 @@
     margin 16px 0 0 auto
     color #99a9bf
 
-  margin 1rem 0 !important
+  margin 1rem 0
   border-radius 12px
   overflow hidden
   box-shadow var(--efu-shadow-border)

package/source/js/main.js

@@ -68,11 +68,13 @@ const percent = () => {
   const scrollPos = window.pageYOffset || docEl.scrollTop;
   const totalScrollableHeight = Math.max(body.scrollHeight, docEl.scrollHeight, body.offsetHeight, docEl.offsetHeight, body.clientHeight, docEl.clientHeight) - docEl.clientHeight;
   const scrolledPercent = Math.round((scrollPos / totalScrollableHeight) * 100);
-  const navToTop = document.querySelector("#nav-totop");
+  const navToTop = document.querySelector("#nav-totop") || null;
+  const rsToTop = document.querySelector(".rs_show .top i") || null;
   const percentDisplay = document.querySelector("#percent");
   const isNearEnd = (window.scrollY + docEl.clientHeight) >= (document.getElementById("post-comment") || document.getElementById("footer")).offsetTop;
-  navToTop.classList.toggle("long", isNearEnd || scrolledPercent > 90);
-  percentDisplay.textContent = isNearEnd || scrolledPercent > 90 ? GLOBAL_CONFIG.lang.backtop : scrolledPercent;
+  navToTop && navToTop.classList.toggle("long", isNearEnd || scrolledPercent > 90);
+  rsToTop && rsToTop.classList.toggle("show", isNearEnd || scrolledPercent > 90);
+  percentDisplay.textContent = isNearEnd || scrolledPercent > 90 ? navToTop ? GLOBAL_CONFIG.lang.backtop : '' : scrolledPercent;
   document.querySelectorAll(".needEndHide").forEach(item => item.classList.toggle("hide", totalScrollableHeight - scrollPos < 100));
 }
 const showTodayCard = () => {
@@ -149,14 +151,14 @@ const sco = {
     }
   },
   musicToggle() {
-    const $music = document.querySelector('#nav-music');
-    const $meting = document.querySelector('meting-js');
-    const $console = document.getElementById('consoleMusic');
-    const $rm_text = document.querySelector('#menu-music-toggle span');
-    const $rm_icon = document.querySelector('#menu-music-toggle i');
+    const $music = document.querySelector('#nav-music') || null;
+    const $meting = document.querySelector('meting-js') || null;
+    const $console = document.getElementById('consoleMusic') || null;
+    const $rm_text = document.querySelector('#menu-music-toggle span') || null;
+    const $rm_icon = document.querySelector('#menu-music-toggle i') || null;
     this.musicPlaying = !this.musicPlaying;
     $music.classList.toggle("playing", this.musicPlaying);
-    $console.classList.toggle("on", this.musicPlaying);
+    $console && $console.classList.toggle("on", this.musicPlaying);
     if (this.musicPlaying) {
       $meting.aplayer.play();
       (typeof rm !== 'undefined') && rm?.menuItems.music[0] && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.stop) && ($rm_icon.className = 'solitude fas fa-pause')
@@ -167,10 +169,11 @@ const sco = {
   },
   switchCommentBarrage() {
     let commentBarrageElement = document.querySelector(".comment-barrage");
+    let consoleCommentBarrage = document.querySelector("#consoleCommentBarrage");
     if (!commentBarrageElement) return;
     const isDisplayed = window.getComputedStyle(commentBarrageElement).display === "flex";
     commentBarrageElement.style.display = isDisplayed ? "none" : "flex";
-    document.querySelector("#consoleCommentBarrage").classList.toggle("on", !isDisplayed);
+    consoleCommentBarrage && consoleCommentBarrage.classList.toggle("on", !isDisplayed);
     utils.saveToLocal.set("commentBarrageSwitch", !isDisplayed, .2);
     rm?.menuItems.barrage && rm.barrage(isDisplayed)
   },
@@ -224,7 +227,9 @@ const sco = {
       entries.forEach(entry => {
         if (entry.isIntersecting) {
           setTimeout(() => {
-            waterfall(entry.target) || entry.target.classList.add('show');
+            waterfall(entry.target).then(() => {
+              entry.target.classList.add('show');
+            });
           }, 300);
         }
       });

package/source/js/right_menu.js

@@ -175,6 +175,7 @@ window.oncontextmenu = (ele) => {
     Array.from(display ? rm.menuItems.other : rm.menuItems.plugin).forEach(
         (item) => (item.style.display = "none")
     );
+
     Array.from(display ? rm.menuItems.plugin : rm.menuItems.other).forEach(
         (item) => (item.style.display = "block")
     );

package/source/js/third_party/waterfall.min.js

@@ -2,4 +2,4 @@
  * @license Copyright 2024 Ever Funnel. All rights reserved.
  * Licensed under the MIT License.
  */
-function waterfall(t){function e(t,e){var n=window.getComputedStyle(t);return parseFloat(n["margin"+e])||0}function n(t){return t+"px"}function r(t){return parseFloat(t.style.top)||0}function o(t){return parseFloat(t.style.left)||0}function i(t){return t.clientWidth}function l(t){return t.clientHeight}function u(t){return r(t)+l(t)+e(t,"Bottom")}function a(t){return o(t)+i(t)+e(t,"Right")}function s(t){t.sort(function(t,e){var n=u(t),r=u(e);return n===r?o(e)-o(t):r-n})}function f(e){i(t)!==containerWidth&&(window.removeEventListener(e.type,f),waterfall(t))}"string"==typeof t&&(t=document.querySelector(t));var c=Array.from(t.children).map(function(t){return t.style.position="absolute",t});t.style.position="relative";var p=Array.from(t.querySelectorAll("img")),y=p.map(function(t){return new Promise(function(e){t.complete?e():(t.addEventListener("load",e),t.addEventListener("error",e))})});Promise.all(y).then(function(){var r=[];c.length&&(c[0].style.top="0px",c[0].style.left=n(e(c[0],"Left")),r.push(c[0]));for(var l=1;l<c.length;l++){var p=c[l-1],y=c[l];if(!(a(p)+i(y)<=i(t)))break;y.style.top=p.style.top,y.style.left=n(a(p)),r.push(y)}for(var v=r.length;v<c.length;v++){s(r);var d=c[v],h=r.pop();d.style.top=n(u(h)+e(d,"Top")),d.style.left=n(o(h)),r.push(d)}s(r);var m=r[0];t.style.height=n(u(m)+e(m,"Bottom"));i(t);window.addEventListener("resize",f)})}
+function waterfall(t){function e(t,e){var n=window.getComputedStyle(t);return parseFloat(n["margin"+e])||0}function n(t){return t+"px"}function r(t){return parseFloat(t.style.top)||0}function o(t){return parseFloat(t.style.left)||0}function i(t){return t.clientWidth}function l(t){return t.clientHeight}function u(t){return r(t)+l(t)+e(t,"Bottom")}function a(t){return o(t)+i(t)+e(t,"Right")}function s(t){t.sort(function(t,e){var n=u(t),r=u(e);return n===r?o(e)-o(t):r-n})}function f(e){i(t)!==containerWidth&&(window.removeEventListener(e.type,f),waterfall(t))}"string"==typeof t&&(t=document.querySelector(t));var c=Array.from(t.children).map(function(t){return(t.style.position="absolute"),t});t.style.position="relative";var p=Array.from(t.querySelectorAll("img")),y=p.map(function(t){return new Promise(function(e){t.complete?e():(t.addEventListener("load",e),t.addEventListener("error",e))})});return Promise.all(y).then(function(){var r=[];c.length&&(c[0].style.top="0px",c[0].style.left=n(e(c[0],"Left")),r.push(c[0]));for(var l=1;l<c.length;l++){var p=c[l-1],y=c[l];if(!(a(p)+i(y)<=i(t)))break;y.style.top=p.style.top;y.style.left=n(a(p));r.push(y)}for(var v=r.length;v<c.length;v++){s(r);var d=c[v],h=r.pop();d.style.top=n(u(h)+e(d,"Top"));d.style.left=n(o(h));r.push(d)}s(r);var m=r[0];t.style.height=n(u(m)+e(m,"Bottom"));i(t);window.addEventListener("resize",f)})}

package/source/js/tw_cn.js

@@ -1,5 +1,5 @@
 document.addEventListener('DOMContentLoaded', function () {
-    const { defaultEncoding, translateDelay } = GLOBAL_CONFIG.right_menu.translate;
+    const { defaultEncoding, translateDelay } = GLOBAL_CONFIG.translate;
     const targetEncodingCookie = 'translate-chn-cht';
 
     let currentEncoding = defaultEncoding;

package/source/js/utils.js

@@ -37,7 +37,6 @@
             }
         },
         snackbarShow: (text, showAction = false, duration = 5000) => {
-            document.styleSheets[0].addRule(':root', `--efu-snackbar-time:${duration}ms!important`);
             Snackbar.show({
                 text,
                 showAction,