hexo-theme-solitude 2.0.13 → 2.1.0

package/README.md

@@ -42,7 +42,8 @@ English丨[简体中文](README_zh-Hans.md)丨[繁体中文](README_zh-Hant.md)
 
 ## Todo
 
-- [x] The list of articles is displayed in three columns on the homepage.
+- [X] Mobile directory support.
+- [X] Add a bottom right sidebar.
 
 > If you have any questions, please issue an [issue](https://github.com/everfu/hexo-theme-solitude/issues)
 

package/README_zh-Hans.md

@@ -42,7 +42,8 @@
 
 ## Todo
 
-- [x] 首页顶部新样式
+- [x] 移动端目录支持
+- [x] 增加右下角侧边栏
 
 > 如有问题请提 [issue](https://github.com/everfu/hexo-theme-solitude/issues)
 

package/README_zh-Hant.md

@@ -42,7 +42,8 @@
 
 ## Todo
 
-- [x] 首页文章列表三列显示
+- [x] 移動端目錄支援
+- [x] 增加右下角側邊欄
 
 ## 應用
 

package/_config.yml

@@ -444,7 +444,7 @@ footer:
 # 404 页面
 errorpage:
   img: /img/404.avif
-  text: =awa= Page NotFound # Text
+  text: =awa= Page Not Found # Text
   recommendList: true
 # --------------------------- end ---------------------------
 
@@ -887,10 +887,7 @@ right_menu:
   ctrlOriginalMenu: false
   # Simplified and Traditional Chinese translation.
   # 简繁体转换
-  translate:
-    enable: false
-    defaultEncoding: 2 # 1: 默认繁体 2: 默认简体
-    translateDelay: 0 # 首次加载翻译迟疑时间
+  translate: false
   # Custom list
   # 自定义列表
   custom_list:
@@ -954,6 +951,24 @@ background:
   light: https://i.pinimg.com/originals/93/57/38/935738ed9657b296c2ef0ebd2151eb66.jpg
 # --------------------------- end ---------------------------
 
+# --------------------------- start ---------------------------
+translate:
+  enable: true
+  defaultEncoding: 2 # 1: 默认繁体 2: 默认简体
+  translateDelay: 0 # 首次加载翻译迟疑时间
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# Right-Sidebar
+# 右下角悬停导航栏
+rightside:
+  enable: false
+  hide:
+    enable: false
+    translate: false
+    mode: false
+# --------------------------- start ---------------------------
+
 # --------------------------- start ---------------------------
 # Do not modify unless necessary
 # 非必要请勿修改

package/languages/default.yml

@@ -233,3 +233,13 @@ essay:
   tip0: '- All expanded -'
   tip1: '- Recent Exhibitions #{count} Short Articles -'
   link: 'Link'
+
+rightside:
+  show:
+    gear: Settings
+    toc: Toc
+    comment: Comment
+    top: Top
+  hide:
+    translate: 简繁转换
+    mode: Mode

package/languages/en.yml

@@ -234,3 +234,13 @@ essay:
   tip0: '- All expanded -'
   tip1: '- Recent Exhibitions #{count} Short Articles -'
   link: 'Link'
+
+rightside:
+  show:
+    gear: Settings
+    toc: Toc
+    comment: Comment
+    top: Top
+  hide:
+    translate: 简繁转换
+    mode: Mode

package/languages/zh-CN.yml

@@ -233,3 +233,13 @@ essay:
   tip0: '- 已展开所有短文 -'
   tip1: '- 只展示最近 #{count} 条短文 -'
   link: '链接'
+
+rightside:
+  show:
+    gear: 扩展
+    toc: 目录
+    comment: 评论
+    top: 返回顶部
+  hide:
+    translate: 简繁转换
+    mode: 显示模式切换

package/languages/zh-TW.yml

@@ -232,3 +232,13 @@ essay:
   tip0: '- 已展開所有短文 -'
   tip1: '- 只展示最近 #{count} 條短文 -'
   link: '鏈結'
+
+rightside:
+  show:
+    gear: 擴展
+    toc: 目錄
+    comment: 評論
+    top: 返回頂部
+  hide:
+    translate: 簡繁轉換
+    mode: 顯示模式切換

package/layout/includes/head/config.pug

@@ -114,10 +114,10 @@
                 close: _p('right_menu.barrage.close')
             }
         }
