hexo-theme-solitude 1.11.2 → 1.12.0

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

@@ -1,10 +1,11 @@
-if theme.comment.use && theme.console_plus && theme.comment.newest_comment.enable
+- var limit = theme.aside.newest_comment.limit ? theme.aside.newest_comment.limit : 5
+if theme.comment.use
     case theme.comment.use[0]
         when 'Twikoo'
-            !=partial('includes/widgets/third-party/news-comment/twikoo', {}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/twikoo', {limit}, {cache: true})
         when 'Waline'
-            !=partial('includes/widgets/third-party/news-comment/waline', {}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/waline', {limit}, {cache: true})
         when 'Valine'
-            !=partial('includes/widgets/third-party/news-comment/valine', {}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/valine', {limit}, {cache: true})
         when 'Artalk'
-            !=partial('includes/widgets/third-party/news-comment/artalk', {}, {cache: true})
+            !=partial('includes/widgets/third-party/news-comment/artalk', {limit}, {cache: true})

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

@@ -1,5 +1,5 @@
 script.
-    window.addEventListener('load', () => {
+    (() => {
         const changeContent = (content) => {
             if (!content) return '';
             const replacements = [
@@ -12,14 +12,13 @@ script.
                 {regex: /<[^>]+>/g, replacement: ''}
             ]
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content)
-            return content.length > 150 ? `${content.substring(0, 150)}...` : content
+            return content.length > 150 ? `${content.substring(0, 100)}...` : content
         }
         const generateHtml = (array) => {
             const html = array.map(item => `
                 <div class='aside-list-item'>
-                    <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
+                    <div class='thumbnail'>
                         <img src='${item.avatar}' alt='${item.nick}'>
-                        <div class='name'><span>${item.nick}</span></div>
                     </div>
                     <div class='content'>
                         <div class='comment' onclick='pjax.loadUrl("${item.url}")'>${item.content}</div>
@@ -27,7 +26,7 @@ script.
                     </div>
                 </div>
             `).join('')
-            document.querySelector('#card-newest-comments .aside-list').innerHTML = array.length ? html : "!{_p('newest_comment.zero')}"
+            document.querySelector('.card-recent-comment .aside-list').innerHTML = array.length ? html : "!{_p('newest_comment.zero')}"
             window.lazyLoadInstance?.update()
             window.pjax?.refresh()
             sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
@@ -37,7 +36,7 @@ script.
                 twikoo.getRecentComments({
                     envId: '!{theme.twikoo.envId}',
                     region: '',
-                    pageSize: 6,
+                    pageSize: !{limit},
                     includeReply: true
                 }).then(res => {
                     const twikooArray = res.map(e => ({
@@ -51,7 +50,7 @@ script.
                     generateHtml(twikooArray)
                 }).catch((err) => {
                     console.error(err);
-                    document.querySelector('#card-newest-comments .aside-list').textContent = "!{_p('newest_comment.error')}"
+                    document.querySelector('.card-recent-comment .aside-list').textContent = "!{_p('newest_comment.error')}"
                 })
             }
             if (typeof twikoo === 'object') {
@@ -64,5 +63,6 @@ script.
             const data = utils.saveToLocal.get('twikoo-newest-comment')
             data ? generateHtml(data) : getComment()
         }
-        newestCommentInit()
-    })
+        window.addEventListener('DOMContentLoaded', newestCommentInit, false)
+        window.addEventListener('pjax:complete', newestCommentInit, false);
+    })()

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

@@ -1,5 +1,5 @@
 script.
-    window.addEventListener('load', () => {
+    (() => {
         const emojiReg = /:[a-z0-9_\u4e00-\u9fa5]+:/g
         const changeContent = (content) => {
             if (content === '') return content;
@@ -16,10 +16,10 @@ script.
 
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
 
-            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+            return content.length > 150 ? content.substring(0, 100) + '...' : content;
         }
 
-        const $asideList = document.querySelector('#card-newest-comments .aside-list')
+        const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
             const data = utils.saveToLocal.get('valine-newest-comment')
             if (data) {
@@ -42,7 +42,7 @@ script.
             await fetch('!{theme.valine.serverURLs}/1.1/classes/Comment?limit=8&order=-createdAt', settings).then(res => res.json())
                 .then(async result => {
                     let ls = []
-                    for (const i of result.results.slice(0, 6)) {
+                    for (const i of result.results.slice(0, !{limit})) {
                         if (emojiReg.test(i.comment)) continue
                         ls.push({
                             content: changeContent(i.comment),
@@ -61,7 +61,7 @@ script.
         }
 
         const generateHtml = array => {
-            const $dom = document.querySelector('#card-newest-comments .aside-list')
+            const $dom = document.querySelector('.card-recent-comment .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                         <div class='aside-list-item'>
                           <div onclick='pjax.loadUrl(\"${item.url}\")' class='thumbnail'>
@@ -79,5 +79,6 @@ script.
             sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
         }
 
-        newestCommentInit()
-    })
+        window.addEventListener('DOMContentLoaded', newestCommentInit, false)
+        window.addEventListener('pjax:complete', newestCommentInit, false);
+    })()

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

@@ -1,5 +1,5 @@
 script.
-    window.addEventListener('load', () => {
+    (() => {
         const changeContent = (content) => {
             if (content === '') return content;
 
@@ -15,10 +15,10 @@ script.
 
             content = replacements.reduce((str, {regex, replacement}) => str.replace(regex, replacement), content);
 
-            return content.length > 150 ? content.substring(0, 150) + '...' : content;
+            return content.length > 150 ? content.substring(0, 100) + '...' : content;
         }
 
-        const $asideList = document.querySelector('#card-newest-comments .aside-list')
+        const $asideList = document.querySelector('.card-recent-comment .aside-list')
         const newestCommentInit = () => {
             const data = utils.saveToLocal.get('waline-newest-comment')
             if (data) {
@@ -29,7 +29,7 @@ script.
         }
 
         const getComment = async () => {
-            await fetch('!{theme.waline.envId}/api/comment?type=recent&count=6', {method: 'GET'}).then(async res => {
+            await fetch('!{theme.waline.envId}/api/comment?type=recent&count=!{limit}', {method: 'GET'}).then(async res => {
                 const result = await res.json()
                 const walineArray = result.data.map(e => {
                     return {
@@ -49,7 +49,7 @@ script.
         }
 
         const generateHtml = array => {
-            const $dom = document.querySelector('#card-newest-comments .aside-list')
+            const $dom = document.querySelector('.card-recent-comment .aside-list')
             $dom.innerHTML = array.length ? array.map(item => `
                 <div class='aside-list-item'>
                   <div onclick='pjax.loadUrl("${item.url}")' class='thumbnail'>
@@ -67,5 +67,6 @@ script.
             sco?.changeTimeFormat(document.querySelectorAll('.aside-list-item time'))
         }
 
-        newestCommentInit()
-    })
+        window.addEventListener('DOMContentLoaded', newestCommentInit, false)
+        window.addEventListener('pjax:complete', newestCommentInit, false);
+    })()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.11.2",
+  "version": "1.12.0",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {
@@ -16,14 +16,14 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/valor-x/hexo-theme-solitude.git"
+    "url": "https://github.com/everfu/hexo-theme-solitude"
   },
   "dependencies": {
     "hexo-renderer-stylus": "^3.0.0",
     "hexo-renderer-pug": "^3.0.0"
   },
   "bugs": {
-    "url": "https://github.com/valor-x/hexo-theme-solitude/issues",
+    "url": "https://github.com/everfu/hexo-theme-solitude/issues",
     "email": "o@efu.me"
   },
   "homepage": "https://www.efu.me/",

package/scripts/event/merge_config.js

@@ -29,7 +29,7 @@ hexo.extend.filter.register('before_generate', () => {
                 sup: 'Recommend',
                 title: 'Solitude Docs',
                 url: 'https://solitude.js.org/',
-                img: '/img/default.png',
+                img: '/img/default.avif',
                 color: 'none',
             }
         },
@@ -50,7 +50,7 @@ hexo.extend.filter.register('before_generate', () => {
                 style: 0,
                 author: {
                     img: '/img/logo.png',
-                    sticker: '/img/happy-sticker.png',
+                    sticker: '/img/happy-sticker.avif',
                 },
                 url: '/about/',
                 background: null,
@@ -72,6 +72,11 @@ hexo.extend.filter.register('before_generate', () => {
                 backface: '',
                 backcolor: 'var(--efu-blue)'
             },
+            newest_comment: {
+                enable: false,
+                storage: .5,
+                limit: 5
+            },
             toc: {
                 post: true,
                 page: false,
@@ -108,12 +113,12 @@ hexo.extend.filter.register('before_generate', () => {
             tags: true,
             categories: true,
             default: {
-                cover: ['/img/default.png'],
+                cover: ['/img/default.avif'],
             }
         },
         post: {
             default: {
-                cover: ['/img/default.png'],
+                cover: ['/img/default.avif'],
                 locate: 'China, Changsha',
                 copyright: {
                     enable: true,
@@ -186,7 +191,7 @@ hexo.extend.filter.register('before_generate', () => {
             license: null,
             links: [{
                 name: 'Solitude',
-                url: 'https://github.com/valor-x/hexo-theme-solitude',
+                url: 'https://github.com/everfu/hexo-theme-solitude',
             }]
         },
         errorpage: {
@@ -236,8 +241,8 @@ hexo.extend.filter.register('before_generate', () => {
         lazyload: {
             enable: false,
             field: 'site',
-            placeholder: '/img/loading.gif',
-            errorimg: '/img/error_load.webp'
+            placeholder: '/img/loading.avif',
+            errorimg: '/img/error_load.avif'
         },
         loading: {
             fullpage: false,
@@ -300,10 +305,6 @@ hexo.extend.filter.register('before_generate', () => {
             lazyload: false,
             count: false,
             avatar: 'https://cravatar.cn',
-            newest_comment: {
-                enable: false,
-                storage: .2
-            }
         },
         twikoo: {
             envId: 'your envId',
@@ -347,11 +348,11 @@ hexo.extend.filter.register('before_generate', () => {
             enable: false,
             manifest: '/manifest.json',
             theme_color: "#006a73",
-            mask_icon: '/img/logo.png',
-            apple_touch_icon: '/img/logo.png',
-            bookmark_icon: '/img/logo.png',
-            favicon_32_32: '/img/logo.png',
-            favicon_16_16: '/img/logo.png'
+            mask_icon: '/img/pwa/favicon.ico',
+            apple_touch_icon: '/img/pwa/favicon.ico',
+            bookmark_icon: '/img/pwa/favicon.ico',
+            favicon_32_32: '/img/pwa/favicon_32.ico',
+            favicon_16_16: '/img/pwa/favicon_16.ico'
         },
         google_adsense: {
             enable: false,

package/scripts/event/welcome.js

@@ -9,6 +9,6 @@ hexo.on('ready', () => {
       ######  ####  ##### #####    #      ###   ######   ######
                             ${version}
   ===================================================================
-  GitHub: https://github.com/valor-x/hexo-theme-solitude
+  GitHub: https://github.com/everfu/hexo-theme-solitude
   `)
 })

package/scripts/filter/default.js

@@ -5,7 +5,7 @@ hexo.extend.filter.register('after_post_render', function (data) {
     const {config} = hexo.theme;
     if (data.layout === 'post') {
         let {copyright, locate, cover} = hexo.theme.config.post.default
-        cover = cover !== null ? cover : ['/img/default.png']
+        cover = cover !== null ? cover : ['/img/default.avif']
         data.locate = data.locate || locate
         data.cc = data.cc || copyright
         data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
@@ -15,7 +15,7 @@ hexo.extend.filter.register('after_post_render', function (data) {
     }
     if (data.layout === 'page') {
         let {cover} = hexo.theme.config.page.default
-        cover = cover !== null ? cover : ['/img/default.png']
+        cover = cover !== null ? cover : ['/img/default.avif']
         data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
         data.excerpt = data.title
         data.toc = !!(config.aside.toc.page && data.toc !== false && data.aside);

package/source/css/_highlight/index.styl

@@ -86,7 +86,7 @@ figure
       border-top var(--style-border-always)
       position absolute
       bottom 0
-      z-index 10
+      z-index 1
       width 100%
       text-align center
       font-size 16px

package/source/css/_layout/aside.styl

@@ -49,7 +49,7 @@
     position relative
     overflow hidden
     margin-top .5rem
-    padding 1rem 1.2rem
+    padding .5rem .7rem
 
     &:hover
       box-shadow var(--efu-shadow-border)
@@ -631,9 +631,9 @@ if hexo-config('aside.card.style') == 2
     gap .5rem
     z-index 1
     if hexo-config('aside.position') == 0
-        right 1rem
-      else
-        left 1rem
+      right 1rem
+    else
+      left 1rem
 
     .headline
       color var(--efu-gray)
@@ -777,7 +777,7 @@ if hexo-config('aside.card.style') == 2
     hr
       display flex
       position relative
-      margin 1rem 0
+      margin .5rem 0
       border 1px dashed var(--efu-theme-op)
 
     .item-headline
@@ -1047,4 +1047,51 @@ backcolor = convert(hexo-config('aside.flip.backcolor'))
       background-size 100%
 
   .card-widget.card-adsense
-    padding 0
+    padding 0
+
+if hexo-config('aside.newest_comment.enable')
+  .card-recent-comment
+    .recent-comment-more
+      margin-left auto
+      margin-right .5rem
+      &:hover
+        color var(--efu-lighttext)
+        transition .3s
+    .aside-list-item
+      padding: .5rem
+      width: 100%
+      display: flex
+      flex-direction: row
+      height: 80px
+      transition: .3s
+      position: relative
+      &:not(:last-child)
+        border-bottom 1px dashed rgba(255, 255, 255, .1)
+
+      .thumbnail img
+        width: 60px
+        height: 60px
+        margin-right: 8px
+        border-radius: 12px
+
+      .content
+        max-width: calc(100% - 68px)
+        line-height 1.5
+
+        .comment
+          overflow hidden
+          text-overflow ellipsis
+          display -webkit-box
+          font-size 14px
+          -webkit-line-clamp 2
+          transition .3s
+          -webkit-box-orient vertical
+          cursor pointer
+          &:hover
+            color var(--efu-lighttext)
+            transition .3s
+
+        .datetime
+          font-size 12px
+          color var(--efu-secondtext)
+          margin-top auto

package/source/css/_layout/console.styl

@@ -56,7 +56,6 @@
     margin-right .5rem
     width 40%
     height 100%
-    min-width fit-content
 
     +maxWidth1300()
       display none
@@ -117,50 +116,6 @@
     display flex
     align-items center
 
-  .aside-list-item
-    .thumbnail
-      display flex
-      align-items center
-
-    &:hover
-      .thumbnail
-        color var(--efu-white)
-
-    .content
-      display flex
-      flex-direction column
-      height 100%
-      margin-top .5rem
-
-      .comment
-        -webkit-line-clamp 2
-        display -webkit-box
-        overflow hidden
-        -webkit-box-orient vertical
-        line-height 24px
-        font-size 14px
-
-        &::before
-          content ''
-          width 100%
-          height 100%
-          position absolute
-          top 0
-          left 0
-
-      &:hover
-        .comment
-          color var(--efu-white)
-
-      time
-        font-size 12px
-        color var(--efu-secondtext)
-        margin-top auto
-
-      &:hover
-        time
-          color var(--efu-white)
-
   .aside-list
     display flex
     flex-wrap wrap
@@ -184,8 +139,10 @@
         [data-theme="dark"] &
           background var(--efu-orange)
           color var(--efu-white)
+
   .button-group
     gap .5rem
+
     .console-btn-item
       &:hover
         span
@@ -350,37 +307,4 @@
 
   #consoleHideAside
     +maxWidth768()
-      display none
-
-#card-newest-comments
-  .aside-list-item
-    background: var(--efu-card-bg)
-    border-radius: 12px
-    border: var(--style-border)
-    padding: 12px 16px
-    width: 49%
-    display: flex
-    flex-direction: column
-    height: 150px
-    transition: .3s
-    position: relative
-    cursor pointer
-
-    &:hover
-      background: var(--efu-main)
-      color: var(--efu-white)
-
-    &:not(:last-child)
-      margin-bottom: .5rem
-
-    .thumbnail img
-      width: 20px
-      height: 20px
-      margin-right: 8px
-      border-radius: 20px
-
-    .name
-      text-overflow: ellipsis
-      overflow: hidden
-      white-space: nowrap
-      font-weight: 700
+      display none

package/source/css/_page/message.styl

@@ -59,5 +59,6 @@
             overflow hidden
             text-overflow ellipsis
 
-.hide
+#barrage.hide
+    z-index -1
     opacity 0

package/source/css/_post/meta.styl

@@ -248,35 +248,25 @@
             display: flex
             align-items center
             line-height 1
+            margin 0 .5rem
 
             +maxWidth768()
               line-height 1.5
 
           > span:first-child
-            margin-right .8rem
+            margin-left 0
+            
 
           .post-meta-date
-            margin-right .8rem
             opacity .6
 
           .post-meta-wordcount
             opacity .6
-            margin-right 20px
-
-            +maxWidth768()
-              margin-left 0
-
-            > span.word-count
-              font-weight 800
-
-            > span:nth-child(7)
-              font-weight 800
 
           .post-meta-separator
-            margin 0 10px
+            margin 0 1rem 0 0
 
           .post-meta-position
-            margin-right 12px
             opacity .6
 
           .post-meta-pv

package/source/css/_post/tools.styl

@@ -236,6 +236,11 @@
             box-shadow var(--efu-shadow-main)
             color var(--efu-white)
 
+            span.tagsPageCount
+              color var(--efu-lighttext)
+              background var(--efu-maskbgdeep)
+              transition all .2s ease-in-out 0s
+
           span.tags-punctuation
             font-size 12px
             margin-right 1px
@@ -244,14 +249,14 @@
 
           .tagsPageCount, /  #tag-page-tags .tagsPageCount
             padding 2px
-            background var(--efu-card-bg)
+            background var(--efu-fontcolor)
             border var(--style-border-always)
             min-width 22.5px
             display inline-block
             border-radius 4px
             text-align center
             font-size .6rem
-            color var(--efu-fontcolor)
+            color var(--efu-card-bg)
             margin-left 4px
     if hexo-config('post.share.enable')
       /.social-share *

package/source/css/_search/local-search.styl

@@ -133,6 +133,10 @@
       color var(--efu-fontcolor)
       caret-color var(--efu-theme)
 
+      ::placeholder
+        color var(--efu-gray)
+        opacity .5
+
 #search-mask
   position fixed
   inset 0