hexo-theme-solitude 2.0.12 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.0.12",
+  "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

@@ -383,11 +383,8 @@ hexo.extend.filter.register('before_generate', () => {
     right_menu: {
       enable: false,
       commentBarrage: false,
-      translate: {
-        enable: false,
-        defaultEncoding: 2,
-        translateDelay: 0,
-      },
+      ctrlOriginalMenu: false,
+      translate: false,
       custom_list: []
     },
     lure: {
@@ -408,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/scripts/event/page.js

@@ -30,4 +30,4 @@ hexo.extend.generator.register('categories', function(locals) {
       comment: false
     }
   };
-});
+});

package/scripts/filter/checkThemeConfig.js

@@ -5,12 +5,12 @@ hexo.extend.filter.register('before_post_render', () => {
         const logger = hexo.log;
         const theme = hexo.theme.config;
         if (theme.says.enable && !data.essay) {
-            logger.error('\n 启用说说的情况下，必须提供 essay 数据文件！\n 请新建 essay.yaml。');
+            logger.error('\n 启用即刻短文的情况下，请新建 essay.yaml。');
             logger.error('\n If says is enabled, essay data must be supplied! \n Please create essay.yaml.');
             process.exit(-1);
         }
         if (theme.footer.randomlink && !data.links){
-            logger.error('\n 启用随机链接的情况下，必须提供 links 数据！\n 请新建 links.yaml。');
+            logger.error('\n 启用随机链接的情况下，请新建 links.yaml。');
             logger.error('\n If randomlink is enabled, links data must be supplied! \n Please create links.yaml.');
             process.exit(-1);
         }
@@ -20,4 +20,4 @@ hexo.extend.filter.register('before_post_render', () => {
             process.exit(-1);
         }
     }
-);
+);

package/scripts/helper/related_post.js

@@ -82,4 +82,4 @@ function compare(attr, dateType) {
         }
         return val2 - val1
     }
-}
+}

package/scripts/tags/article.js

@@ -7,33 +7,12 @@ const article = ([path]) => {
   }
   const tags = post.tags.map(tag => `<a class="article-meta__tags fancybox" href="${tag.path}" onclick="event.stopPropagation();"><span class="tags-punctuation"><i class="solitude fa-solid fa-hashtag"></i>${tag.name}</span></a>`).join('');
   const category = post.categories.data.length > 0 ? `<span class="article-meta sticky-warp"><span class="original">${post.categories.data[0].name}</span></span>` : '';
-  return `
-    <div class="recent-post-item" onclick="pjax.loadUrl('${post.path}')">
-      <div class="post_cover">
-        <a href="${post.path}" class="fancybox" title="${post.title}">
-          <img class="post_bg" src="${post.cover}" alt="${post.title}">
-        </a>
-      </div>
-      <div class="recent-post-info">
-        <div class="recent-post-info-top">
-          <div class="recent-post-info-top-tips">
-            ${category}
-          </div>
-          <a class="article-title fancybox" href="${post.path}" title="${post.title}">${post.title}</a>
-        </div>
-        <div class="content">
-        ${post.description ? post.description : ''}
-        </div>
-        <div class="article-meta-wrap">
-          <span class="article-meta tags">
-            ${tags}
-          </span>
-          <span class="post-meta-date">
-            <time datetime="${post.date}" style="display: inline;"></time>
-          </span>
-        </div>
-      </div>
-    </div>`;
+  const postCover = `<div class="post_cover"><a href="${'/' + post.path}" class="fancybox" title="${post.title}"><img class="post_bg" src="${post.cover}" alt="${post.title}"></a></div>`;
+  const recentPostInfoTop = `<div class="recent-post-info-top"><div class="recent-post-info-top-tips">${category}</div><a class="article-title fancybox" href="${'/' + post.path}" title="${post.title}">${post.title}</a></div>`;
+  const content = `<div class="content">${post.description ? post.description : ''}</div>`;
+  const articleMetaWrap = `<div class="article-meta-wrap"><span class="article-meta tags">${tags}</span><span class="post-meta-date"><time datetime="${post.date}" style="display: inline;"></time></span></div>`;
+  const recentPostInfo = `<div class="recent-post-info">${recentPostInfoTop + content + articleMetaWrap}</div>`
+  return `<div class="recent-post-item" onclick="pjax.loadUrl('${'/' + post.path}')">${postCover + recentPostInfo}</div>`;
 }
 
 hexo.extend.tag.register('article', article)