-        if (theme.right_menu.translate.enable) {
+        if (theme.translate.enable) {
             rightMenu.translate = {
-                translateDelay: theme.right_menu.translate.translateDelay,
-                defaultEncoding: theme.right_menu.translate.defaultEncoding
+                translateDelay: theme.translate.translateDelay,
+                defaultEncoding: theme.translate.defaultEncoding
             }
         }
         if (theme.right_menu.ctrlOriginalMenu)

package/layout/includes/inject/body.pug

@@ -33,7 +33,7 @@ div
     script.
       dark()
 
-  if theme.right_menu.enable && theme.right_menu.translate.enable
+  if theme.translate.enable
     script(src=url_for(theme.cdn.translate_js))
 
   if theme.katex && theme.katex.enable

package/layout/includes/layout.pug

@@ -26,6 +26,10 @@ html(lang=config.language, data-theme="light")
         // keyboard
         if theme.keyboard.enable
             include ./keyboard.pug
+        
+        // righhtside
+        if theme.rightside.enable
+            include rightside
 
         #body-wrap(class = is_post() ? 'post' : 'page')
             include ./header.pug

package/layout/includes/rightmenu.pug

@@ -68,10 +68,10 @@ div#rightMenu
                     span.menu-darkmode-text= _p('right_menu.light')
                 when 'dark'
                     span.menu-darkmode-text= _p('right_menu.dark')
-        if theme.right_menu.translate.enable
+        if theme.right_menu.translate
             div.rightMenu-item#menu-translate
                 i.solitude.fa-solid.fa-language
-                case theme.right_menu.translate.defaultEncoding
+                case theme.translate.defaultEncoding
                     when 2
                         span= _p('right_menu.chs_to_cht')
                     when 1

package/layout/includes/rightside.pug

@@ -0,0 +1,3 @@
+#rightside
+    include ./widgets/rightside/hide
+    include ./widgets/rightside/show

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

@@ -13,10 +13,10 @@
                     .item-name= __('aside.pv')
                 if theme.busuanzi_use === 0
                     span#busuanzi_value_site_pv
-                        i.solitude.fa-solid.fa-spinner
+                        i.solitude.fa-solid.fa-spinner.fa-spin
                 else
                     span#busuanzi_site_pv
-                        i.solitude.fa-solid.fa-spinner
+                        i.solitude.fa-solid.fa-spinner.fa-spin
         if theme.aside.siteinfo.uv
             .webinfo-item
                 .webinfo-item-title
@@ -24,10 +24,10 @@
                     .item-name= __('aside.uv')
                 if theme.busuanzi_use === 0
                     span#busuanzi_value_site_uv
-                        i.solitude.fa-solid.fa-spinner
+                        i.solitude.fa-solid.fa-spinner.fa-spin
                 else
                     span#busuanzi_site_uv
-                        i.solitude.fa-solid.fa-spinner
+                        i.solitude.fa-solid.fa-spinner.fa-spin
     if theme.aside.siteinfo.runtimeenable
         .webinfo-item
             .webinfo-item-title

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

@@ -44,25 +44,25 @@
                         case theme.comment.use[0]
                             when "Twikoo"
                                 span#twikoo_visitors
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                             when "Waline"
                                 span.waline-pageview-count
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                             when "Valine"
                                 span.leancloud_visitors(id=url_for(page.path))
                                     span.leancloud-visitors-count
-                                        i.solitude.fa-solid.fa-spinner
+                                        i.solitude.fa-solid.fa-spinner.fa-spin
                             when 'Artalk'
                                 span#ArtalkPV
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                     else
                         if theme.busuanzi
                             if theme.busuanzi_use === 0
                                 span#busuanzi_value_page_pv
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                             else
                                 span#busuanzi_page_pv
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
             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')")
                     i.solitude.fa-solid.fa-comment
@@ -70,13 +70,13 @@
                         case theme.comment.use[0]
                             when "Twikoo"
                                 span.twikoo-count
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                             when "Waline"
                                 span.waline-comment-count
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                             when "Valine"
                                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                             when 'Artalk'
                                 span.artalk-count
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin

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

@@ -0,0 +1,6 @@
+.rs_hide
+    if theme.rightside.hide.translate
+        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

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

@@ -0,0 +1,12 @@
+.rs_show
+    if theme.rightside.hide.enable
+        button.config(type='button' title=_p('rightside.show.gear') onclick='document.querySelector(".rs_hide").classList.toggle("show")')
+            i.fas.fa-gear.fa-spin
+    if page.toc
+        button.mobile.toc(type='button' title=_p('rightside.show.toc') onclick="document.querySelector('#card-toc').classList.toggle('open')")
+            i.fas.fa-list
+    if page.comment
+        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

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

@@ -12,13 +12,13 @@
                         case name
                             when "Twikoo"
                                 span.twikoo-count
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                             when "Waline"
                                 span.waline-comment-count
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                             when "Valine"
                                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-                                    i.solitude.fa-solid.fa-spinner
+                                    i.solitude.fa-solid.fa-spinner.fa-spin
                             when "Artalk"
                                 span.artalk-count
                     | )

