hexo-theme-solitude 1.8.10 → 1.8.11

package/_config.yml

@@ -633,6 +633,7 @@ wordcount: false
 # 访问统计
 # access statistics
 busuanzi: false
+busuanzi_use: 0 # 0: 原版 / 1: 青秸(other: 其它自定義的busuanzi平台)
 
 # 搜索
 # search

package/languages/default.yml

@@ -55,6 +55,9 @@ post:
     reprint: This article is a reproduction or translation, and the copyright belongs to the original author. Please contact the original author for permission to republish this article.
     original: This piece of writing is an original article, utilizing the
     original_end: Agreement. For complete reproduction, please acknowledge the source as Courtesy of
+  ai:
+    title: Article Summary
+    tip: Complaints
 
 nav:
   site_name_title: Back to home

package/languages/en.yml

@@ -55,6 +55,9 @@ post:
     reprint: This article is a reproduction or translation, and the copyright belongs to the original author. Please contact the original author for permission to republish this article.
     original: This piece of writing is an original article, utilizing the
     original_end: Agreement. For complete reproduction, please acknowledge the source as Courtesy of
+  ai:
+    title: Article Summary
+    tip: Complaints
 
 nav:
   site_name_title: Back to home

package/languages/zh-CN.yml

@@ -65,6 +65,9 @@ post:
     reprint: 本文是转载或翻译文章，版权归原作者所有。转载本文请联系原作者。
     original: 本文是原创文章，采用
     original_end: 协议，完整转载请注明来自
+  ai:
+    title: 文章摘要
+    tip: 投诉
 
 award:
   thanks: 致谢

package/languages/zh-TW.yml

@@ -65,6 +65,9 @@ post:
     reprint: 本文是转载或翻译文章，版权归原作者所有。转载本文请联系原作者。
     original: 本文是原创文章，采用
     original_end: 协议，完整转载请注明来自
+  ai:
+    title: 文章摘要
+    tip: 投訴
 
 award:
   thanks: 致謝

package/layout/includes/footer.pug

@@ -5,7 +5,7 @@ div#st-footer-bar
         else if theme.site.name.class === 'img'
             img.solitude.nolazyload(src=url_for(theme.site.name.custom))
         else if theme.site.name.class === 'text'
-            span.solitude= theme.site.name.custom
+            span= theme.site.name.custom
     div.footer-bar-description= __('footer.description').replace(/\$\{title}/, config.title + " - " + config.subtitle)
     a.footer-bar-link(href=url_for('/'))= __('footer.learnmore')
 div#footer_deal

package/layout/includes/head/page_config.pug

@@ -6,5 +6,5 @@ script#config-diff.
         page: '!{page.type}',
         toc: !{!!page.toc},
         comment: !{!!page.comment},
-        ai_text: !{is_post && page.ai_text ? "'"+ page.ai_text+"'" : false},
+        ai_text: !{is_post && page.ai_text ? "'"+ page.ai_text+"'" : false}
     }

package/layout/includes/inject/body.pug

@@ -65,9 +65,6 @@ div
                     }
                 script(src=url_for(theme.cdn.cover_api))
 
-    if theme.music.enable
-        script(src=url_for(theme.cdn.music_js))
-
     if theme.loading.pace
         script(src=url_for(theme.cdn.pace_js))
 
@@ -96,7 +93,10 @@ div
                 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)
-            script(defer pjax src=url_for(theme.cdn.busuanzi_js))
+            if theme.busuanzi_use === 0
+                script(defer pjax src=url_for(theme.cdn.busuanzi_js))
+            else
+                script(defer pjax src=url_for(theme.cdn.busuanzi_qj_js))
 
 
 if theme.footer.randomlink
@@ -106,7 +106,7 @@ if theme.footer.randomlink
 include ../widgets/third-party/news-comment/newest-comment.pug
 
 // pjax
-!= partial("includes/widgets/third-party/pjax", {}, { cache: true })
+!= partial("includes/widgets/third-party/pjax", {}, {cache: true})
 
 // theme
 include ../body/mode

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.8.10",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.11",
         "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;",

package/layout/includes/page/music.pug

@@ -3,4 +3,9 @@ if theme.music.enable
     #Music-page
         meting-js(id=theme.music.id, server=theme.music.server, type=theme.music.type, mutex=theme.music.mutex, volume=theme.music.volume, preload="none", data-lrctype="0", order="random")
     .Music-loading
