hexo-theme-solitude 1.4.3 → 1.4.5

package/layout/includes/widgets/page/says/memos.pug

@@ -7,7 +7,9 @@ case theme.says.style
                 let bilibiliRegex = /{bilibili,(.*?)}/g;
                 let playerRegex = /{player,(.*?)}/g;
                 let imageRegex = /!\[\]\((.*?)\)/g;
-                let contentRegex = /#.*?\s([^{\n]*)/g
+                let contentRegex = /#.*?\s([^{\n]*)/g;
+
+                document.querySelector('#waterfall').innerHTML = '<i class="scoicon sco-loading-line"></i>'
 
                 await fetch("!{url_for(theme.says.mode_link)}")
                     .then(res => res.json())
@@ -49,11 +51,11 @@ case theme.says.style
                                         </div>
                                     </li>`;
                         }).join('');
+                        sco.reflashEssayWaterFall();
+                        GLOBAL_CONFIG.lazyload.enable && utils.lazyloadImg();
+                        GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
+                        changeTimeFormat();
                     }).catch(error => console.log(error));
-                sco.reflashEssayWaterFall();
-                GLOBAL_CONFIG.lazyload.enable && utils.lazyloadImg();
-                GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
-                changeTimeFormat();
             }();
     when 2
         script.
@@ -64,6 +66,8 @@ case theme.says.style
                 let imageRegex = /!\[\]\((.*?)\)/g;
                 let contentRegex = /#.*?\s([^{\n]*)/g
 
+                document.querySelector('#waterfall').innerHTML = '<i class="scoicon sco-loading-line"></i>'
+
                 await fetch("!{url_for(theme.says.mode_link)}")
                     .then(res => res.json())
                     .then(data => {
@@ -84,7 +88,7 @@ case theme.says.style
                             let content = item.content.match(contentRegex).map(item => item.replace(contentRegex, '$1'));
                             return `<li class="item">
                                         <div class="meta">
