hexo-theme-solitude 1.4.6 → 1.5.0

package/scripts/event/init.js

@@ -1,21 +1,22 @@
 hexo.extend.filter.register('before_generate', () => {
-        const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
-        const nodeVer = process.version.replace(/^v/, '');
-        const [majorVer] = nodeVer.split('.');
-        const logger = hexo.log, config = hexo.config
+    const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1');
+    const nodeVer = process.version.replace(/^v/, '');
+    const [majorVer] = nodeVer.split('.');
+    const logger = hexo.log;
+    const config = hexo.config;
 
-        if (hexoVer < 6.3) {
-            logger.error('请把 Hexo 升级到 V6.3.0 或更高的版本！')
-            process.exit(-1)
-        }
+    if (hexoVer < 6.3) {
+        logger.error('请把 Hexo 升级到 V6.3.0 或更高的版本！');
+        process.exit(-1);
+    }
+
+    if (config.prismjs.enable) {
+        logger.error('主题尚未支持 prismjs 请使用 highlightjs ！');
+        process.exit(-1);
+    }
 
-        if (config.prismjs.enable) {
-            logger.error('主题尚未支持 prismjs 请使用 highlightjs ！')
-            process.exit(-1)
-        }
-        if (Number(majorVer) < 14) {
-            logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！');
-            process.exit(-1);
-        }
+    if (Number(majorVer) < 14) {
+        logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！');
+        process.exit(-1);
     }
-)
+});

package/scripts/event/welcome.js

