hexo-theme-solitude 3.0.2 → 3.0.4

package/_config.yml

@@ -134,8 +134,10 @@ aside:
   # 信息卡
   my_card:
     author:
-      img: /img/avatar.avif # url
+      img: /img/logo.png # url
       sticker: # url, 24x24 size
+    # 介绍 / Introduction
+    description: 只有迎风，风筝才能飞得更高。
     # 内容 / Content
     content: # 这是我的博客 / This is my Blog
     state:
@@ -249,9 +251,6 @@ page:
 # 文章默认设置
 post:
   default:
-    # The cover of the article is displayed
-    # 文章封面显示
-    top_cover: true
     # Default image when no cover is set
     # 未设置封面时的默认图片
     cover:
@@ -263,11 +262,7 @@ post:
     # 版权
     copyright:
       enable: true
-      author:
-        url: /about/ # Author link
-        # Default use site.icon
-        # 默认使用 site.icon
-        img:
+      author: /img/logo.png # url
       # License
       # 许可证
       license: CC BY-NC-SA 4.0
@@ -574,10 +569,7 @@ footer:
     #   url: https://beian.miit.gov.cn/
 
   # 页脚信息文字
-  # 请不要删除主题信息，这是对作者的尊重
   links:
-    - name: Theme
-      url: https://github.com/everfu/hexo-theme-solitude
     # - name: RSS
     #   url: /atom.xml
     # - name: License
@@ -816,6 +808,9 @@ comment:
   # Whether to display the comment count
   # 显示评论数
   count: false
+  # Sidebar displays the total number of comments
+  # Sidebar 显示总评论数
+  sidebar: false
   # PV
   pv: false
   # Avatar

package/languages/default.yml

@@ -1,3 +1,8 @@
+repo: https://github.com/everfu/hexo-theme-solitude
+hexo: https://hexo.io/
+framework_by: 框架：
+theme_by: 主题：
+
 more: 更多
 star: 喜欢这篇的人也看了
 random: 随便逛逛
@@ -138,6 +143,7 @@ console:
     link: 链接
     code: 代码
     emoji: 表情
+    empty: 暂无评论...
 
 sidebar:
   function: 功能

package/languages/en.yml

@@ -1,3 +1,6 @@
+framework_by: 'Framework: '
+theme_by: 'Theme: '
+
 more: More
 star: Behold, those who found delight in this piece also perused
 random: Random
@@ -138,6 +141,7 @@ console:
     link: Link
     code: Code
     emoji: Emoji
+    empty: No comments...
 
 sidebar:
   function: Function

package/languages/zh-CN.yml

@@ -1,3 +1,6 @@
+framework_by: 框架：
+theme_by: 主题：
+
 more: 更多
 star: 喜欢这篇的人也看了
 random: 随便逛逛
@@ -138,6 +141,7 @@ console:
     link: 链接
     code: 代码
     emoji: 表情
+    empty: 暂无评论...
 
 sidebar:
   function: 功能

package/languages/zh-TW.yml

@@ -1,3 +1,6 @@
+framework_by: 框架：
+theme_by: 主題：
+
 more: 更多
 star: 喜歡這篇的人也看了
 random: 隨便逛逛
@@ -138,6 +141,7 @@ console:
     link: 鏈結
     code: 代碼
     emoji: 表情
+    empty: 暫無評論...
 
 sidebar:
   function: 功能

package/layout/includes/footer.pug

@@ -59,26 +59,30 @@ div#footer-bar
                     a.footer-bar-link(href=url_for("/"))
                         img.author-avatar(src=url_for(theme.site.icon))
                         = config.author
-            if theme.footer.beian
                 .beian-group
-                    - var beian = theme.footer.beian || []
-                    each item in beian
-                        a.footer-bar-link(href=url_for(item.url), title=item.name)
-                            if item.icon 
+                    if theme.footer.beian
+                        - var beian = theme.footer.beian || []
+                        each item in beian
+                            a.footer-bar-link(href=url_for(item.url), title=item.name)
+                                if item.icon 
                                 img.beian-icon(src=url_for(item.icon), alt=item.name)
                             span.beian-name= item.name