-        div APlayer加载中...
+        div APlayer加载中...'
+    script(pjax).
+        (async function () {
+            if (typeof initializeMusicPlayer === "undefined") await utils.getScript('!{url_for(theme.cdn.music_js)}').then(() => initializeMusicPlayer())
+            else initializeMusicPlayer()
+        })()

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

@@ -11,15 +11,23 @@
                 .webinfo-item-title
                     i.item-icon.solitude.st-visitor-line
                     .item-name= __('aside.pv')
-                span#busuanzi_site_pv
-                    i.solitude.st-loading-line
+                if theme.busuanzi_use === 0
+                    span#busuanzi_value_site_pv
+                        i.solitude.st-loading-line
+                else
+                    span#busuanzi_site_pv
+                        i.solitude.st-loading-line
         if theme.aside.siteinfo.uv
             .webinfo-item
                 .webinfo-item-title
                     i.item-icon.solitude.st-team-fill
                     .item-name= __('aside.uv')
-                span#busuanzi_site_uv
-                    i.solitude.st-loading-line
+                if theme.busuanzi_use === 0
+                    span#busuanzi_value_site_uv
+                        i.solitude.st-loading-line
+                else
+                    span#busuanzi_site_uv
+                        i.solitude.st-loading-line
     if theme.aside.siteinfo.runtimeenable
         .webinfo-item
             .webinfo-item-title

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

@@ -2,39 +2,46 @@
 
 if recommends
     .recent-post-item#swiperBox
-        span.swiperBox-top-text= _p('home.recommend')
         div.blog-slider.swiper-container-fade.swiper-container-horizontal#swiper_container
             .blog-slider__wrp.swiper-wrapper
                 each item,index in recommends
-                    .blog-slider__item.swiper-slide(style=`background-image: url(${item.cover})`)
+                    .blog-slider__item.swiper-slide(onclick="pjax.loadUrl('"+item.path+"')")
+                        .blog-slider__img
+                            img(src=item.cover, alt=item.title)
                         .blog-slider__content
-                            a.blog-slider__title(onclick=`event.stopPropagation();`, href=item.path)=item.title
-                            span.blog-slider__code
-                                =_p('upload')
-                                time(datetime=item.date)
-                            .blog-slider__text=item.description
-            .swiper-button-next
-            .swiper-button-prev
+                            span.blog-slider__title=item.title
+                            span.blog-slider__desc=item.description
+                            div.article-meta-wrap
+                                span.article-meta.tags
+                                    each tag in item.tags.data
+                                        a.article-meta__tags(href=url_for(tag.path), onclick="event.stopPropagation();")
+                                            span.tags-punctuation=tag.name
+                                span.post-meta-date
+                                    time(datetime=moment(item.date))
             .blog-slider__pagination.swiper-pagination-clickable.swiper-pagination-bullets
 
     script.
         function carousel_swiper() {
             let e = new Swiper(".blog-slider", {
-                navigation: {
-                    nextEl: ".swiper-button-next",
-                    prevEl: ".swiper-button-prev"
-                },
-                passiveListeners: !0,
-                loop: !0,
+                direction: "vertical",
+                passiveListeners: true,
+                loop: true,
                 autoplay: {
-                    disableOnInteraction: !0,
+                    disableOnInteraction: true,
                     delay: 5e3
                 },
-                mousewheel: !0,
                 pagination: {
                     el: ".blog-slider__pagination",
-                    clickable: !0
-                }
+                    clickable: true
+                },
+                effect: 'fade',
+                fadeEffect: {
+                    crossFade: true
+                },
+                passiveListeners: true,
+                spaceBetween: 30,
+                watchSlidesProgress: true,
+                mousewheel: true
             })
                 , t = document.getElementById("swiper_container");
             null !== t && (t.onmouseenter = () => {
@@ -45,5 +52,4 @@ if recommends
                         e.autoplay.start()
                     }
             )
-        }
-
+        }

package/layout/includes/widgets/post/post-ai.pug

@@ -2,11 +2,11 @@
     .ai-title
         .ai-title-left
             i.ai-title-icon.solitude.st-robot-fill
-            .ai-title-text 文章摘要
+            .ai-title-text=_p('post.ai.title')
         .ai-tag#ai-tag= theme.post_ai.modelName
     .ai-explanation(style="display: block;")
     .ai-suggestions
     .ai-bottom
         .ai-tips= theme.post_ai.tips
         if theme.post_ai.report
-            a.ai-report(title="投诉", href=url_for(theme.post_ai.report)) 投诉
+            a.ai-report(title=_p('post.ai.tip'), href=url_for(theme.post_ai.report))=_p('post.ai.tip')

package/layout/includes/widgets/post/postMeta.pug