-                                            <img class="no-lightbox no-lazyload avatar" src="!{theme.aside.card.author.img}">
+                                            <img class="no-lightbox nolazyload avatar" src="!{theme.aside.card.author.img}">
                                             <div class="info">
                                                 <span class="bber_nick">#{config.author}</span>
                                                 <time class="datetime bber_date" datetime="${time}"></time>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the DuoSco team",
   "main": "package.json",
   "scripts": {

package/plugins.yml

@@ -64,7 +64,7 @@ pace_js:
   file: pace.min.js
   version: 1.2.4
 lunr_js:
-  name: lunr
+  name: lunr.js
   file: lunr.min.js
   version: 2.3.9
 swiper_css:

package/scripts/event/cdn.js

@@ -106,7 +106,6 @@ hexo.extend.filter.register('before_generate', () => {
                 unpkg: `https://unpkg.com/${name}${verType}/${file}`,
                 cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
                 custom: (CDN.custom_format || '').replace(/\$\{(.+?)\}/g, (match, $1) => value[$1]),
-                custom_cdn: `${CDN.custom_cdn + cdnjs_file}`,
                 cdncbd: `https://cdn.cbd.int/${name}${verType}/${file}`,
             }
 

package/scripts/filter/lazyload.js

@@ -3,9 +3,8 @@ const urlFor = require('hexo-util').url_for.bind(hexo)
 hexo.extend.filter.register('after_render:html', function (data) {
     const config = hexo.theme.config.lazyload
     if (!config.enable) return
-    const bg = config.placeholder ? urlFor(config.placeholder) : 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
     return data.replace(
-        /(<img(?!.*?class[\t]*=[\t]*['"].*?nolazyload.*?['"]).*? src=)/gi,
-        `$1 "${bg}" data-lazy-src=`
+        /(<img(?!.*?class[\t]*=[\t]*['"].*?nolazyload.*?['"]).*?)( src=)/gi,
+        `$1 data-lazy-src=`
     )
 })

package/scripts/generator/gallery.js

@@ -0,0 +1,47 @@
+/**
+ * Created by wleelw on 2024/2/4.
+ */
+
+hexo.extend.generator.register('gallery', function (locals) {
+    if (!hexo.theme.config.album.enable) return;
+    const album = locals.data.gallery.gallery;
+    if (!album) return;
+    return {
+        path: album.url + '/index.html', layout: ['page'], data: {
+            url: album.url,
+            cover: album.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
+        }
+    }
+});
+
+hexo.extend.generator.register('album', function (locals) {
+    if (!hexo.theme.config.album.enable) return;
+    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
+            }
+        });
+    });
+    return albumPages;
+});

package/source/css/_layout/basic.styl

@@ -59,9 +59,6 @@ a
   overflow-wrap break-word
   -webkit-user-drag none
 
-  &:hover
-    color var(--sco-lighttext)
-
 abbr[title]
   border-bottom none
   text-decoration underline dotted

package/source/css/_page/{about → _about}/reward.styl

@@ -98,10 +98,17 @@
             color var(--sco-card-bg)
             font-size 12px
             line-height 1
+            display flex
+            align-items center
+            justify-content center
             border-radius 4px
             margin-right 4px
             white-space nowrap
 
+            .scoicon
+              font-size 14px
+              margin-right 4px
+
           .reward-list-item-time
             font-size 12px
             color var(--sco-secondtext)

package/source/css/_page/{gallery → _gallery}/index.styl

@@ -19,6 +19,11 @@
     width calc(100% / 3 - 16px)
     cursor pointer
     margin 8px
+    +maxWidth1200()
+      width calc(100% / 2 - 16px)
+
+    +maxWidth768()
+      width 100%
 
     &:hover
       .cover

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

@@ -1,335 +1,158 @@
-// 首页顶部一坨 and 友链banner
-div#banners
-  display none
-  +minWidth1200()
-    display flex
-    width 100%
-    height 76%
-    background var(--sco-card-bg)
-    margin-bottom .5rem
-    border var(--style-border)
+#home_top
+  .recent-top-post-group
     border-radius 12px
     overflow hidden
-    position relative
-    box-shadow var(--sco-shadow-border)
-    flex-direction column
-    transition .3s
-    will-change transform
-    animation slide-in .6s .1s backwards
-
-    :not(.flink)&:hover
-      box-shadow var(--sco-shadow-main)
-
-    .banner-button-group
-      position absolute
-      right 2rem
-      top 2rem
-      display flex
+    overflow-x auto
+    width 100%
+    margin-bottom 0
+    -webkit-user-select none
 
-    .banner-button
-      padding 8px 12px
-      background var(--sco-fontcolor)
-      border-radius 12px
-      color var(--sco-card-bg)
-      display flex
-      align-items center
-      z-index 1
-      transition .3s
-      cursor pointer
-      box-shadow var(--sco-shadow-black)
-
-      &.secondary
-        background var(--sco-secondbg)
-        border var(--style-border-always)
-        color var(--sco-lighttext)
-        margin-right 1rem
-        box-shadow var(--sco-shadow-border)
-
-      &:hover
-        background var(--sco-theme)
-        color var(--sco-white)
-
-      i
-        margin-right 8px
-        font-size 1rem
-
-    .banners-title
-      top 2rem
-      left 1.5rem
-      position absolute
-      display flex
-      flex-direction column
+    +maxWidth768()
+      border-radius 0
 
-      &-big
-        font-size 36px
-        line-height 1
-        font-weight 700
-        margin-bottom 8px
-
-      &-small
-        font-size 12px
-        line-height 1
-        color var(--sco-secondtext)
-        margin-top 8px
-        margin-bottom .5rem
-
-    #banner-hover
-      position absolute
-      width 100%
-      height 100%
-      top 0
-      left 0
-      border-radius 12px
-      background var(--sco-theme)
-      color var(--sco-card-bg)
-      padding-left .5rem
+    .recent-post-top
       display flex
-      flex-direction column
-      justify-content center
-      opacity 0
-      transition cubic-bezier(.71, .15, .16, 1.15) .6s
-
-      i
-        font-size 80px
-        opacity .4
-
-    &:hover
-      #banner-hover
-        opacity 1
-        padding-left 2rem
-        background var(--sco-theme-op-deep)
-        backdrop-filter blur(15px)
-        transform translateZ(0)
-        transition .3s
-        background-size 200%
-        cursor pointer
-
-    .flink
-      .banners-title
-        top 1.5rem
-
-    .bannerText
-      font-size 4rem
-      line-height 4rem
-      font-weight 700
-
-  .tags-group-all
-    display flex
-    transform rotate(-30deg)
-
-    &.nowrapMove
-      transform rotate(0)
-      padding-bottom 2rem
-
-      .tags-group-wrapper
-        margin-top: 7rem
-        animation: rowup 120s linear infinite
-
-      .tags-group-icon
-        border-radius 50%
-
-        img
-          min-width 100%
-          min-height 100%
-          border-radius 50%
-          object-fit cover
-
-    .tags-group-wrapper
-      margin-top: 5rem
-      display: flex
-      flex-wrap: nowrap
-      animation: rowup 60s linear infinite
-
-      /.tags-group-icon-pair
-        margin-left 1rem
-        user-select none
-
-        a img
-          border-radius 50%
-
-        .tags-group-icon
-          width 120px
-          height 120px
-          display flex
-          align-items center
-          justify-content center
-          color #fff
-          font-size 66px
-          font-weight 700
-          box-shadow var(--sco-shadow-blackdeep)
-
-          &:nth-child(even)
-            margin-top 1rem
-            transform translate(-60px)
-
-          img
-            width 60%
-
-#home_top
-  max-width 1400px
-  margin .5rem auto auto
-  padding 0 1.5rem
-
-  +maxWidth768()
-    padding 0
-    margin-top 0
-
-  // banner
-  if hexo-config('hometop.banner.enable')
-    .recent-top-post-group
-      border-radius 12px
-      overflow hidden
-      overflow-x auto
+      flex-direction row
+      flex-wrap nowrap
       width 100%
-      margin-bottom 0
-      -webkit-user-select none
+      overflow-x scroll
 
-      +maxWidth768()
-        border-radius 0
+      &::-webkit-scrollbar
+        display none
 
-      .recent-post-top
+      / #bannerGroup
         display flex
-        flex-direction row
-        flex-wrap nowrap
-        width 100%
-        overflow-x scroll
 
-        &::-webkit-scrollbar
-          display none
-
-        / #bannerGroup
+        +minWidth1200()
+          width calc(50% - .25rem)
+          margin-right .5rem
+          height calc(328px + .5rem)
           display flex
+          flex-direction column
+          justify-content space-between
 
+        .categoryGroup
+          display flex
+          flex-direction column
+          justify-content space-between
+          min-width 200px
           +minWidth1200()
-            width calc(50% - .25rem)
-            margin-right .5rem
-            height calc(328px + .5rem)
-            display flex
-            flex-direction column
-            justify-content space-between
+            flex-direction row
+            height 24%
+            animation slide-in .6s .2s backwards
+          +maxWidth768()
+            min-width 130px
+            margin-bottom .5rem
+            margin-left 1rem
+            max-height 164px
+            overflow hidden
+            position relative
+
+          .categoryItem
+            overflow hidden
+            transform scale(1)
+            transition all .8s cubic-bezier(.65, .15, .37, 1.19)
+            height 48%
+            border-radius 12px
+            +maxWidth768()
+              border-radius 0
+              height 47%
+              box-shadow none
 
-          .categoryGroup
-            display flex
-            flex-direction column
-            justify-content space-between
-            min-width 200px
+            &:nth-child(3)
+              display none
             +minWidth1200()
-              flex-direction row
-              height 24%
-              animation slide-in .6s .2s backwards
-            +maxWidth768()
-              min-width 130px
-              margin-bottom .5rem
-              margin-left 1rem
-              max-height 164px
-              overflow hidden
-              position relative
+              width calc(100% / 3 - .33rem)
+              height 100%
+              margin-right .5rem
 
-            .categoryItem
-              overflow hidden
-              transform scale(1)
-              transition all .8s cubic-bezier(.65, .15, .37, 1.19)
-              height 48%
+              &:last-child
+                margin-right 0
+
+              &:hover
+                width 50%
+
+              &:nth-child(3)
+                display flex
+
+            a.categoryButton
+              height 100%
+              width 100%
+              background var(--sco-card-bg)
               border-radius 12px
+              display inline-block
+              text-align left
+              line-height 4em
+              font-weight 700
+              font-size .9rem
+              color var(--sco-white)
+              transition all .8s cubic-bezier(.39, .575, .565, 1)
+              transform scale(1)
+              overflow hidden
               +maxWidth768()
-                border-radius 0
-                height 47%
-                box-shadow none
+                border-radius 8px
+
+              &:after
+                top 50px
+                width 1rem
+                left 21px
+                height 2px
+                background var(--sco-white)
+                content ""
+                border-radius 1px
+                position absolute
+
+              i
+                font-size 5rem
+                opacity .2
+                position absolute
+                right 0
+                top 20%
+                transition .3s
+                width 100px
+                text-align center
+                filter blur(2px)
+                transform scale(1) rotate(15deg)
 
-              &:nth-child(3)
-                display none
-              +minWidth1200()
-                width calc(100% / 3 - .33rem)
-                height 100%
-                margin-right .5rem
-
-                &:last-child
-                  margin-right 0
-
-                &:hover
-                  width 50%
-
-                &:nth-child(3)
-                  display flex
-
-              a.categoryButton
-                height 100%
-                width 100%
-                background var(--sco-card-bg)
-                border-radius 12px
-                display inline-block
-                text-align left
-                line-height 4em
-                font-weight 700
-                font-size .9rem
-                color var(--sco-white)
-                transition all .8s cubic-bezier(.39, .575, .565, 1)
-                transform scale(1)
-                overflow hidden
                 +maxWidth768()
-                  border-radius 8px
-
-                &:after
-                  top 50px
-                  width 1rem
-                  left 21px
-                  height 2px
-                  background var(--sco-white)
-                  content ""
-                  border-radius 1px
-                  position absolute
+                  display none
 
+              &:hover
                 i
-                  font-size 5rem
-                  opacity .2
-                  position absolute
-                  right 0
-                  top 20%
-                  transition .3s
-                  width 100px
-                  text-align center
-                  filter blur(2px)
-                  transform scale(1) rotate(15deg)
-
-                  +maxWidth768()
-                    display none
-
-                &:hover
-                  i
-                    opacity .8
-                    transition .8s
-                    transition-delay .15s
-                    transform scale(1.03) rotate(0)
-                    font-size 2.5rem
-                    filter blur(0)
-
-                .categoryButtonText
-                  padding-left 21px
-
-                &.bikan
-                  background linear-gradient(to right, #358bff, #15c6ff)
+                  opacity .8
+                  transition .8s
+                  transition-delay .15s
+                  transform scale(1.03) rotate(0)
+                  font-size 2.5rem
+                  filter blur(0)
+
+              .categoryButtonText
+                padding-left 21px
+
+              &.bikan
+                background linear-gradient(to right, #358bff, #15c6ff)
+                background-size 200%
+
+                [data-theme=dark] &
+                  background linear-gradient(to right, #0653b8, #2fcbff)
                   background-size 200%
 
-                  [data-theme=dark] &
-                    background linear-gradient(to right, #0653b8, #2fcbff)
-                    background-size 200%
+              &.remen
+                background linear-gradient(to right, #f65, #ffbf37)
+                background-size 200%
 
-                &.remen
-                  background linear-gradient(to right, #f65, #ffbf37)
+                [data-theme=dark] &
+                  background linear-gradient(to right, #e22a16, #da980c)
                   background-size 200%
 
-                  [data-theme=dark] &
-                    background linear-gradient(to right, #e22a16, #da980c)
-                    background-size 200%
+              &.shiyong
+                background linear-gradient(to right, #18e7ae, #1eebeb)
+                background-size 200%
 
-                &.shiyong
-                  background linear-gradient(to right, #18e7ae, #1eebeb)
+                [data-theme=dark] &
+                  background linear-gradient(to right, #099e74, #0ea4a4)
                   background-size 200%
 
-                  [data-theme=dark] &
-                    background linear-gradient(to right, #099e74, #0ea4a4)
-                    background-size 200%
-
   /.topGroup
     display: flex
 

package/source/css/_page/_home/index.styl

@@ -1,7 +1,12 @@
-/**
- * 首页样式
- */
-// 首页顶部
+#home_top
+  max-width 1400px
+  margin .5rem auto auto
+  padding 0 1.5rem
+
+  +maxWidth768()
+    padding 0
+    margin-top 0
+
 if hexo-config('hometop.banner.enable')
   @import "home-top.styl"
 

package/source/css/_page/_home/recent-post.styl

@@ -82,6 +82,7 @@
       img.post_bg
         width 100%
         height 100%
+        transition all .6s ease 0s
         object-fit cover
 
         +maxWidth1300()