-
-        div.footer-bar-right
-            each item in theme.footer.links
-                if item.icon
-                    a.footer-bar-link(href=url_for(item.url), alt=item.name)
-                            each icon in item.icon
-                                i.solitude(class=icon)
-                else if item.img
-                    a.footer-bar-link(href=url_for(item.url), alt=item.name)
-                        img(src=url_for(item.img), alt=item.name)
-                else
-                    a.footer-bar-link(href=url_for(item.url), alt=item.name)!= item.name
-                    
+                    a.footer-bar-link(href=_p('hexo'))
+                        = _p('framework_by') + 'Hexo'
+                    a.footer-bar-link(href=_p('repo'))
+                        = _p('theme_by') + 'Solitude'
+        if theme.footer.links
+            div.footer-bar-right
+                each item in theme.footer.links
+                    if item.icon
+                        a.footer-bar-link(href=url_for(item.url), alt=item.name)
+                                each icon in item.icon
+                                    i.solitude(class=icon)
+                    else if item.img
+                        a.footer-bar-link(href=url_for(item.url), alt=item.name)
+                            img(src=url_for(item.img), alt=item.name)
+                    else
+                        a.footer-bar-link(href=url_for(item.url), alt=item.name)!= item.name
+                        
 if theme.comment.use && theme.comment.commentBarrage
     div.comment-barrage.needEndHide

package/layout/includes/header.pug

@@ -1,6 +1,6 @@
 - const not_cover = !(typeof page.not_cover ==='undefined' ? false : page.not_cover)
-header#page-header(class=is_post() && theme.post.default.top_cover && not_cover ? 'post-bg' : 'not-top-img')
+header#page-header(class=is_post() && not_cover ? 'post-bg' : 'not-top-img')
     include ./nav.pug
     if is_post()
-        if theme.post.default.top_cover && !page.not_cover
+        if !page.not_cover
             include ./widgets/post/postMeta.pug

package/layout/includes/inject/body.pug

@@ -50,7 +50,7 @@ div
       script(src=url_for(theme.cdn.medium_zoom))
     if theme.fancybox
       script(src=url_for(theme.cdn.fancyapps_ui))
-  if (theme.brevity.home_mini && theme.brevity.enable) || theme.carousel
+  if (theme.brevity.home_mini && theme.brevity.enable)
     script(src=url_for(theme.cdn.swiper_js))
 
   if theme.post_ai.enable
@@ -108,9 +108,7 @@ div
     if theme.mermaid
       script.
         mermaid.run();
-    if is_home() && theme.carousel && site.posts.data.filter(item => item.recommend === true).slice(0, 6) || false
-      script.
-        carousel_swiper()
+
     if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv || is_post() && theme.post.meta.pv)
       script(defer pjax src=url_for(theme.cdn.busuanzi_js))
 

package/layout/includes/inject/head.pug

@@ -9,7 +9,7 @@ if theme.capsule.enable || theme.music.enable || theme.brevity.enable && theme.b
     link(rel="stylesheet", href=url_for(theme.cdn.aplayer_css))
 
 // swiper
-if (theme.brevity.home_mini && theme.brevity.enable) || theme.carousel
+if (theme.brevity.home_mini && theme.brevity.enable)
     link(rel="stylesheet", href=url_for(theme.cdn.swiper_css))
 
 // fancybox ui

package/layout/includes/sidebar.pug

@@ -17,7 +17,7 @@ div#sidebar(style="zoom: 1;")
                     a(href=url_for('/tags/'))
                         .headline=_p('page.tag')
                         .length-num=site.tags.find({parent: {$exists: false}}).length
-            if theme.recent_comments.enable
+            if theme.comment.sidebar
                 .data-item.is-center
                     .data-item-link
                         a(href=url_for(theme.recent_comments.page))

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

@@ -1,18 +1,26 @@
-.aside-content#aside-content
-    - var noSticky, Sticky
-    if(is_home())
-        - noSticky = theme.aside.home.noSticky.split(',')
-        - Sticky = theme.aside.home.Sticky.split(',')
-    else if(is_post())
-        - noSticky = theme.aside.post.noSticky.split(',')
-        - Sticky = theme.aside.post.Sticky.split(',')
-    else if(is_page() || is_archive() || is_tag() || is_category())
-        - noSticky = theme.aside.page.noSticky.split(',')
-        - Sticky = theme.aside.page.Sticky.split(',')
-    each item in noSticky
-        include ./asideSwitch.pug
-    .sticky_layout
-        if showToc
-            include ./asideToc.pug
-        each item in Sticky
+- var { aside } = theme
+
+- var noSticky, Sticky
+if(is_home())
+    - noSticky = aside.home.noSticky ? aside.home.noSticky.split(',') : null
+    - Sticky = aside.home.Sticky ? aside.home.Sticky.split(',') : null
+else if(is_post())
+    - noSticky = aside.post.noSticky ? aside.post.noSticky.split(',') :  null
+    - Sticky = aside.post.Sticky ? aside.post.Sticky.split(',') : null
+else if(is_page() || is_archive() || is_tag() || is_category())
+    - noSticky = aside.page.noSticky ? aside.page.noSticky.split(',') : null
+    - Sticky = aside.page.Sticky ? aside.page.Sticky.split(',') : null
+if noSticky || Sticky
+    .aside-content#aside-content
+        each item in noSticky
             include ./asideSwitch.pug
