hexo-theme-solitude 1.10.4 → 1.10.6

package/README.md

@@ -62,7 +62,7 @@
 - [x] 弹幕留言页
 - [ ] 首页顶部新样式 
 
-> 如有問題請提 [issue](https://github.com/valor-x/hexo-theme-solitude/issues)
+> 如有问题请提 [issue](https://github.com/valor-x/hexo-theme-solitude/issues)
 
 ## 应用
 

package/_config.yml

@@ -184,21 +184,24 @@ aside:
       # 表情图片链接
       # Emoticon image link
       # tip: 26x26 size
-      sticker: https://7.isyangs.cn/34/65f2e4e0423cc-34.png
-    # 点击作者名称跳转链接
-    # Click the author name to jump link
+      sticker: https://7.isyangs.cn/34/65f2e4e0423cc-34.png # 不填不显示
+    # 点击作者头像跳转链接
+    # Click the author's avatar to jump link
     url: /about/
+    # 背景图片
+    # Background image
+    background: # https://s3.qjqq.cn/47/663af296b85f4.webp!color # 不设置不会展示（仅样式为1、2时有效）
     # 文案1
     # label1
-    content: 分享自己对编程的<b>热爱</b>，对美好生活的<b>向往</b>，对知识海洋<b>探索历程</b>。
+    content: 分享自己对编程的<b>热爱</b>，对美好生活的<b>向往</b>，对知识海洋<b>探索历程</b>。 # 样式为1时无效
     # 文案2
     # label2
-    content2: 相信你可以在这里找到对你有用的知识和教程。
+    content2: 相信你可以在这里找到对你有用的知识和教程。 # 样式为1时无效
     # 个人信息卡片底部的小图标，按照例子填写
     # Small icons at the bottom of the personal information card, fill in according to the example
     # 个人信息卡片顶部按钮的打招呼语句
     # Greeting statement of the button at the top of the personal information card
-    sayhello:
+    sayhello: # 样式为2时无效
       morning: 一日之计在于晨
       noon: 吃饱了才有力气干活
       afternoon: 集中精力，攻克难关
@@ -206,7 +209,7 @@ aside:
       goodnight: 睡个好觉，保证精力充沛
     # 个人信息卡片顶部按钮的切换文字
     # Switching text of the button at the top of the personal information card
-    sayhello2:
+    sayhello2: # 样式为2时无效
     #  - 🤖️ 数码科技爱好者
     #  - 🔍 分享与热心帮助
     #  - 🏠 智能家居小能手
@@ -217,7 +220,7 @@ aside:
     #  - 💢 壮汉人狠话不多
     #  - 🎮 电竞游戏爱好者
     # 个人信息卡片底部的小图标，按照例子填写
-    information:
+    information: # 样式为1时请不要超过4个
     #  Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
     #  Bilibili: https://space.bilibili.com/1329819902 || st-bilibili-line
 

package/layout/includes/inject/body.pug

@@ -80,6 +80,9 @@ div
             != item
 
     .js-pjax
+        if is_home() && theme.says.enable && theme.says.home_mini
+            script.
+               sco.initbbtalk()
         if page.type === 'says' && theme.says.enable
             script.
                 GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
@@ -92,10 +95,6 @@ div
         if is_home() && theme.carousel && site.posts.data.filter(item => item.recommend === true).slice(0, 6) || false
             script.
                 carousel_swiper()
-        if page.type === 'says' && theme.says.enable
-            script.
-                GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
-                sco.changeTimeFormat(document.querySelectorAll('.bber-info-time time'))
         if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv)
             if theme.busuanzi_use === 0
                 script(defer pjax src=url_for(theme.cdn.busuanzi_js))

package/layout/includes/inject/head.pug

@@ -27,7 +27,7 @@ include ../head/pwa.pug
 
 script.
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.10.4",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.10.6",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "padding: 5px 10px;color:white;background:#0084ff;border-radius:0 5px 5px 0",

package/layout/includes/widgets/aside/asideInfoCard.pug

@@ -53,4 +53,34 @@
                         each value, label in theme.aside.card.information || {}
                             - var array = value.split('||')
                             a.social-icon(href=url_for(trim(array[0])), title=label)
-                                i.solitude(class=array[1])
+                                i.solitude(class=array[1])
+            when 2
+                .card-info-bg-top
+                    .author-info-social
+                        .social-icons
+                            each value, label in theme.aside.card.information || {}
+                                - var array = value.split('||')
+                                a.social-icon(href=url_for(trim(array[0])), title=label)
+                                    i.solitude(class=array[1])
+                        span.more-info(onclick="document.querySelector('.social-icons').classList.toggle('show')")
+                            i.solitude.st-more-2-fill
+                a.card-info-avatar(href=url_for(theme.aside.card.url) title=_p('aside.avatar'))
+                    .avatar-img
+                        img(src=theme.aside.card.author.img alt=_p('aside.avatar'))
+                    if theme.aside.card.author.sticker
+                        .avatar-sticker
+                            img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
+                .author-info__name= config.author
+                .card-info__data.is-center
+                    a(href=url_for('/archives/') title=_p('aside.card.posts') + site.posts.length)
+                        .length-num= site.posts.length
+                        .headline= _p('page.archives')
+                    a(href=url_for('/tags/') title=_p('aside.card.tags') + site.tags.length)
+                        .length-num= site.tags.length
+                        .headline= _p('page.tag')
+                    a(href=url_for('/categories/') title=_p('aside.card.categories') + site.categories.length)
+                        .length-num= site.categories.length
+                        .headline= _p('page.category')
+                .card-info__desc_group
+                    .author-info__description!= theme.aside.card.content
+                    .author-info__description2!= theme.aside.card.content2

package/layout/includes/widgets/home/hometop.pug

@@ -3,6 +3,5 @@
         #bannerGroup
             #banners
                 include ./banner.pug
-            include ./categoryGroup.pug
         .topGroup
             include ./topGroup.pug

package/layout/includes/widgets/home/topGroup.pug

@@ -1,12 +1,13 @@
 - var filteredPosts = site.posts.data.filter(item => item.recommend === true).slice(0,6)
-each post in filteredPosts
-    .recent-post-item
-        .post_cover
-            a(href=url_for(post.path), title=post.title)
-                span.recent-post-top-text= _p('home.recommend')
-                img.post_bg(alt=post.title, src=post.cover)
-        .recent-post-info
-            a.article-title(href=url_for(post.path), title=post.title)= post.title
+.recent-post-group
+    each post in filteredPosts
+        .recent-post-item
+            .post_cover
+                a(href=url_for(post.path), title=post.title)
+                    span.recent-post-top-text= _p('home.recommend')
+                    img.post_bg(alt=post.title, src=post.cover)
+            .recent-post-info
+                a.article-title(href=url_for(post.path), title=post.title)= post.title
 
 mixin todayCardContent
     .todayCard-info

package/layout/includes/widgets/third-party/news-comment/artalk.pug

@@ -61,7 +61,7 @@ script.
                     nick: e.nick,
                     url: e.page_key,
                     date: e.date,
-                }))
+                })).slice(0, 6)
                 utils.saveToLocal.set('artalk-newest-comments', artalk, !{theme.comment.newest_comment.storage})
                 generateHtml(artalk, asideList)
             }).catch(error => {

package/layout/includes/widgets/third-party/news-comment/twikoo.pug

@@ -46,7 +46,7 @@ script.
                         nick: e.nick,
                         url: `${e.url}#${e.id}`,
                         date: new Date(e.created).toString()
-                    }))
+                    })).slice(0, 6)
                     utils.saveToLocal.set('twikoo-newest-comment', twikooArray, !{theme.comment.newest_comment.storage})
                     generateHtml(twikooArray)
                 }).catch((err) => {

package/layout/includes/widgets/third-party/news-comment/waline.pug

@@ -39,7 +39,7 @@ script.
                         'url': e.url + '#' + e.objectId,
                         'date': e.time || e.insertedAt
                     }
-                })
+                }).slice(0, 6)
                 utils.saveToLocal.set('waline-newest-comment', walineArray, !{theme.comment.newest_comment.storage})
                 generateHtml(walineArray)
             }).catch(error => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {

package/scripts/event/merge_config.js

@@ -53,6 +53,7 @@ hexo.extend.filter.register('before_generate', () => {
                     sticker: '/img/happy-sticker.png',
                 },
                 url: '/about/',
+                background: null,
                 content1: 'Solitude',
                 content2: 'A simple theme for Hexo',
                 sayhello: {

package/source/css/_global/index.styl

@@ -86,22 +86,37 @@ main
 
 // scrollbar - chrome/safari
 *::-webkit-scrollbar
-  width 5px
-  height 5px
+  width 12px
+  height 6px
 
 *::-webkit-scrollbar-thumb
   background var(--scrollbar-color)
+  opacity .5
+  border-radius 8px
+  cursor pointer
+  border 2px solid var(--efu-background)
+
+  &:hover
+    background var(--efu-lighttext)
+    display block
 
 *::-webkit-scrollbar-track
   background-color transparent
 
-#site-title,
-#site-subtitle,
-.site-name,
-#aside-content .author-info__name,
-#aside-content .author-info__description
-  font-family "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", sans-serif
+::-webkit-scrollbar-thumb
+  background var(--efu-card-border)
+  opacity .5
+  border-radius 8px
+  cursor pointer
+  border 2px solid var(--efu-background)
 
+::-webkit-scrollbar-thumb:hover
+  background var(--efu-main)
+  opacity 1
+  display block !important
+
+::-webkit-scrollbar-track
+  background-color var(--efu-none)
 
 if hexo-config('lazyload.enable') && !hexo-config('lazyload.placeholder')
   img
@@ -124,7 +139,7 @@ h1, h2, h3, h4, h5, h6
   padding-left 0
   font-weight 700
   position relative
-  margin 1rem 0 0.7rem
+  margin .5rem 0
   color var(--efu-fontcolor)
 
 hr
@@ -327,25 +342,6 @@ li, ul
   margin 0
   padding 0
 
-::-webkit-scrollbar
-  width 10px
-  height 6px
-
-::-webkit-scrollbar-thumb
-  background var(--efu-card-border)
-  opacity .5
-  border-radius 8px
-  cursor pointer
-  border 2px solid var(--efu-background)
-
-::-webkit-scrollbar-thumb:hover
-  background var(--efu-main)
-  opacity 1
-  display block !important
-
-::-webkit-scrollbar-track
-  background-color var(--efu-none)
-
 [data-theme=dark] img
   filter brightness(1)
 
@@ -391,7 +387,7 @@ i.solitude
     +maxWidth1200()
       width 100%
 
-  > #post,#category,#tag,#archive
+  > #post, #category, #tag, #archive
     box-shadow var(--efu-shadow-border)
     padding 1rem 2rem
     border-radius 12px
@@ -409,6 +405,10 @@ i.solitude
       padding 0 1rem
       background var(--efu-background)
 
+.show
+  opacity 1 !important
+  pointer-events all !important
+
 span.tags-punctuation::before
   content: "\e071"
   font-family: solitude, serif !important

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

@@ -191,7 +191,7 @@
       font-size 1.3rem
       line-height 1.3
       border-top 1px dashed var(--efu-theme-op)
-      padding-top 1.5rem
+      padding-top 1rem
 
     h3
       font-size 1.1rem

package/source/css/_layout/aside.styl

@@ -1,5 +1,9 @@
 #aside-content
   width 300px
+  if hexo-config('aside.position') == 0
+    order 1
+  else
+    order 2
 
   +minWidth900()
     if hexo-config('aside.position') == 0
@@ -50,11 +54,10 @@
     &:hover
       box-shadow var(--efu-shadow-border)
 
-    > .card-widget
-      &:first-child
-        transition 0.3s
-        border none
-        margin-top 0
+  > .card-widget
+    &:first-child
+      transition 0.3s
+      margin-top 0
 
   .sticky_layout
     top calc(60px + .5rem)
@@ -66,6 +69,7 @@
     width fit-content
     color var(--efu-white)
     background var(--efu-white-op)
+    backdrop-filter blur(10px)
     font-size 12px
     padding 2px 8px
     border-radius 12px
@@ -90,7 +94,7 @@
       &:active
         transform scale(.97)
         opacity .8
-        
+
   .card-info-social-icons
     margin 0
     display flex
@@ -256,12 +260,6 @@
 
 if hexo-config('aside.card.style') == 0
   #aside-content
-    > .card-widget:first-child
-      transition: .3s
-      border: none
-      box-shadow: none
-      background: var(--efu-main)
-      margin-top: 0
 
     .card-widget
       if hexo-config('aside.card.author.sticker')
@@ -475,6 +473,11 @@ if hexo-config('aside.card.style') == 1
         min-height 140px
         background: linear-gradient(-25deg, var(--efu-main), var(--efu-main-op-deep), var(--efu-main), var(--efu-main-op-deep))
         background-size: 400%
+        if hexo-config('aside.card.background')
+          background-image url(hexo-config('aside.card.background'))
+          background-size cover
+          background-position center
+          background-repeat no-repeat
 
       .card-info-avatar
         width 114px
@@ -485,6 +488,7 @@ if hexo-config('aside.card.style') == 1
         position absolute
         transition cubic-bezier(.69, .39, 0, 1.21) .3s
         transform-origin bottom
+        z-index 1
         border 7px solid var(--efu-card-bg)
 
         .avatar-img
@@ -546,7 +550,7 @@ if hexo-config('aside.card.style') == 1
           margin-top 60px
           text-align center
           font-weight 700
-          color var(--efu-font-color)
+          color var(--efu-fontcolor)
           font-size 20px
           line-height 1
           margin-bottom 5px
@@ -596,6 +600,147 @@ if hexo-config('aside.card.style') == 1
               font-size: 1em
               line-height: 1.5
 
+if hexo-config('aside.card.style') == 2
+  #aside-content .card-widget.card-info
+    padding 0
+
+  .card-info-bg-top
+    width 100%
+    height 95px
+    position relative
+    background: linear-gradient(-25deg, var(--efu-main), var(--efu-main-op-deep), var(--efu-main), var(--efu-main-op-deep))
+    if hexo-config('aside.card.background')
+      background-image url(hexo-config('aside.card.background'))
+      background-size cover
+      background-position center
+      background-repeat no-repeat
+  .author-info__name
+    font-size 24px
+    line-height 35px
+    color var(--efu-white)
+    font-weight 700
+    position absolute
+    top 55px
+    if hexo-config('aside.position') == 0
+      left 6rem
+    else
+      left 1rem
+  .card-info__data
+    position absolute
+    top 98px
+    gap .5rem
+    z-index 1
+    if hexo-config('aside.position') == 0
+        right 1rem
+      else
+        left 1rem
+
+    .headline
+      color var(--efu-gray)
+
+    .length-num
+      font-weight 700
+
+    a
+      font-size 14px
+      display flex
+      line-height 18px
+      gap .1rem
+  .card-info__desc_group
+    padding 44px 1rem 1rem
+    min-height 50px
+    opacity .8
+    line-height 18px
+  .author-info-social
+    position absolute
+    display inline-flex
+    gap: 5px
+    top .5rem
+    if hexo-config('aside.position') == 0
+      right 1rem
+    else
+      left 1rem
+
+    i
+      font-size 18px
+      width 30px
+      height 30px
+      border-radius 50%
+      background rgba(255, 255, 255, .2)
+      backdrop-filter blur(10px)
+      color var(--efu-white)
+      display flex
+      justify-content center
+      align-items center
+
+  .social-icons
+    order 1
+    opacity 0
+    transition .3s
+    display flex
+    pointer-events none
+    gap 5px
+  .more-info
+    if hexo-config('aside.position') == 0
+      order 1
+    else
+      order 0
+    cursor pointer
+    display flex
+    justify-content center
+    align-items center
+  .card-info-avatar
+    width 80px
+    height 80px
+    top 50px
+    border-radius 500px
+    position absolute
+    transition cubic-bezier(.69, .39, 0, 1.21) .3s
+    transform-origin bottom
+    border 3px solid var(--efu-card-bg)
+    z-index 1
+    if hexo-config('aside.position') == 0
+      left 1rem
+    else
+      right 1rem
+
+    .avatar-img
+      overflow hidden
+      border-radius 500px
+      width 74px
+      cursor pointer
+      height 74px
+
+      img
+        object-fit cover
+        width 100%
+        height 100%
+        transition .3s
+
+        &:hover
+          transform: scale(1.3)
+
+    if hexo-config('aside.card.author.sticker')
+      .avatar-sticker
+        position absolute
+        bottom -2px
+        right -2px
+        width 26px
+        height 26px
+        line-height 26px
+        z-index 0
+        display flex
+        align-items center
+        justify-content center
+        transition .3s .2s
+        transform scale(1)
+        background var(--efu-card-bg)
+        border-radius 50%
+
+        img
+          width 21px
+          height 21px
+
 [data-theme=dark] #aside-content
   > .card-widget.card-info
     border var(--style-border-always)

package/source/css/_layout/console.styl

@@ -14,10 +14,6 @@
   pointer-events none
   user-select none
 
-  &.show
-    opacity 1
-    pointer-events all
-
   &.show .close-btn i
     transform rotate(0)
 
@@ -39,11 +35,13 @@
     +maxHeight800()
       display none
 
+
   &.show
     .console-card-group
       transform translateY(0)
       opacity 1
       transition-delay .1s
+      max-height 80%
 
   .console-card-group-left
     margin-right .5rem
@@ -175,10 +173,8 @@
           background var(--efu-orange)
           color var(--efu-white)
   .button-group
+    gap .5rem
     .console-btn-item
-      &:not(:last-child)
-        margin-right .5rem
-
       &:hover
         span
           background var(--efu-main)
@@ -216,11 +212,11 @@
     .card-tag-cloud
       margin-top 1.5rem
       display flex
+      gap .5rem
       flex-wrap wrap
 
       a
         color var(--efu-fontcolor)
-        margin 6px 4px
         padding 2px 8px
         border-radius 8px
         background var(--efu-card-bg)
@@ -281,12 +277,10 @@
       flex-direction row
       flex-wrap wrap
       height 164px
+      gap .5rem
 
       li.card-archive-list-item
-        flex 0 0 24%
-
-        &:not(:nth-child(4n))
-          margin-right .555rem
+        flex 0 1 24.101%
 
       .card-archive-list-link
         border-radius 8px
@@ -296,7 +290,7 @@
         border var(--style-border)
         transition all .3s ease 0s
         background var(--efu-maskbgdeep)
-        padding 12px 16px
+        padding 9.5px 16px
 
         &:hover
           background var(--efu-main)

package/source/css/_layout/header.styl

@@ -134,12 +134,12 @@
       align-items center
       margin-right 1.5rem
       overflow hidden
+      gap .5rem
 
       +maxWidth768()
         margin-right 12px
 
       div
-        margin-left .5rem
         padding 0
 
       .nav-button
@@ -521,33 +521,6 @@
           padding 4px
           transition transform .3s ease 0s
 
-  &.hide-menu
-    #toggle-menu
-      display inline-block
-
-      +minWidth768()
-        display none
-
-      .site-page
-        font-size inherit
-
-        +maxWidth768()
-          width 35px
-          height 35px
-          display flex
-          align-items center
-          justify-content center
-
-    .menus_items
-      position absolute
-      left 0
-      visibility hidden
-      opacity 0
-
-    #search-button
-      span
-        display none
-
   #search-button
     display inline
     padding 0 .4rem

package/source/css/_layout/rightmenu.styl

@@ -23,7 +23,7 @@ if hexo-config('right_menu.enable')
       box-shadow var(--efu-shadow-theme)
 
     .rightMenu-group
-      padding .5rem .3rem
+      padding .35rem .3rem
 
       &.rightMenu-small
         display flex