hexo-theme-solitude 2.1.7 → 2.1.9

package/scripts/filter/randomPosts.js

@@ -1,5 +1,16 @@
 hexo.extend.filter.register('after_render:html', function (data) {
-    const posts = hexo.locals.get('posts').filter(post => post.random !== false).map(post => post.path);
-    data += `<script>const posts=${JSON.stringify(posts)};function toRandomPost(){ pjax.loadUrl(GLOBAL_CONFIG.root+posts[Math.floor(Math.random()*posts.length)]); }</script>`;
-    return data;
+    const posts = hexo.locals.get('posts')
+        .filter(post => post.random !== false)
+        .map(post => post.path);
+    
+    const scriptContent = `
+        <script>
+            const posts = ${JSON.stringify(posts)};
+            function toRandomPost() {
+                const randomPost = posts[Math.floor(Math.random() * posts.length)];
+                pjax.loadUrl(GLOBAL_CONFIG.root + randomPost);
+            }
+        </script>`;
+    
+    return data + scriptContent;
 });

package/scripts/tags/article.js

@@ -1,18 +1,56 @@
-'use strict'
+'use strict';
 
 const article = ([path]) => {
   const post = hexo.locals.get("posts").data.find(post => post.path === path);
-  if (!post) {
-    return '';
-  }
-  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>` : '';
-  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)
+  if (!post) return '';
+
+  const createTagLinks = tags => 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 createCategory = categories => categories.length > 0 
+    ? `<span class="article-meta sticky-warp">
+         <span class="original">${categories[0].name}</span>
+       </span>` 
+    : '';
+
+  const createPostCover = post => 
+    `<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 createRecentPostInfoTop = (category, post) => 
+    `<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 createContent = description => 
+    `<div class="content">${description || ''}</div>`;
+
+  const createArticleMetaWrap = (tags, date) => 
+    `<div class="article-meta-wrap">
+       <span class="article-meta tags">${tags}</span>
+       <span class="post-meta-date">
+         <time datetime="${date}" style="display: inline;"></time>
+       </span>
+     </div>`;
+
+  const tags = createTagLinks(post.tags);
+  const category = createCategory(post.categories.data);
+  const postCover = createPostCover(post);
+  const recentPostInfoTop = createRecentPostInfoTop(category, post);
+  const content = createContent(post.description);
+  const articleMetaWrap = createArticleMetaWrap(tags, post.date);
+  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

@@ -11,23 +11,32 @@ function postTabs([name, active], content) {
   
   active = Number(active) || 0;
 
-  const tabItems = matches.map((match, tabId) => {
-    const [tabCaption = '', tabIcon = ''] = match[1].split('@');
-    const postContent = hexo.render.renderSync({ text: match[2], engine: 'markdown' }).trim();
-    const tabHref = `${name.toLowerCase().replace(/\s+/g, '-')}-${tabId}`;
-    
-    const iconHtml = tabIcon ? `<i class="${tabIcon.trim()} tab solitude"></i>` : '';
-    const isActive = active === tabId ? ' active' : '';
-    const toTopButton = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="solitude fas fa-arrow-up"></i></button>';
-    
-    return {
-      nav: `<li class="tab${isActive}"><button type="button" data-href="#${tabHref}">${iconHtml}${tabCaption.trim() || `${name} ${tabId}`}</button></li>`,
-      content: `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent}${toTopButton}</div>`
-    };
-  });
-
-  const tabNav = `<ul class="nav-tabs">${tabItems.map(item => item.nav).join('')}</ul>`;
-  const tabContent = `<div class="tab-contents">${tabItems.map(item => item.content).join('')}</div>`;
+  const generateTabItems = (matches, name, active) => {
+    return matches.map((match, tabId) => {
+      const [tabCaption = '', tabIcon = ''] = match[1].split('@');
+      const postContent = hexo.render.renderSync({ text: match[2], engine: 'markdown' }).trim();
+      const tabHref = `${name.toLowerCase().replace(/\s+/g, '-')}-${tabId}`;
+      
+      const iconHtml = tabIcon ? `<i class="${tabIcon.trim()} tab solitude"></i>` : '';
+      const isActive = active === tabId ? ' active' : '';
+      const toTopButton = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="solitude fas fa-arrow-up"></i></button>';
+      
+      return {
+        nav: `<li class="tab${isActive}"><button type="button" data-href="#${tabHref}">${iconHtml}${tabCaption.trim() || `${name} ${tabId}`}</button></li>`,
+        content: `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent}${toTopButton}</div>`
+      };
+    });
+  };
+
+  const tabItems = generateTabItems(matches, name, active);
+
+  const createTabStructure = (tabItems) => {
+    const tabNav = `<ul class="nav-tabs">${tabItems.map(item => item.nav).join('')}</ul>`;
+    const tabContent = `<div class="tab-contents">${tabItems.map(item => item.content).join('')}</div>`;
+    return { tabNav, tabContent };
+  };
+
+  const { tabNav, tabContent } = createTabStructure(tabItems);
 
   return `<div class="tabs" id="${name.toLowerCase().replace(/\s+/g, '-')}">${tabNav}${tabContent}</div>`;
 }

package/source/css/_comments/comment.styl

@@ -3,7 +3,7 @@
     .comment-headline
       display inline-block
       vertical-align middle
-      font-weight 700
+      font-weight bold
       font-size 20px
 
     #comment-switch
@@ -31,7 +31,7 @@
         background-color #307af6
         vertical-align middle
         cursor pointer
-        transition all .4s ease 0s
+        transition all .4s ease
 
         &::before
           position absolute
@@ -42,7 +42,7 @@
           border-radius 50%
           background-color #fff
           content ""
-          transition all .4s ease 0s
+          transition all .4s ease
 
         &.move
           background-color #ff7242
@@ -77,6 +77,7 @@
     font-size .6rem
     color var(--efu-secondtext)
     border-radius 8px
+
   if hexo-config('comment.use')[1] || ',' in hexo-config('comment.use')
     &.move
       if hexo-config('comment.count')

package/source/css/_comments/twikoo.styl

@@ -36,7 +36,7 @@
   color var(--efu-lighttext) !important
   cursor pointer
   user-select none
-  padding 0 12px 0 12px
+  padding 0 12px
   transition all .3s
   border-radius 8px
   background-color var(--efu-secondbg)
@@ -49,7 +49,6 @@
     .tk-action-icon svg
       fill var(--efu-card-bg) !important
 
-
 .tk-action-icon
   svg
     transition all .3s
@@ -187,7 +186,7 @@
 .tk-content
   .tk-owo-emotion
     width 3em
-    margin 0 2px 0 2px
+    margin 0 2px
 
 .tk-owo-emotion,
 .twikoo
@@ -302,7 +301,7 @@
       color var(--efu-secondtext)
 
 .tk-content
-  margin-top 0!important
+  margin-top 0 !important
 
 .tk-meta-input
   .el-input
@@ -356,7 +355,7 @@ img.tk-avatar-img
   font-weight 700
 
 .el-input__inner
-  background-color: var(--efu-secondbg) !important
+  background-color var(--efu-secondbg) !important
   border 0 !important
   color var(--efu-fontcolor) !important
   padding-left 8px

package/source/css/_global/animation.styl

@@ -21,7 +21,6 @@
   50%
     top -16px
     opacity 1
-    filter none
   100%
     top 0
     opacity .4
@@ -32,7 +31,6 @@
     transform translateY(-50px)
   100%
     opacity 1
-    filter none
     transform translateY(0)
 
 @keyframes headerNoOpacity
@@ -47,7 +45,6 @@
     margin-top 50px
   100%
     opacity 1
-    filter none
     margin-top 0
 
 @keyframes titlescale
@@ -56,7 +53,6 @@
     transform scale(.7)
   100%
     opacity 1
-    filter none
     transform scale(1)
 
 @keyframes search_close
@@ -72,12 +68,10 @@
     opacity 0
   100%
     opacity 1
-    filter none
 
 @keyframes to_hide
   0%
     opacity 1
-    filter none
   100%
     opacity 0
 
@@ -99,7 +93,6 @@
     transform translateY(10px)
   100%
     opacity 1
-    filter none
     transform translateY(0)
 
 @keyframes donate_effcet
@@ -108,13 +101,11 @@
     transform translateY(-20px)
   100%
     opacity 1
-    filter none
     transform translateY(0)
 
 @keyframes announ_animation
   0%, 100%
     transform scale(1)
-    filter blur(0)
   50%
     transform scale(1.2)
     filter blur(20px)
@@ -260,15 +251,9 @@
 @keyframes light_tag
   0%
     transform skewx(0)
-    -o-transform skewx(0)
-    -moz-transform skewx(0)
-    -webkit-transform skewx(0)
     left -150px
   99%
     transform skewx(-25deg)
-    -o-transform skewx(-25deg)
-    -moz-transform skewx(-25deg)
-    -webkit-transform skewx(-25deg)
     left 50px
 
 @keyframes floating

package/source/css/_global/index.styl

@@ -77,9 +77,9 @@ html
   line-height 1.15
   -webkit-text-size-adjust 100%
   text-size-adjust 100%
-  height: 100%;
-  font-size: 20px
-  overflow-y: overlay
+  height: 100%
+  font-size 20px
+  overflow-y overlay
 
 main
   display block
@@ -146,7 +146,7 @@ hr
   box-sizing content-box
   height 0
   overflow visible
-  display: none
+  display none
 
 a
   color var(--efu-fontcolor)
@@ -363,29 +363,29 @@ i.solitude
   font-synthesis style
 
 #body-wrap
-  display: flex
-  flex-direction: column
-  min-height: 100vh
-  justify-content: space-between
+  display flex
+  flex-direction column
+  min-height 100vh
+  justify-content space-between
 
 .layout
-  display: flex
-  margin: 0 auto
-  padding: 0 1.5rem
+  display flex
+  margin 0 auto
+  padding 0 1.5rem
   width 100%
-  max-width: 1200px
+  max-width 1200px
   +maxWidth768()
     padding 0
 
   &#content-inner
-    max-width: 1400px
-    flex-grow: 1
+    max-width 1400px
+    flex-grow 1
 
   /.hide-aside.layout
-    max-width: 1400px
+    max-width 1400px
 
     > div
-      width: 100% !important
+      width 100% !important
 
   > div:first-child
     width calc(100% - 300px)
@@ -419,10 +419,10 @@ i.solitude
 span.tags-punctuation
   i
     font-weight bold
-    font-size: 12px
+    font-size 12px
     transition none
-    margin-right: 2px
-    opacity: .4
+    margin-right 2px
+    opacity .4
 
     .hide-aside #page &
       font-size 16px

package/source/css/_highlight/prismjs/index.styl

@@ -3,7 +3,7 @@
 if hexo-config('highlight.enable')
   @require diff
 
-#article-container
+.article-container
   pre[class*='language-']
     margin 0
     overflow-x auto

package/source/css/_highlight/prismjs/line-number.styl

@@ -1,4 +1,4 @@
-#article-container
+.article-container
   pre[class*='language-']
     &.line-numbers
       position relative

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

@@ -1,4 +1,4 @@
-.post-content
+.article-container
   overflow-wrap break-word
   +maxWidth768()
     overflow hidden
@@ -7,7 +7,7 @@
   .post &
     padding 1rem 2rem
     +maxWidth768()
-      padding .5rem
+      padding .5rem .5rem 1rem .5rem
 
   iframe
     border-radius 12px
@@ -66,7 +66,7 @@
     font-size .9rem
     line-height 1.7
     font-weight 400
-    margin 1rem 0
+    margin .5rem 0
     text-align left
     letter-spacing .6px
 

package/source/css/_layout/console.styl

@@ -118,6 +118,7 @@
     line-height 1
     display flex
     align-items center
+    justify-content space-between
 
   .aside-list
     display flex

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

@@ -30,7 +30,7 @@ if "motto" in $about
   @import "buff"
   @import "maxim"
 
-if "game1" in $about
+if "game" in $about
   @import "game"
 
 if "personalities" in $about

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

@@ -1,11 +1,10 @@
 #about-page
-  .author-content-item.game-apex
+  .author-content-item.game
     min-height 300px
     overflow hidden
     color var(--efu-white)
 
     &::after
-      box-shadow 0 -69px 203px 11px #04120f inset
       position absolute
       content ''
       width 100%
@@ -22,18 +21,4 @@
       z-index 2
       display flex
       flex-direction column
-      padding 1rem 2rem
-
-  .author-content-item.game-jl
-    min-height 300px
-    overflow hidden
-    color var(--efu-white)
-
-    &::after
-      box-shadow 0 -69px 203px 11px #415dc9 inset
-      position absolute
-      content ''
-      width 100%
-      height 100%
-      top 0
-      left 0
+      padding 1rem 2rem

package/source/css/_page/error.styl

@@ -42,10 +42,9 @@
         flex 1 1 0
         height 100%
         width 600px
-        border-top-left-radius 8px
-        border-bottom-left-radius 8px
+        border-radius 8px 0 0 8px
         background-color var(--efu-main)
-        background-position center center
+        background-position center
         background-size cover
 
         +maxWidth768()

package/source/css/_page/links.styl

@@ -19,10 +19,10 @@
   opacity 1
   backdrop-filter saturate(180%) blur(20px)
 
-.flink#article-container
+.flink.article-container
   margin-top 1rem
 
-#article-container
+.article-container
 
   .flink-desc
     margin 0

package/source/css/_page/music.styl

@@ -101,6 +101,7 @@ body[data-type=music]
       &.aplayer-list-light
         background var(--efu-black-op)
         border-radius 6px
+        margin 0 .5rem
         height 60px
         display flex
         flex-direction column

package/source/css/_page/other.styl

@@ -214,6 +214,7 @@ div#banners
   .card-content
     position absolute
     width 100%
+    z-index 2
     height 100%
     top 0
     left 0

package/source/css/_page/says.styl

@@ -29,6 +29,7 @@ if hexo-config('says.home_mini')
       background var(--efu-background)
       border none
       padding 0 .2rem
+
   i.bber-logo,
   i.bber-gotobb
     transition .3s
@@ -80,9 +81,9 @@ if hexo-config('says.enable')
             opacity .6
 
         .goComment
-          position: absolute
-          top: 0
-          right: 0
+          position absolute
+          top 0
+          right 0
 
     div
       &.bber-content

package/source/css/_tags/gallery.styl

@@ -1,4 +1,4 @@
-#article-container
+.article-container
   figure.gallery-group
     position: relative
     overflow: hidden

package/source/css/_tags/tabs.styl

@@ -1,5 +1,5 @@
 
-#article-container .tabs
+.article-container .tabs
   position relative
   border 1px solid var(--tab-border-color)
 
@@ -91,7 +91,7 @@
 .tab-item-content
   background var(--efu-card-bg)
 
-#article-container .tabs
+.article-container .tabs
 
   > .tab-contents .tab-item-content.active
     animation tabshow 0s

package/source/js/covercolor/local.js

@@ -23,7 +23,7 @@ const localColor = path => {
     const colorThief = new ColorThief();
     const img = new Image();
     img.crossOrigin = "Anonymous";
-    img.onload = () => setThemeColors(rgbToHex(colorThief.getColor(img)));
+    img.onload = () => setThemeColors(rgbToHex(colorThief.getColor(img)), ...colorThief.getColor(img));
     img.onerror = () => console.error('Image Error');
     img.src = path;
 }
@@ -61,6 +61,14 @@ const setThemeColors = (value, r = null, g = null, b = null) => {
     initThemeColor();
 }
 
+function LightenDarkenColor(col, amt) {
+    var usePound = false;
+    if (col[0] === "#") {
+        col = col.slice(1);
+        usePound = true;
+    }
+}
+
 const adjustCardStyles = () => {
     const cardContents = document.getElementsByClassName('card-content');
     Array.from(cardContents).forEach(item => {