+        .sticky_layout
+            if showToc
+                include ./asideToc.pug
+            each item in Sticky
+                include ./asideSwitch.pug
+else
+    style.
+        .layout > div:first-child {
+            width: 100%;
+        }

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

@@ -13,7 +13,7 @@
         .author-info__bottom-group
             span.author-info__bottom-group-left
                 .author-info__name= config.author
-                .author-info__desc!= config.subtitle
+                .author-info__desc!= theme.aside.my_card.description
             .card-info-social-icons.is-center
                 each value, label in theme.aside.my_card.information || {}
                     - var array = value.split('||')

package/layout/includes/widgets/page/kit/content.pug

@@ -19,6 +19,6 @@
                                         if item.link.includes('https://') || item.link.includes('http://')
                                             a.equipment-item-content-item-link(href=item.link, target="_blank") 详情
                                         else
-                                            a.equipment-item-content-item-link(href=item.link, target="_blank") 查看文章
+                                            a.equipment-item-content-item-link(href=item.link) 查看文章
                                         a.bber-reply(onclick=`sco.toTalk('${item.description}')`)
-                                            i.solitude.fa-solid.fa-comment(style="font-size: 1rem;")
+                                            i.solitude.fa-solid.fa-comment(style="font-size: 1rem;")

package/layout/includes/widgets/page/links/linksDiscn.pug

@@ -2,7 +2,7 @@
     each item in data.link_list
         .flink-list-item
             a.cf-friends-link(href="javascript:void(0);", title=item.name)
-                img.flink-avatar.cf-friends-avatar(alt=item.name, src=item.avatar + (data.suffix || ''))
+                img.flink-avatar.cf-friends-avatar(alt=item.name, src=url_for("/img/default_avatar.avif"))
                 .flink-item-info
                     span.flink-item-name.cf-friends-name= item.name
                     span.flink-item-desc(title=item.descr)= item.descr

package/layout/includes/widgets/page/recentcomment/artalk.pug