package/scripts/tags/tabs.js

@@ -14,9 +14,7 @@ function postTabs ([name, active], content) {
   let tabNav = ''
   let tabContent = ''
 
-  if (typeof active === 'undefined') {
-    active = 0
-  }
+  active = Number(active) || 0
 
   while ((match = tabBlock.exec(content)) !== null) {
     matches.push(match[1])

package/source/css/_comments/comment.styl

@@ -77,7 +77,7 @@
     font-size .6rem
     color var(--efu-secondtext)
     border-radius 8px
-  if index(hexo-config('comment.use'), ',') || hexo-config('comment.use')[1]
+  if hexo-config('comment.use')[1] || ',' in hexo-config('comment.use')
     &.move
       if hexo-config('comment.count')
         .comment-head
@@ -103,7 +103,7 @@
     margin .5rem 0
     position relative
 
-    if index(hexo-config('comment.use'), ',') || ',' in hexo-config('comment.use')
+    if hexo-config('comment.use')[1] || ',' in hexo-config('comment.use')
       .count span:last-child
         display none
 
@@ -139,7 +139,7 @@
             content ''
             transition .4s
 
-  if ',' in hexo-config('comment.use') || index(hexo-config('comment.use'), ',')
+  if hexo-config('comment.use')[1] || index(hexo-config('comment.use'), ',')
     .comment-wrap
       > div:last-child
         display none
@@ -167,4 +167,4 @@ if hexo-config('twikoo.style') && 'Twikoo' in hexo-config('comment.use')
   @import 'twikoo.styl'
 
 if hexo-config('valine.style') && 'Valine' in hexo-config('comment.use')
-  @import 'valine.styl'
+  @import 'valine.styl'

package/source/css/_comments/twikoo.styl

@@ -301,6 +301,9 @@
       font-size .5rem
       color var(--efu-secondtext)
 
+.tk-content
+  margin-top 0!important
+
 .tk-meta-input
   .el-input
     .el-input-group__prepend
@@ -408,10 +411,6 @@ button.el-button.tk-cancel.el-button--default.el-button--small
   border-radius 8px !important
   color var(--efu-fontcolor) !important
 
-.tk-replies .tk-content span:first-child
-  font-size inherit
-  color black
-
 .OwO
   &.OwO-open
     .OwO-body

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
@@ -411,7 +411,7 @@ i.solitude
 span.tags-punctuation
   i
     font-weight bold
-    font-size: 14px
+    font-size: 12px
     transition none
     margin-right: 2px
     opacity: .4

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)
@@ -744,32 +762,6 @@ if hexo-config('aside.card.style') == 2
     border var(--style-border-always)
 
 #aside-content
-  .card-webinfo
-    .webinfo
-      .webinfo-item-title
-        display flex
-
-        i
-          line-height: 2 !important
-          margin-right: 6px
-          width: 16px
-          text-align: center
-          font-size: 16px !important
-
-      .webinfo-item
-        display flex
-        justify-content space-between
-        white-space nowrap
-        -webkit-box-align center
-        align-items center
-        padding .1rem .5rem 0
-
-        div:first-child
-          -webkit-box-flex 1
-          flex 1 1 0
-          padding-right 1rem
-
-
   .card-allinfo
 
     hr
@@ -1098,3 +1090,27 @@ if hexo-config('aside.newest_comment.enable')
           font-size 12px
           color var(--efu-secondtext)
           margin-top auto
+
+.webinfo-item
+  display flex
+  justify-content space-between
+  white-space nowrap
+  -webkit-box-align center
+  align-items center
+  padding .1rem .5rem 0
+
+  div:first-child
+    -webkit-box-flex 1
+    flex 1 1 0
+    padding-right 1rem
+
+.webinfo
+  .webinfo-item-title
+    display flex
+
+    i
+      line-height: 2
+      margin-right: 6px
+      width: 16px
+      text-align: center
+      font-size: 16px

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/recent-post.styl

@@ -128,8 +128,6 @@ if hexo-config('index_post_list.direction') == "column"
             display -webkit-box
             overflow hidden
             -webkit-box-orient vertical
-            +minWidth1300()
-              font-size 30px
 
           .recent-post-info-top-tips
             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/_about/buff.styl

@@ -13,7 +13,6 @@
     animation gradient 15s ease infinite
     min-height 200px
     height fit-content
-    width calc(60% - (.5rem / 2))
 
     .card-content
       display flex

package/source/css/_page/_about/contentinfo.styl

@@ -7,7 +7,7 @@
     background linear-gradient(120deg, #5b27ff 0, #00d4ff 100%)
     background-size 200%
     animation gradient 15s ease infinite
-    width calc(60% - .5rem / 2)
+    flex 4
 
     .title1
       opacity .8
@@ -28,7 +28,7 @@
     justify-content center
     align-items flex-start
     flex-direction column
-    width calc(40% - (.5rem / 2))
+    flex 3
 
     h2
       margin-right auto

package/source/css/_page/_about/game.styl

@@ -3,7 +3,6 @@
     min-height 300px
     overflow hidden
     color var(--efu-white)
-    width 59%
 
     &::after
       box-shadow 0 -69px 203px 11px #04120f inset
@@ -26,7 +25,6 @@
       padding 1rem 2rem
 
   .author-content-item.game-jl
-    width 39%
     min-height 300px
     overflow hidden
     color var(--efu-white)

package/source/css/_page/_about/maxim.styl

@@ -7,7 +7,6 @@
     align-items flex-start
     flex-direction column
     justify-content center
-    width calc(40% - (.5rem / 2))
 
     .maxim-title
       display flex

package/source/css/_page/_about/myphoto.styl

@@ -4,7 +4,6 @@
     min-height 240px
     position relative
     overflow hidden
-    width calc(40% - (.5rem / 2))
     display flex
     align-items center
     justify-content center

package/source/css/_page/_about/oneself.styl

@@ -10,7 +10,7 @@
         width 100% !important
 
     &.mapAndInfo
-      width calc(60% - (.5rem / 2))
+      flex 8
       gap .5rem
 
   .author-content-item

package/source/css/_page/_about/personalities.styl

@@ -1,7 +1,7 @@
 .author-content-item.personalities
   overflow hidden
   position relative
-  width calc(60% - (.5rem / 2))
+  flex 6
   +maxWidth768()
     min-height 360px
 

package/source/css/_page/_about/skills.styl

@@ -4,7 +4,6 @@
     justify-content center
     align-items flex-start
     flex-direction column
-    width calc(50% - (.5rem / 2))
     min-height 450px
 
     .tags-group-all

package/source/css/_page/_about/statistic.styl

@@ -5,7 +5,6 @@
 
   .about-statistic
     min-height 380px
-    width calc(40% - (.5rem / 2))
     background-size cover
     color var(--efu-white)
     overflow hidden

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

@@ -156,6 +156,7 @@ div#banners
 
   +maxWidth768()
     margin-top 0
+    flex-direction column
 
   .author-content-item
     +maxWidth1300()
@@ -172,7 +173,7 @@ div#banners
   margin-top 0
 
 .author-content-item
-  width 49.5%
+  flex 4
   border-radius 12px
   background var(--efu-card-bg)
   border var(--style-border-always)

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/right_menu.js

@@ -1,4 +1,5 @@
 let selectTextNow = "";
+let firstShowRightMenu = true;
 const selectText = () => {
     selectTextNow = document.selection
         ? document.selection.createRange().text
@@ -106,6 +107,15 @@ function stopMaskScroll() {
 
 window.oncontextmenu = (ele) => {
     if (document.body.clientWidth <= 768) return;
+    if (GLOBAL_CONFIG.right_menu.ctrlOriginalMenu) {
+        if (firstShowRightMenu) {
+            firstShowRightMenu = false;
+            utils.snackbarShow(GLOBAL_CONFIG.right_menu.ctrlOriginalMenu, false, 2000);
+        }
+        if (ele.ctrlKey) {
+            return true;
+        }
+    }
     let x = ele.clientX + 10;
     let y = ele.clientY;
     Array.from(rm.menuItems.other).forEach((item) => (item.style.display = "flex"));