package/layout/includes/widgets/third-party/pjax.pug

@@ -3,7 +3,7 @@
 script.
     const pjax = new Pjax({
         elements: 'a:not([target="_blank"])',
-        selectors: ['title','#body-wrap','#site-config','meta[name="description"]','.js-pjax','meta[property^="og:"]','#config-diff'],
+        selectors: ['title','#body-wrap','#site-config','meta[name="description"]','.js-pjax','meta[property^="og:"]','#config-diff', '.rs_show', '.rs_hide'],
         cacheBust: false,
         analytics: !{google_adsense},
         scrollRestoration: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.0.13",
+  "version": "2.1.0",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by everfu.",
   "main": "package.json",
   "scripts": {
@@ -12,7 +12,7 @@
     "solitude",
     "Card UI Design",
     "everfu",
-    "一小只托尼",
+    "伍十七",
     "hexo-theme-solitude"
   ],
   "repository": {
@@ -25,9 +25,9 @@
   },
   "bugs": {
     "url": "https://github.com/everfu/hexo-theme-solitude/issues",
-    "email": "o@everfu.org"
+    "email": "o@everfu.cn"
   },
   "homepage": "https://solitude.js.org",
-  "author": "Hexo-Theme-Solitude<o@everfu.org>",
+  "author": "Hexo-Theme-Solitude<o@everfu.cn>",
   "license": "MIT"
 }

package/scripts/event/merge_config.js

@@ -384,11 +384,7 @@ hexo.extend.filter.register('before_generate', () => {
       enable: false,
       commentBarrage: false,
       ctrlOriginalMenu: false,
-      translate: {
-        enable: false,
-        defaultEncoding: 2,
-        translateDelay: 0,
-      },
+      translate: false,
       custom_list: []
     },
     lure: {
@@ -409,6 +405,19 @@ hexo.extend.filter.register('before_generate', () => {
       light: 'https://bu.dusays.com/2023/09/29/651685cc18d39.jpg',
       opacity: .2,
     },
+    translate: {
+      enable: false,
+      defaultEncoding: 2,
+      translateDelay: 0,
+    },
+    rightside: {
+      enable: false,
+      hide: {
+        enable: false,
+        translate: false,
+        mode: false
+      }
+    },
     CDN: {
       internal: 'local',
       third_party: 'cdnjs',

package/source/css/_global/index.styl

@@ -43,8 +43,8 @@
   --sidebar-bg #f6f8fa
   --btn-hover-color #ff7242
   --btn-color #fff
-  --btn-bg #307af6
-  --text-bg-hover #307af6
+  --btn-bg var(--efu-main)
+  --text-bg-hover #f6f8fa
   --light-grey #eee
   --text-highlight-color #1f2d3d
   --blockquote-color #6a737d

package/source/css/_layout/aside.styl

@@ -1,5 +1,6 @@
 #aside-content
-  width 300px
+  +minWidth1200()
+    width 300px
   if hexo-config('aside.position') == 0
     order 1
   else
@@ -12,7 +13,8 @@
       padding-left 15px
 
   +maxWidth1200()
-    display none
+    .card-widget:not(#card-toc)
+      display: none
 
   +minWidth1300()
     animation slide-in .6s .3s backwards
@@ -62,6 +64,7 @@
   .sticky_layout
     top calc(60px + .5rem)
     position sticky
+    z-index 10
     transition: top .3s ease 0s
 
   #author-info__sayhi
@@ -187,6 +190,21 @@
       right 0
       padding .5rem
 
+    +maxWidth1200()
+        position: fixed
+        right: 3rem
+        bottom: 2rem
+        z-index: 100
+        max-width: 380px
+        max-height: calc(100% - 60px)
+        width: calc(100% - 80px)
+        transition: transform .3s
+        transform: scale(0)
+        transform-origin: right bottom
+
+        &.open
+          transform: scale(1)
+
     .toc-content
       overflow-y: auto
       max-height: calc(100vh - 300px)

package/source/css/_layout/capsule.styl

@@ -2,7 +2,7 @@ if hexo-config('capsule.enable')
   #nav-music
     display flex
     align-items center
-    z-index 8
+    z-index 11
     position fixed
     bottom 20px
     left 20px

package/source/css/_layout/header.styl

@@ -97,6 +97,7 @@
       top 7rem
 
   #nav
+    z-index 100
     box-shadow none
     transition 0.3s
     display flex

package/source/css/_layout/rightside.styl

@@ -0,0 +1,34 @@
+if hexo-config('rightside.enable')
+    #rightside
+        position: fixed
+        right: -2.5rem
+        bottom: 2.5rem
+        z-index: 1000
+        opacity: 0
+        transition: all .5s
+
+        button
+            display: block
+            margin-bottom: 5px
+            width: 1.8rem
+            height: 1.8rem
+            border-radius: 50%
+            background-color: var(--btn-bg)
+            color: var(--btn-color)
+            text-align: center
+            font-size: 16px
+
+            &.mobile
+                display: none
+
+                +maxWidth900()
+                    display: block
+
+        .rs_hide
+            transform: translate(45px, 0)
+            transition: all .4s
+            opacity 0
+            
+            &.show
+                opacity .8
+                transform: translate(0, 0)

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

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

package/source/js/main.js

@@ -26,9 +26,11 @@ const sidebarFn = () => {
     sco.refreshWaterFall();
   });
 }
+
 const scrollFn = () => {
   let initTop = 0;
   const $header = document.getElementById('page-header');
+  const $rightside = document.getElementById('rightside') || null;
   const throttledScroll = utils.throttle(() => {
     initThemeColor();
     const currentTop = window.scrollY || document.documentElement.scrollTop;
@@ -40,14 +42,17 @@ const scrollFn = () => {
         if (!$header.classList.contains('nav-visible')) $header.classList.add('nav-visible');
       }
       $header.classList.add('nav-fixed');
+      $rightside && ($rightside.style.cssText = 'opacity: 0.8; transform: translateX(-58px);');
     } else {
       $header.classList.remove('nav-fixed', 'nav-visible');
+      $rightside && ($rightside.style.cssText = "opacity: ''; transform: ''");
     }
   }, 200);
   window.addEventListener('scroll', (e) => {
     throttledScroll(e);
     if (window.scrollY === 0) {
       $header.classList.remove('nav-fixed', 'nav-visible');
+      $rightside && ($rightside.style.cssText = "opacity: ''; transform: ''");
     }
   });
 
@@ -656,6 +661,35 @@ class tabs {
   }
 }
 
+const scrollFnToDo = () => {
+  const { toc } = PAGE_CONFIG;
+
+  if (toc) {
+    const $cardTocLayout = document.getElementById('card-toc')
+      $cardToc = $cardTocLayout.querySelector('.toc-content')
+      $tocLink = $cardToc.querySelectorAll('.toc-link')
+      $tocPercentage = $cardTocLayout.querySelector('.toc-percentage')
+      isExpand = $cardToc.classList.contains('is-expand')
+
+      // toc percentage
+      const tocItemClickFn = e => {
+        const target = e.target.closest('.toc-link')
+        if (!target) return
+
+        e.preventDefault()
+        utils.scrollToDest(utils.getEleTop(document.getElementById(decodeURI(target.getAttribute('href')).replace('#', ''))), 300)
+        if (window.innerWidth < 900) {
+          $cardTocLayout.classList.remove('open')
+        }
+      }
+      utils.addEventListenerPjax($cardToc, 'click', tocItemClickFn)
+  }
+}
+
+const forPostFn = () => {
+  scrollFnToDo()
+}
+
 window.refreshFn = () => {
   const {is_home, is_page, page, is_post} = PAGE_CONFIG;
   const {runtime, lazyload, lightbox, randomlink, covercolor, post_ai, lure, expire} = GLOBAL_CONFIG;
@@ -684,6 +718,8 @@ window.refreshFn = () => {
   if (covercolor.enable) coverColor();
   if (PAGE_CONFIG.toc) toc.init();
   if (lure) tabs.lureAddListener();
+
+  forPostFn();
 }
 document.addEventListener('DOMContentLoaded', () => {
   [addCopyright, window.refreshFn, asideStatus, () => window.onscroll = percent, sco.initConsoleState].forEach(fn => fn());

package/source/js/tw_cn.js

@@ -1,12 +1,9 @@
 document.addEventListener('DOMContentLoaded', function () {
     const { defaultEncoding, translateDelay } = GLOBAL_CONFIG.right_menu.translate;
     const targetEncodingCookie = 'translate-chn-cht';
-    const msgToTraditionalChinese = '轉為繁體';
-    const msgToSimplifiedChinese = '转为简体';
 
     let currentEncoding = defaultEncoding;
     let targetEncoding = Number(utils.saveToLocal.get(targetEncodingCookie)) || defaultEncoding;
-    let translateButtonObject;
 
     function setLang() {
         document.documentElement.lang = targetEncoding === 1 ? 'zh-TW' : 'zh-CN';
@@ -23,7 +20,7 @@ document.addEventListener('DOMContentLoaded', function () {
         const objs = fobj && typeof fobj === 'object' ? fobj.childNodes : document.body.childNodes;
 
         objs.forEach(obj => {
-            if (['BR', 'HR'].includes(obj.tagName) || obj === translateButtonObject) return;
+            if (['BR', 'HR'].includes(obj.tagName)) return;
             
             if (obj.title) obj.title = translateText(obj.title);
             if (obj.alt) obj.alt = translateText(obj.alt);
@@ -36,12 +33,12 @@ document.addEventListener('DOMContentLoaded', function () {
         });
     }
 
-    function translatePage() {
+    function translatePage(simeple, traditional ,button) {
         currentEncoding = targetEncoding;
         targetEncoding = targetEncoding === 1 ? 2 : 1;
-        translateButtonObject.lastChild.textContent = targetEncoding === 1 ? msgToSimplifiedChinese : msgToTraditionalChinese;
+        button.lastChild.textContent = targetEncoding === 1 ? simeple : traditional;
         
-        utils.snackbarShow(targetEncoding === 1 ? '你已切换为简体' : '你已切換為繁體');
+        utils.snackbarShow(targetEncoding === 1 ? '你已切換為繁體' : '你已切换为简体');
         utils.saveToLocal.set(targetEncodingCookie, targetEncoding, 2);
         setLang();
         translateBody();
@@ -75,14 +72,24 @@ document.addEventListener('DOMContentLoaded', function () {
     }
 
     function translateInitialization() {
-        translateButtonObject = document.getElementById('menu-translate');
-        if (translateButtonObject) {
+        let btn_1 = document.getElementById('menu-translate');
+        if (btn_1) {
+            btn_1.lastChild.textContent = targetEncoding === 1 ? '转为简体' : '转为繁体';
             if (currentEncoding !== targetEncoding) {
-                translateButtonObject.lastChild.textContent = targetEncoding === 1 ? msgToSimplifiedChinese : msgToTraditionalChinese;
                 setLang();
                 setTimeout(translateBody, translateDelay);
             }
-            translateButtonObject.addEventListener('click', translatePage, false);
+            btn_1.addEventListener('click', () => {translatePage( '转为简体','转为繁体',btn_1)}, false);
+        }
+
+        let btn_2 = document.querySelector('.rs_hide .translate');
+        if (btn_2) {
+            btn_2.lastChild.textContent = targetEncoding === 1 ? '简' : '繁';
+            if (currentEncoding !== targetEncoding) {
+                setLang();
+                setTimeout(translateBody, translateDelay);
+            }
+            btn_2.addEventListener('click', () => {translatePage('简','繁',btn_2)}, false);
         }
     }