@@ -9,6 +9,6 @@ hexo.on('ready', () => {
       ######  ####  ##### #####    #      ###   ######   ######
                             ${version}
   ===================================================================
-  主题链接：https://github.com/wleelw/Hexo-theme-solitude
+  GitHub: https://github.com/wleelw/hexo-theme-solitude
   `)
 })

package/scripts/generator/gallery.js

@@ -6,20 +6,23 @@ hexo.extend.generator.register('gallery', function (locals) {
     if (!hexo.theme.config.album.enable) return;
     const album = locals.data.gallery.gallery;
     if (!album) return;
+    const { url, cover, comment, title, album_list, descr, rightbtn, rightbtnlink } = album;
     return {
-        path: album.url + '/index.html', layout: ['page'], data: {
-            url: album.url,
-            cover: album.cover,
+        path: `${url}/index.html`,
+        layout: ['page'],
+        data: {
+            url,
+            cover,
             type: 'gallery',
-            comment: album.comment,
-            desc: album.title,
-            title: album.title,
-            album: album.album_list,
-            leftend: album.descr,
-            rightbtn: album.rightbtn,
-            rightbtnlink: album.rightbtnlink
+            comment,
+            desc: title,
+            title,
+            album: album_list,
+            leftend: descr,
+            rightbtn,
+            rightbtnlink
         }
-    }
+    };
 });
 
 hexo.extend.generator.register('album', function (locals) {
@@ -27,21 +30,20 @@ hexo.extend.generator.register('album', function (locals) {
     const album = locals.data.gallery.gallery;
     let back = hexo.config.language === 'zh-CN' ? '返回相册' : hexo.config.language === 'zh-TW' ? '返回相冊' : 'Back to Album';
     if (!album) return;
-    const albumPages = [];
-    album.album_list.forEach(function (item) {
-        albumPages.push({
-            path: album.url + '/' + item.album + '/index.html', layout: ['page'], data: {
-                album: item,
-                type: 'album',
-                cover: item.cover,
-                title: item.class_name,
-                desc: item.class_name,
-                leftend: item.descr,
-                rightbtn: back,
-                rightbtnlink: `/${album.url}/`,
-                comment: item.comment
-            }
-        });
-    });
+    const albumPages = album.album_list.map(item => ({
+        path: `${album.url}/${item.album}/index.html`,
+        layout: ['page'],
+        data: {
+            album: item,
+            type: 'album',
+            cover: item.cover,
+            title: item.class_name,
+            desc: item.class_name,
+            leftend: item.descr,
+            rightbtn: back,
+            rightbtnlink: `/${album.url}/`,
+            comment: item.comment
+        }
+    }));
     return albumPages;
 });

package/scripts/helper/getArchiveLength.js

@@ -6,13 +6,9 @@ hexo.extend.helper.register('getArchiveLength', function (type) {
     }
     const posts = this.site.posts.sort('-date').data
     let archive = {}
-    posts.forEach(post => {
+    for (const post of posts) {
         const postdate = type === 'year' ? moment(post.date).format('YYYY') : moment(post.date).format('YYYY/MM');
-        if(!archive[postdate]){
-            archive[postdate] = 1
-        } else {
-            archive[postdate] ++
-        }
-    });
-    return archive
-});
+        archive[postdate] = (archive[postdate] || 0) + 1;
+    }
+    return archive;
+});

package/scripts/helper/related_post.js

@@ -1,10 +1,15 @@
 'use strict'
 
 hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
-    let relatedPosts = []
+    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('喜欢这篇的人也看了')
+
     currentPost.tags.forEach(function (tag) {
         allPosts.forEach(function (post) {
-            if (isTagRelated(tag.name, post.tags)) {
+            if (isTagRelated(tag.name, post.tags) && currentPost.path !== post.path) {
                 const relatedPost = {
                     title: post.title,
                     path: post.path,
@@ -18,61 +23,45 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
                 if (index !== -1) {
                     relatedPosts[index].weight += 1
                 } else {
-                    if (currentPost.path !== post.path) {
-                        relatedPosts.push(relatedPost)
-                    }
+                    relatedPosts.push(relatedPost)
                 }
             }
         })
     })
+
     if (relatedPosts.length === 0) {
         return ''
     }
-    let result = ''
-    const config = hexo.theme.config
-
-    const limitNum = config.related_post.limit || 6
-    const dateType = config.related_post.date_type || 'created'
-    const headlineLang = this._p('喜欢这篇的人也看了')
-
-    relatedPosts = relatedPosts.sort(compare('weight', dateType))
 
-    if (relatedPosts.length > 0) {
-        result += '<div class="relatedPosts">'
-        result += `<div class="headline"><i class="scoicon sco-star-smile-fill"></i><span>${headlineLang}</span><div class="relatedPosts-link"><a onclick="event.preventDefault(); toRandomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">随便逛逛</a></div></div>`
-        result += '<div class="relatedPosts-list">'
+    relatedPosts.sort(compare('weight', dateType))
 
-        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>'
-        }
+    let result = '<div class="relatedPosts">'
+    result += `<div class="headline"><i class="scoicon sco-star-smile-fill"></i><span>${headlineLang}</span><div class="relatedPosts-link"><a onclick="event.preventDefault(); toRandomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">随便逛逛</a></div></div>`
+    result += '<div class="relatedPosts-list">'
 
-        result += '</div></div>'
-        return result
+    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>'
     }
+
+    result += '</div></div>'
+    return result
 })
 
 function isTagRelated(tagName, TBDtags) {
-    let result = false
-    TBDtags.forEach(function (tag) {
-        if (tagName === tag.name) {
-            result = true
-        }
+    return TBDtags.some(function (tag) {
+        return tagName === tag.name
     })
-    return result
 }
 
 function findItem(arrayToSearch, attr, val) {
-    for (let i = 0; i < arrayToSearch.length; i++) {
-        if (arrayToSearch[i][attr] === val) {
-            return i
-        }
-    }
-    return -1
+    return arrayToSearch.findIndex(function (item) {
+        return item[attr] === val
+    })
 }
 
 function compare(attr, dateType) {

package/scripts/helper/stylus.js

@@ -1,13 +1,13 @@
 hexo.extend.filter.register('stylus:renderer', function (style) {
-    const {config, theme} = this
+    const {config, theme} = this;
     const data = hexo.locals.get('data');
 
     if (theme.config.aside.tags.highlight) {
-        let array = theme.config.aside.tags.list.map(item => encodeURIComponent(item));
+        const array = theme.config.aside.tags.list.map(item => encodeURIComponent(item));
         style.define('highlightTags', array);
     }
 
-    let aside = [
+    const aside = [
         theme.config.aside.home.noSticky,
         theme.config.aside.home.Sticky,
         theme.config.aside.post.noSticky,
@@ -15,14 +15,29 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
         theme.config.aside.page.Sticky,
         theme.config.aside.page.noSticky
     ].join(',').split(',');
-    let uniqueArr = [...new Set(aside)]; // 去重
+    const uniqueArr = [...new Set(aside)];
     if (uniqueArr.length > 0) {
         style.define('aside', uniqueArr);
     }
 
-    if (data && data.about) {
-        style.define('about', Object.keys(data.about));
-    } else {
-        style.define('about', []);
+    style.define('about', data && data.about ? Object.keys(data.about) : []);
+
+    let group = Object.keys(theme.config.hometop.group).map(key => {
+        return {
+            [key]: (theme.config.hometop.group[key]).split('||')[2]
+        }
+    });
+
+    style.define('banner_group', group);
+
+    function getGroupColor(key) {
+        let color = '';
+        group.forEach(item => {
+            if (item[key]) {
+                color = item[key];
+            }
+        });
+        return color;
     }
+    style.define('getGroupColor', getGroupColor);
 });

package/source/css/_global/animation.styl

@@ -0,0 +1,313 @@
+@keyframes barrageIn
+  0%
+    transform translateY(20px)
+    opacity 0
+  100%
+    transform translateY(0)
+    opacity 1
+
+@keyframes barrageOut
+  0%
+    transform translateY(0)
+    opacity 1
+  100%
+    transform translateY(20px)
+    opacity 0
+
+@keyframes scroll-down-effect
+  0%
+    top 0
+    opacity .4
+  50%
+    top -16px
+    opacity 1
+    filter none
+  100%
+    top 0
+    opacity .4
+
+@keyframes header-effect
+  0%
+    opacity 0
+    transform translateY(-50px)
+  100%
+    opacity 1
+    filter none
+    transform translateY(0)
+
+@keyframes headerNoOpacity
+  0%
+    transform translateY(-50px)
+  100%
+    transform translateY(0)
+
+@keyframes bottom-top
+  0%
+    opacity 0
+    margin-top 50px
+  100%
+    opacity 1
+    filter none
+    margin-top 0
+
+@keyframes titlescale
+  0%
+    opacity 0
+    transform scale(.7)
+  100%
+    opacity 1
+    filter none
+    transform scale(1)
+
+@keyframes search_close
+  0%
+    transform translateY(0)
+    opacity 1
+  100%
+    transform translateY(20px)
+    opacity 0
+
+@keyframes to_show
+  0%
+    opacity 0
+  100%
+    opacity 1
+    filter none
+
+@keyframes to_hide
+  0%
+    opacity 1
+    filter none
+  100%
+    opacity 0
+
+@keyframes ribbon_to_show
+  0%
+    opacity 0
+  100%
+    opacity .6
+
+@keyframes avatar_turn_around
+  0%
+    transform rotate(0)
+  100%
+    transform rotate(360deg)
+
+@keyframes sub_menus
+  0%
+    opacity 0
+    transform translateY(10px)
+  100%
+    opacity 1
+    filter none
+    transform translateY(0)
+
+@keyframes donate_effcet
+  0%
+    opacity 0
+    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)
+
+@keyframes sidebarItem
+  0%
+    transform translateX(200px)
+  100%
+    transform translateX(0)
+
+@keyframes sco-spin
+  0%
+    transform rotate(0)
+  100%
+    transform rotate(360deg)
+
+@keyframes code-expand-key
+  0%
+    opacity .6
+  50%
+    opacity .1
+  100%
+    opacity .6
+
+@keyframes slide-in
+  from
+    transform translateY(20px)
+    opacity 0
+  to
+    transform translateY(0)
+    opacity 1
+
+@keyframes slide-in-op
+  from
+    opacity 0
+  to
+    opacity 1
+
+@keyframes more-btn-move
+  0%, 100%
+    transform translateX(0)
+  50%
+    transform translateX(3px)
+
+@keyframes toc-open
+  0%
+    transform scale(.7)
+  100%
+    transform scale(1)
+
+@keyframes toc-close
+  0%
+    transform scale(1)
+  100%
+    transform scale(.7)
+
+@keyframes configure-clockwise
+  0%
+    transform rotate(0)
+  25%
+    transform rotate(90deg)
+  50%
+    transform rotate(180deg)
+  75%
+    transform rotate(270deg)
+  100%
+    transform rotate(360deg)
+
+@keyframes configure-xclockwise
+  0%
+    transform rotate(45deg)
+  25%
+    transform rotate(-45deg)
+  50%
+    transform rotate(-135deg)
+  75%
+    transform rotate(-225deg)
+  100%
+    transform rotate(-315deg)
+
+@keyframes tabshow
+  0%
+    transform translateY(15px)
+  100%
+    transform translateY(0)
+
+@keyframes snackbar-progress
+  from
+    width 0
+  to
+    width 100%
+
+@keyframes move-forever
+  0%
+    transform translate3d(-90px, 0, 0)
+  100%
+    transform translate3d(85px, 0, 0)
+
+@keyframes rowup
+  from
+    transform translateY(0)
+  to
+    transform translateY(-50%)
+
+@keyframes rowleft
+  from
+    transform translateX(0)
+  to
+    transform translateX(-50%)
+
+@keyframes gradient
+  0%
+    background-position 0 50%
+  50%
+    background-position 100% 50%
+  100%
+    background-position 0 50%
+
+@keyframes commonTipsIn
+  0%
+    top -50px
+    opacity 0
+  100%
+    top -60px
+    opacity 1
+
+@keyframes commonTriangleIn
+  0%
+    transform translate(-50%, -36px)
+    opacity 0
+  100%
+    transform translate(-50%, -46px)
+    opacity 1
+
+@keyframes owoIn
+  0%
+    transform translate(0, -95%)
+    opacity 0
+  100%
+    transform translate(0, -105%)
+    opacity 1
+
+@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
+  0%
+    transform translate(0, -4px)
+  50%
+    transform translate(0, 4px)
+  100%
+    transform translate(0, -4px)
+
+@media screen and (min-width: 768px)
+  @keyframes showCover
+    from
+      opacity 0
+      transform rotate(10deg) translateY(-8%) scale(1.8)
+    to
+      opacity 0.5
+      transform rotate(10deg) translateY(-10%) scale(2)
+
+@keyframes blinking-cursor
+  0%
+    transform scale(.6)
+  25%
+    transform scale(1)
+  50%
+    transform scale(.6)
+  75%
+    transform scale(1)
+  100%
+    transform scale(.6)
+
+@keyframes AILoading
+  0%
+    opacity 1
+  25%
+    opacity .3
+  50%
+    opacity 1
+  75%
+    opacity .3
+  100%
+    opacity 1

package/source/css/_layout/basic.styl

@@ -296,4 +296,13 @@ b, strong
 .button--animated
   border-radius 8px
   transition .3s
-  position relative
+  position relative
+
+if hexo-config('fancybox')
+  a.fancybox
+    border-bottom 0
+    padding 0
+    margin auto
+    display contents
+    width fit-content
+    user-select none

package/source/css/_layout/header.styl

@@ -97,7 +97,7 @@
     transition 0.3s
     display flex
     justify-content center
-    -webkit-user-select none
+    user-select none
 
     +maxWidth768()
       background linear-gradient(to top, var(--sco-main-none) 0, var(--sco-main) 100%)
@@ -558,7 +558,7 @@
     font-size .78em
     cursor pointer
 
-  if hexo-config('nav.left.enable')
+  if hexo-config('nav.group')
     .back-home-button
       &:hover
         +minWidth900()
@@ -658,7 +658,7 @@
   transition .3s
   white-space nowrap
 
-if hexo-config('nav.left.enable')
+if hexo-config('nav.group')
   .back-home-button
     display flex
     width 35px
@@ -749,7 +749,7 @@ if hexo-config('nav.left.enable')
         +minWidth900()
           background var(--sco-lighttext)
 
-    if hexo-config('nav.left.enable')
+    if hexo-config('nav.group')
       .back-home-button
         color var(--sco-fontcolor)
 
@@ -767,7 +767,7 @@ if hexo-config('nav.left.enable')
             background-color var(--sco-main)
 
 .post
-  if hexo-config('nav.left.enable')
+  if hexo-config('nav.group')
     .back-home-button
       color var(--sco-white)
 

package/source/css/_layout/index.styl

@@ -30,7 +30,6 @@
     align-self flex-start
     animation slide-in .6s .1s backwards
     position relative
-    overflow hidden
 
     +maxWidth768()
       box-shadow none

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

@@ -16,7 +16,7 @@
       margin-top 20px
       display flex
       flex-wrap nowrap
-      animation rowup 60s linear infinite
+      animation rowleft 60s linear infinite
 
     .skills-style-group
       position relative