hexo-theme-solitude 2.1.6 → 2.1.8

package/scripts/helper/related_post.js

@@ -6,80 +6,80 @@
 'use strict'
 
 hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
-    const relatedPosts = []
-    const config = hexo.theme.config
-    const limitNum = config.related_post.limit || 6
-    const dateType = config.related_post.date_type || 'created'
-    const headlineLang = this._p('star')
+    const config = hexo.theme.config;
+    const limitNum = config.related_post.limit || 6;
+    const dateType = config.related_post.date_type || 'created';
+    const headlineLang = this._p('star');
 
-    currentPost.tags.forEach(function (tag) {
-        allPosts.forEach(function (post) {
+    const relatedPostsMap = new Map();
+
+    currentPost.tags.forEach(tag => {
+        allPosts.forEach(post => {
             if (isTagRelated(tag.name, post.tags) && currentPost.path !== post.path) {
-                const relatedPost = {
-                    title: post.title,
-                    path: post.path,
-                    cover: post.cover,
-                    cover_type: post.cover_type,
-                    weight: 1,
-                    updated: post.updated,
-                    created: post.date
-                }
-                const index = findItem(relatedPosts, 'path', post.path)
-                if (index !== -1) {
-                    relatedPosts[index].weight += 1
+                if (!relatedPostsMap.has(post.path)) {
+                    relatedPostsMap.set(post.path, {
+                        title: post.title,
+                        path: post.path,
+                        cover: post.cover || 'var(--default-bg-color)',
+                        weight: 1,
+                        updated: post.updated,
+                        created: post.date
+                    });
                 } else {
-                    relatedPosts.push(relatedPost)
+                    relatedPostsMap.get(post.path).weight += 1;
                 }
             }
-        })
-    })
+        });
+    });
 
+    const relatedPosts = Array.from(relatedPostsMap.values());
     if (relatedPosts.length === 0) {
-        return ''
+        return '';
     }
 
-    relatedPosts.sort(compare('weight', dateType))
+    relatedPosts.sort(compare('weight', dateType));
 
-    let result = '<div class="relatedPosts">'
-    result += `<div class="headline"><i class="solitude fa-solid fa-star"></i><span>${headlineLang}</span><div class="relatedPosts-link"><a onclick="event.preventDefault(); toRandomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">${this._p('random')}</a></div></div>`
-    result += '<div class="relatedPosts-list">'
+    let result = `
+        <div class="relatedPosts">
+            <div class="headline">
+                <i class="solitude fa-solid fa-star"></i>
+                <span>${headlineLang}</span>
+                <div class="relatedPosts-link">
+                    <a onclick="event.preventDefault(); toRandomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">${this._p('random')}</a>
+                </div>
+            </div>
+            <div class="relatedPosts-list">`;
 
     for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {
-        const cover = relatedPosts[i].cover || 'var(--default-bg-color)'
-        const title = this.escape_html(relatedPosts[i].title)
-        result += `<div><a href="${this.url_for(relatedPosts[i].path)}" title="${title}">`
-        result += `<img class="cover" src="${this.url_for(cover)}" alt="cover">`
-        result += `<div class="content is-center"><div class="title">${title}</div></div>`
-        result += '</a></div>'
+        const { cover, title, path } = relatedPosts[i];
+        result += `
+            <div>
+                <a href="${this.url_for(path)}" title="${this.escape_html(title)}">
+                    <img class="cover" src="${this.url_for(cover)}" alt="cover">
+                    <div class="content is-center">
+                        <div class="title">${this.escape_html(title)}</div>
+                    </div>
+                </a>
+            </div>`;
     }
 
-    result += '</div></div>'
-    return result
-})
-
-function isTagRelated(tagName, TBDtags) {
-    return TBDtags.some(function (tag) {
-        return tagName === tag.name
-    })
-}
+    result += `
+            </div>
+        </div>`;
+    return result;
+});
 