@@ -57,8 +57,12 @@
                                     i.solitude.st-loading-line
                     else
                         if theme.busuanzi
-                            span#busuanzi_page_pv
-                                i.solitude.st-loading-line
+                            if theme.busuanzi_use === 0
+                                span#busuanzi_value_page_pv
+                                    i.solitude.st-loading-line
+                            else
+                                span#busuanzi_page_pv
+                                    i.solitude.st-loading-line
             if theme.post.meta.comment && page.comment && theme.comment.count && theme.comment.use
                 span.post-meta-commentcount(title=_p('post.comment'), onclick="sco.scrollTo('post-comment')")
                     i.solitude.st-chat-fill

package/layout/includes/widgets/third-party/comments/artalk.pug

@@ -55,7 +55,7 @@ script.
 if commentBarrage
     script.
         async function barrageArtalk(array) {
-            await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() => {
-                initializeCommentBarrage(array)
-            })
+            const init = () => initializeCommentBarrage(array)
+            if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+            else init()
         }

package/layout/includes/widgets/third-party/comments/twikoo.pug

@@ -66,13 +66,15 @@ if commentBarrage
             }).then(async res => {
                 if (!res.ok) throw new Error("HTTP error! status: " + res.status)
                 const data = await res.json();
-                await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() => {
+                const init = () => {
                     initializeCommentBarrage((data.data).map(item => Object.assign({
                         content: item.comment,
                         nick: item.nick,
                         mailMd5: item.mailMd5,
                         id: item.id
                     })))
-                })
+                }
+                if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+                else init()
             }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/layout/includes/widgets/third-party/comments/valine.pug

@@ -56,8 +56,7 @@ if commentBarrage
             }).then(async res => {
                 if (!res.ok) throw new Error(`HTTP error! status: ${res.status}`)
                 const data = await res.json()
-                if (typeof md5 === "undefined") await utils.getScript('!{url_for(theme.cdn.blueimp_md5)}')
-                await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() =>
+                const init = () =>
                     initializeCommentBarrage(data.results
                         .filter(item => item.url === window.location.pathname)
                         .map(item => ({
@@ -65,6 +64,9 @@ if commentBarrage
                             nick: item.nick,
                             mailMd5: md5(item.mail),
                             id: item.objectId
-                        }))))
+                        })))
+                if (typeof md5 === "undefined") await utils.getScript('!{url_for(theme.cdn.blueimp_md5)}')
+                if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+                else init()
             }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/layout/includes/widgets/third-party/comments/waline.pug

@@ -52,7 +52,7 @@ if commentBarrage
                 if (!res.ok) throw new Error(`HTTP error! status: ${res.status}`)
                 const data = await res.json();
                 const regex = /<img [^>]*class="wl-emoji"[^>]*>/;
-                await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(() => {
+                const init = () => {
                     initializeCommentBarrage(data.data.data
                         .map(item => ({
                             nick: item.nick,
@@ -60,6 +60,8 @@ if commentBarrage
                             content: item.comment.replace(regex, ''),
                             id: item.objectId
                         })))
-                })
+                }
+                if (typeof initializeCommentBarrage === "undefined") await utils.getScript('!{url_for(theme.cdn.commentBarrage)}').then(init)
+                else init()
             }).catch(error => console.error("An error occurred while fetching comments: ", error))
         }

package/package.json

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

package/plugins.yml

@@ -78,8 +78,12 @@ swiper_js:
   version: 11.0.5
   other_name: Swiper
 busuanzi_js:
+  name: busuanzi
+  file: bsz.pure.mini.js
+  version: 2.3.0
+busuanzi_qj_js:
   name: pearssauce-busuanzi
-  file: bsz.pure.min.js
+  file: bsz.pure.js
   version: 1.0.0
 snackbar:
   name: node-snackbar

package/source/css/_layout/header.styl

@@ -20,10 +20,6 @@
         &:hover
           color var(--efu-card-bg)
 
-          +maxWidth768()
-            align-items flex-end
-            color var(--efu-fontcolor)
-
     &:not(.nav-fixed)
       #nav
         background var(--efu-none)
@@ -338,8 +334,13 @@
     cursor pointer
 
     &:hover
-      i, span, img
-        +minWidth900()
+      @media (hover: hover)
+        i, span, img
+          color var(--efu-card-bg)
+          transition .3s
+
+      +minWidth900()
+        i, span, img
           opacity 0
 
       &:after

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

@@ -4,47 +4,10 @@ div#swiper_container
   position relative
   transition all .3s
   overflow hidden