@@ -42,7 +42,7 @@ script(pjax).
             })
 
         function setHtml(el, data) {
-            el.innerHTML = data.map(i => `
+            el.innerHTML = data.length !== 0 ? data.map(i => `
                                         <div class="comment-card" title="${i.title}" onclick="pjax.loadUrl('${i.url}')">
                                             <div class="comment-info">
                                                 <img src="${i.avatar}" class="nolazyload" alt="${i.nick}">
@@ -56,7 +56,7 @@ script(pjax).
                                             <i class="solitude fa-solid fa-comment"></i>
                                             ${i.title}</div>
                                         </div>
-                                    `).join('')
+                                    `).join('') : `#{__("console.newest_comment.empty")}`
             if (typeof sco !== 'undefined') sco.changeTimeFormat(document.querySelectorAll('.comment-time'))
             else {
                 document.addEventListener('pjax:complete', () => sco.changeTimeFormat(document.querySelectorAll('.comment-time')))

package/layout/includes/widgets/page/recentcomment/twikoo.pug

@@ -49,7 +49,7 @@ script(pjax).
         });
 
         function setHtml(el, data) {
-            el.innerHTML = data.map(i => `
+            el.innerHTML = data.length !== 0 ? data.map(i => `
                 <div class="comment-card" title="${i.title}" onclick="pjax.loadUrl('${i.url}')">
                     <div class="comment-info">
                         <img src="${i.avatar}" class="nolazyload" alt="${i.nick}">
@@ -63,7 +63,7 @@ script(pjax).
                     <i class="solitude fa-solid fa-comment"></i>
                     ${i.title}</div>
                 </div>
-            `).join('')
+            `).join('') : `#{__("console.newest_comment.empty")}`
             if (typeof sco !== 'undefined') sco.changeTimeFormat(document.querySelectorAll('.comment-time'))
             else {
                 document.addEventListener('pjax:complete', () => sco.changeTimeFormat(document.querySelectorAll('.comment-time')))

package/layout/includes/widgets/page/recentcomment/valine.pug

@@ -47,7 +47,7 @@ script(pjax).
         })
 
         function setHtml(el, data) {
-            el.innerHTML = data.map(i => `
+            el.innerHTML = data.length !== 0 ? data.map(i => `
                         <div class="comment-card" title="${i.title}" onclick="pjax.loadUrl('${i.url}')">
                             <div class="comment-info">
                                 <img src="${i.avatar}" class="nolazyload" alt="${i.nick}">
@@ -61,7 +61,7 @@ script(pjax).
                             <i class="solitude fa-solid fa-comment"></i>
                             ${i.title}</div>
                         </div>
-                    `).join('')
+                    `).join('') : `#{__("console.newest_comment.empty")}`
             if (typeof sco !== 'undefined') sco.changeTimeFormat(document.querySelectorAll('.comment-time'))
             else {
                 document.addEventListener('pjax:complete', () => sco.changeTimeFormat(document.querySelectorAll('.comment-time')))

package/layout/includes/widgets/page/recentcomment/waline.pug

@@ -38,7 +38,7 @@ script(pjax).
             })
 
         function setHtml(el, data) {
-            el.innerHTML = data.map(i => `
+            el.innerHTML = data.length !== 0 ? data.map(i => `
                                 <div class="comment-card" title="${i.title}" onclick="pjax.loadUrl('${i.url}')">
                                     <div class="comment-info">
                                         <img src="${i.avatar}" class="nolazyload" alt="${i.nick}">
@@ -52,7 +52,7 @@ script(pjax).
                                     <i class="solitude fa-solid fa-comment"></i>
                                     ${i.title}</div>
                                 </div>
-                            `).join('')
+                            `).join('') : `#{__("console.newest_comment.empty")}`
             if (typeof sco !== 'undefined') sco.changeTimeFormat(document.querySelectorAll('.comment-time'))
             else {
                 document.addEventListener('pjax:complete', () => sco.changeTimeFormat(document.querySelectorAll('.comment-time')))

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

@@ -1,8 +1,8 @@
 - const {copyright} = theme.post.default
 .post-copyright
     .post-copyright__author_group
-        a.post-copyright__author_img(href=url_for(copyright.author.url))
-            img.post-copyright__author_img_front(src=url_for(page.avatar || copyright.author.img || theme.site.icon))
+        .post-copyright__author_img
+            img.post-copyright__author_img_front(src=url_for(page.avatar || copyright.author || theme.site.icon))
         .post-copyright__author_name= page.author || config.title
         .post-copyright__author_desc= page.desc || config.subtitle
     .post-tools#post-tools

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

@@ -1,4 +1,4 @@
-#post-info(style=`${page.top_color ? 'background: ' + page.top_color : ''}`)
+#post-info
     #post-firstinfo
         .meta-firstline
             - var cc = page.reprint ? _p('post.reprint') : _p('post.original')

package/layout/includes/widgets/sidebar/twikoo.pug

@@ -10,7 +10,7 @@ script(pjax).
       body: JSON.stringify({
         "event": "GET_RECENT_COMMENTS",
         "includeReply": true,
-        "pageSize": -1
+        "pageSize": 999
       }),
       headers: {'Content-Type': 'application/json'}
     }).then(res => res.json()).then(async ({data}) => {

package/layout/index.pug

@@ -14,8 +14,6 @@ block content
             .recent-posts#recent-posts
                 if theme.comment.hot_tip.enable
                     include ./includes/widgets/third-party/hot/index.pug
-                if theme.carousel && is_home_first_page()
-                    include ./includes/widgets/home/carousel.pug
                 for post, index in page.posts.sort("-sticky" || "-date").data
                     include ./includes/widgets/home/postList
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by everfu.",
   "main": "package.json",
   "keywords": [

package/plugins.yml

@@ -13,7 +13,7 @@ pjax:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.6.40
+  version: 1.6.41
 waline_js:
   name: '@waline/client'
   file: dist/waline.js
@@ -40,12 +40,12 @@ katex:
   name: katex
   file: dist/katex.min.css
   other_name: KaTeX
-  version: 0.16.9
+  version: 0.16.21
 katex_copytex:
   name: katex
   file: dist/contrib/copy-tex.min.js
   other_name: KaTeX
-  version: 0.16.9
+  version: 0.16.21
 lazyload:
   name: vanilla-lazyload
   file: dist/lazyload.iife.min.js

package/scripts/event/merge_config.js

@@ -91,7 +91,6 @@ hexo.extend.filter.register('before_generate', () => {
     },
     post: {
       default: {
-        top_cover: true,
         cover: ['/img/default.avif'],
         locate: 'China, Changsha',
         copyright: {

package/scripts/filter/default.js

@@ -9,7 +9,6 @@ hexo.extend.filter.register('after_post_render', function (data) {
         data.locate = data.locate || locate;
         data.cc = data.cc || copyright;
         data.cover = data.cover || (cover?.length && cover[getRandomInt(0, cover.length)]);
-        data.top_color = data.top_color;
         data.not_cover = data.cover ? false : true;
         data.excerpt = layout === 'post' ? data.description || data.excerpt : data.title;
         data.toc = !!(config.aside.toc[layout] && data.toc !== false);

package/source/css/_layout/console.styl

@@ -254,7 +254,7 @@
       gap .5rem
 
       li.card-archive-list-item
-        flex 0 1 calc(25% - .375rem)
+        flex 0 1 calc(35% - .625rem)
 
       .card-archive-list-link
         border-radius 8px

package/source/css/_layout/footer.styl

@@ -79,21 +79,20 @@
         background var(--efu-main)
         transform scale(1.1)
 
-    if hexo-config('footer.information.author')
-      .footer_mini_logo
-        width 50px
-        height 50px
-        margin 0 1rem
-        cursor pointer
-        transition cubic-bezier(0, 0, 0, 1.29) .5s
-        user-select none
-        border-radius 50px
-        overflow hidden
-        +maxWidth768()
-          display none
+    .footer_mini_logo
+      width 50px
+      height 50px
+      margin 0 1rem
+      cursor pointer
+      transition cubic-bezier(0, 0, 0, 1.29) .5s
+      user-select none
+      border-radius 50px
+      overflow hidden
+      +maxWidth768()
+        display none
 
-        &:hover
-          transform scale(1.2)
+      &:hover
+        transform scale(1.2)
 
   #st-footer
     display flex

package/source/css/_layout/sidebar.styl

@@ -50,7 +50,7 @@
     / .site-data
       display flex
       width 100%
-      justify-content flex-start
+      justify-content space-around
       margin 12px 0 0 0
       padding .6rem 16px
 

package/source/css/_post/copyright.styl

@@ -36,9 +36,6 @@
           bottom 0
           left 0
 
-          &:hover
-            transform scale(1.3)
-
       .post-copyright__author_name
         text-align center
         font-size 20px

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

@@ -1,74 +0,0 @@
-- let recommends = site.posts.data.filter(item => item.recommend === true).slice(0,6) || false
-
-if recommends
-    .recent-post-item#swiperBox
-        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(onclick="pjax.loadUrl('"+item.path+"')")
-                        .blog-slider__img
-                            img(src=item.cover, alt=item.title)
-                        .blog-slider__content
-                            span.blog-slider__title=item.title
-                            case theme.index_post_list.content
-                                when false
-                                    break
-                                when 1
-                                    span.blog-slider__desc= item.description
-                                when 2
-                                    if item.description
-                                        span.blog-slider__desc= item.description
-                                    else
-                                        - const content = strip_html(item.content)
-                                        - let expert = content.substring(0, theme.index_post_list.length).replace(/\d+/g, '').replace(/&#xF/g, '').replace(/&#x/g, '')
-                                        - content.length > theme.index_post_list.length ? expert += ' ...' : ''
-                                        .span.blog-slider__desc= expert
-                                default
-                                    - const content = strip_html(item.content)
-                                    - let expert = content.substring(0, theme.index_post_list.length).replace(/\d+/g, '').replace(/&#xF/g, '').replace(/&#x/g, '')
-                                    - content.length > theme.index_post_list.length ? expert += ' ...' : ''
-                                    .span.blog-slider__desc= expert
-                            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
-                                                i.solitude.fa-solid.fa-hashtag
-                                                =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", {
-                direction: "vertical",
-                passiveListeners: true,
-                loop: true,
-                autoplay: {
-                    disableOnInteraction: true,
-                    delay: 5e3
-                },
-                pagination: {
-                    el: ".blog-slider__pagination",
-                    clickable: true
-                },
-                effect: 'fade',
-                fadeEffect: {
-                    crossFade: true
-                },
-                passiveListeners: true,
-                spaceBetween: 30,
-                watchSlidesProgress: true,
-                mousewheel: true
-            })
-                , t = document.getElementById("swiper_container");
-            null !== t && (t.onmouseenter = () => {
-                    e.autoplay.stop()
-                }
-                    ,
-                    t.onmouseleave = () => {
-                        e.autoplay.start()
-                    }
-            )
-        }