-function findItem(arrayToSearch, attr, val) {
-    return arrayToSearch.findIndex(function (item) {
-        return item[attr] === val
-    })
+function isTagRelated(tagName, tags) {
+    return tags.some(tag => tagName === tag.name);
 }
 
 function compare(attr, dateType) {
-    return function (a, b) {
-        const val1 = a[attr]
-        const val2 = b[attr]
+    return (a, b) => {
+        const val1 = a[attr];
+        const val2 = b[attr];
         if (val1 === val2) {
-            if (dateType === 'created') {
-                return b.created - a.created
-            } else if (dateType === 'updated') {
-                return b.updated - a.updated
-            }
+            return dateType === 'created' ? b.created - a.created : b.updated - a.updated;
         }
-        return val2 - val1
-    }
+        return val2 - val1;
+    };
 }

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

@@ -5,51 +5,42 @@
 
 'use strict'
 
-function postTabs ([name, active], content) {
-  const tabBlock = /<!--\s*tab (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtab\s*-->/g
-
-  const matches = []
-  let match
-  let tabId = 0
-  let tabNav = ''
-  let tabContent = ''
-
-  active = Number(active) || 0
-
-  while ((match = tabBlock.exec(content)) !== null) {
-    matches.push(match[1])
-    matches.push(match[2])
-  }
-
-  for (let i = 0; i < matches.length; i += 2) {
-    const tabParameters = matches[i].split('@')
-    let postContent = matches[i + 1]
-    let tabCaption = tabParameters[0] || ''
-    let tabIcon = tabParameters[1] || ''
-    let tabHref = ''
-
-    postContent = hexo.render.renderSync({ text: postContent, engine: 'markdown' }).trim()
-    tabHref = (name + ' ' + tabId).toLowerCase().split(' ').join('-');
-
-    ((tabCaption.length === 0) && (tabIcon.length === 0)) && (tabCaption = name + ' ' + tabId)
-
-    const isOnlyicon = tabIcon.length > 0 && tabCaption.length === 0 ? ' style="text-align: center;"' : ''
-    const icon = tabIcon.trim()
-    tabIcon.length > 0 && (tabIcon = `<i ${isOnlyicon} class="tab solitude ${icon}"></i>`)
-
-    const toTop = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="solitude fas fa-arrow-up"></i></button>'
-    const isActive = active === tabId ? ' active' : ''
-    tabNav += `<li class="tab${isActive}"><button type="button" data-href="#${tabHref}">${tabIcon + tabCaption.trim()}</button></li>`
-    tabContent += `<div class="tab-item-content${isActive}" id="${tabHref}">${postContent + toTop}</div>`
-    tabId += 1
-  }
-
-  tabNav = `<ul class="nav-tabs">${tabNav}</ul>`
-  tabContent = `<div class="tab-contents">${tabContent}</div>`
-
-  return `<div class="tabs" id="${name.toLowerCase().split(' ').join('-')}">${tabNav + tabContent}</div>`
+function postTabs([name, active], content) {
+  const tabBlock = /<!--\s*tab (.*?)\s*-->\n([\w\W\s\S]*?)<!--\s*endtab\s*-->/g;
+  const matches = [...content.matchAll(tabBlock)];
+  
+  active = Number(active) || 0;
+
+  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>`;
 }
 
-hexo.extend.tag.register('tabs', postTabs, { ends: true })
-hexo.extend.tag.register('subtabs', postTabs, { ends: true })
-hexo.extend.tag.register('subsubtabs', postTabs, { ends: true })
+hexo.extend.tag.register('tabs', postTabs, { ends: true });
+hexo.extend.tag.register('subtabs', postTabs, { ends: true });
+hexo.extend.tag.register('subsubtabs', postTabs, { ends: true });

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
@@ -350,13 +349,13 @@ img.tk-avatar-img
   border var(--style-border-always)
 
 .el-input-group__append, .el-input-group__prepend
-  background-color var(--efu-card-bg) !important
+  background-color var(--efu-card-bg)
   color var(--efu-fontcolor) !important
   border 0 !important
   font-weight 700
 
 .el-input__inner
-  background var(--efu-secondbg) !important
+  background-color var(--efu-secondbg) !important
   border 0 !important
   color var(--efu-fontcolor) !important
   padding-left 8px
@@ -372,7 +371,7 @@ img.tk-avatar-img
   border none
 
 .el-textarea__inner
-  background var(--efu-secondbg) !important
+  background-color var(--efu-secondbg)
   color var(--efu-fontcolor) !important
   border-radius 12px !important
   min-height 100px !important

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/highlight/diff.styl

@@ -27,6 +27,12 @@ figure.highlight
 
   .emphasis
     color $highlight-emphasis-light
+  
+  .addition
+    color $highlight-inserted
+
+  .deletion
+    color $highlight-deleted
 
   [data-theme=dark] &  
     .keyword
@@ -48,4 +54,10 @@ figure.highlight
       color $highlight-title-dark
 
     .emphasis
-      color $highlight-emphasis-dark
+      color $highlight-emphasis-dark
+
+    .addition
+      color $highlight-inserted
+
+    .deletion
+      color $highlight-deleted

package/source/css/_highlight/index.styl

@@ -80,8 +80,8 @@ figure
 
       .caption
         position absolute
-        right 2.7rem
-        font-size 0.85em
+        right 3.5rem
+        font-size 14px
         color var(--efu-secondtext)
 
         +maxWidth768()

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

@@ -39,6 +39,12 @@ pre[class*='language-']
   .inserted
     color $highlight-inserted
 
+  .addition
+    color $highlight-inserted
+
+  .deletion
+    color $highlight-deleted
+
   [data-theme='dark'] &
     .keyword
     .function
@@ -77,4 +83,10 @@ pre[class*='language-']
       color $highlight-deleted
 
     .inserted
-      color $highlight-inserted
+      color $highlight-inserted
+    
+    .addition
+      color $highlight-inserted
+
+    .deletion
+      color $highlight-deleted

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

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

@@ -23,7 +23,7 @@ if hexo-config('index_post_list.direction') == "column"
 
       +maxWidth1300()
         margin-bottom .5rem
-        #tag &
+        #tag &:first-child
           margin-top: 2.5rem
 
       +maxWidth768()
@@ -255,7 +255,7 @@ else if hexo-config('index_post_list.direction') == "row"
       flex-direction row
       width 100%
       box-shadow var(--efu-shadow-border)
-      #tag &
+      #tag &:first-child
           margin-top: 2.5rem
 
       +maxWidth768()