-
-#swiperBox.recent-post-item
-  width 100%
-  cursor default
-  margin-top 0
-
-#swiperBox
-
-  .swiperBox-top-text
-    position absolute
-    z-index 2
-    color var(--efu-white)
-    background var(--efu-red)
-    letter-spacing 3px
-    top 0
-    left 15px
-    font-size 15px
-    width 35px
-    display flex
-    justify-content center
-    border-radius 0 0 12px 12px
-
-  .swiper-button-next::after, .swiper-button-prev::after
-    font-size 1rem !important
-
-  .swiper-button-prev, .swiper-button-next
-    transition all .3s
-    border-radius 5px
-    color var(--efu-main) !important
-    background var(--efu-maskbg)
-    opacity .5
-
-    &:hover
-      opacity 1
-      transition all .3s
-      color var(--efu-white) !important
-      background var(--efu-main)
-
-  .swiper-button-next::after, .swiper-button-prev::after
-    font-size 1.5rem
-    color var(--efu-bg)
+  display flex
+  flex-direction row
+  justify-content center
+  align-items center
 
   .blog-slider__pagination .swiper-pagination-bullet
     margin 0 8px
@@ -52,71 +15,92 @@ div#swiper_container
     height 11px
     display inline-block
     border-radius 99px
-    background var(--efu-white)
-    opacity .8
+    background var(--efu-gray)
+    opacity .2
     transition all .3s
 
   .blog-slider__pagination .swiper-pagination-bullet-active
     opacity 1
     background var(--efu-main)
-    width 30px
+    height 30px
 
   .blog-slider__pagination
     position absolute
     z-index 21
     text-align center
+    display flex
+    justify-content space-between
+    flex-direction column
+    height 60%
 
-  #recent-posts > #swiperBox.recent-post-item
-    cursor default
-
-  .blog-slider__item
-    background-size cover
-    background-position center
-    overflow hidden
-
-    &::after
-      content ''
-      position absolute
-      width 100%
-      height 100%
-      background-color rgba(0, 0, 0, .5)
-      z-index -1
-      left 0
-      top 0
-
-  .blog-slider__content > *
-    text-align center
-    line-height 1.5
-    margin 2px 0
-    color var(--efu-white)
+#swiperBox.recent-post-item
+  width 100%
+  margin-top 0
+  +maxWidth798()
+    display none
 
-  a.blog-slider__title
-    font-size 2rem
+#swiperBox
+  .blog-slider__item.swiper-slide
+    padding 1rem
+    display flex
+    justify-content space-between
+    flex-direction row
+    height 100%
 
-    +maxWidth768()
-      font-size 1.3rem
+    &:hover
+      .blog-slider__img
+        img
+          transform scale(1.1)
+          transition all .3s
 
-  .blog-slider__code
-    display block
-    font-weight 500
+      .blog-slider__title
+        color var(--efu-main)
+        transition all .3s
 
-  .blog-slider__text
-    font-size 18px
-    -webkit-line-clamp 2
+  .blog-slider__img
+    border-radius 12px
     overflow hidden
-    display -webkit-box
-    -webkit-box-orient vertical
-    +minWidth1300()
-      padding 0 5rem
-    +maxWidth900()
-      padding 0 3rem
-    +maxWidth768()
-      display none
+    width 35%
+    height 100%
+    transition all .3s
+    cursor pointer
+
+    img
+      width 100%
+      height 100%
+      object-fit cover
 
   .blog-slider__content
-    padding 0 50px 20px
+    margin 0 2rem 0 1rem
+    position relative
+    width 65%
     display flex
-    justify-content center
-    align-items center
+    align-items left
     flex-direction column
-    height 100%
+    height 100%
+
+    .article-meta-wrap
+      padding 0
+      bottom 0
+
+      .tags-punctuation
+        &:hover
+          color var(--efu-main)
+          transition all .3s
+
+    .blog-slider__title
+      font-size 1.5rem
+      font-weight 600
+      color var(--efu-fontcolor)
+      margin 0
+      transition all .3s
+      cursor pointer
+
+    .blog-slider__desc
+      -webkit-line-clamp: 4;
+      display: -webkit-box;
+      overflow: hidden;
+      -webkit-box-orient: vertical;
+      opacity: 0.8;
+      font-size: 14px;
+      line-height: 1.8;

package/source/css/_page/links.styl

@@ -17,7 +17,7 @@
     box-shadow var(--efu-shadow-blue)
     color var(--efu-white)
     z-index 1
-    border-radius 12px 0 12px 0
+    border-radius 0 0 12px 0
     transition .3s
     font-size .6rem
     overflow hidden