hexo-theme-solitude 1.6.0 → 1.6.1

package/layout/includes/nav.pug

@@ -5,7 +5,7 @@ nav#nav.show
                 .back-home-button(tabindex="-1")
                     i.back-home-button-icon.solitude.st-more-fill
                     include ./widgets/nav/group
-            a#site-name(href="/", title=_p('nav.site_name_title'))
+            a#site-name(href=url_for("/"), title=_p('nav.site_name_title'))
                 if theme.site.name.class === 'i_class'
                     i.solitude(class=theme.site.name.custom, style="font-size: 16px;")
                 else if theme.site.name.class === 'img'

package/layout/includes/sidebar.pug

@@ -1,14 +1,30 @@
 div#sidebar(style="zoom: 1;")
     div#menu-mask(style="display: none;")
     div#sidebar-menus
-        span.sidebar-menu-item-title= __('sidebar.title1')
+        .site-data
+            .data-item.is-center
+                .data-item-link
+                    a(href=url_for('/archives/'))
+                        .headline=_p('page.archives')
+                        .length-num=site.posts.find({ parent: { $exists: false } }).length
+            .data-item.is-center
+                .data-item-link
+                    a(href=url_for('/categories/'))
+                        .headline=_p('page.category')
+                        .length-num=site.categories.find({parent: {$exists: false}}).length
+            .data-item.is-center
+                .data-item-link
+                    a(href=url_for('/tags/'))
+                        .headline=_p('page.tag')
+                        .length-num=site.tags.find({parent: {$exists: false}}).length
+        span.sidebar-menu-item-title= __('sidebar.function')
         div.sidebar-menu-item
-            a.darkmode_switchbutton.menu-child(onclick="sco.switchDarkMode()", href="javascript:void(0);")
+            span.darkmode_switchbutton.menu-child(onclick="sco.switchDarkMode()")
                 i.solitude.st-moon-clear-fill
                 span= __('sidebar.darkmode')
         include ./widgets/nav/group
         include ./widgets/nav/menu.pug
-        span.sidebar-menu-item-title= __('sidebar.title2')
+        span.sidebar-menu-item-title= __('page.tag')
         div.card-widget.card-tags.card-archives.card-webinfo.card-allinfo
             div.card-tag-cloud
                 each tag in site.tags.find({ parent: { $exists: false } }).data

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

@@ -1,6 +1,6 @@
 .category-bar-items#category-bar-items
     .category-bar-item(class=is_home() ? 'select' : '', id="category-bar-home")
-        a(href="/")= __('home.categoryBar.home')
+        a(href=url_for('/'))= __('home.home')
     each item in site.categories.find({ parent: { $exists: false } }).data
         .category-bar-item(class=select ? (select === item.name ? 'select' : '') : '', id=item.name)
             a(href=url_for(item.path))= item.name
@@ -8,4 +8,4 @@ div.category-bar-right
     if site.categories.find({parent: {$exists: false}}).data.length > 10
         .category-bar-next#category-bar-next(onclick="sco.scrollCategoryBarToRight()")
             i.solitude.st-show-right-line
-    a.category-bar-more(href="/categories/")= __('home.categoryBar.more')
+    a.category-bar-more(href=url_for('/categories/'))= __('more')

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

@@ -8,14 +8,14 @@ mixin info
             if post.sticky && is_home()
                 span.article-meta.sticky-warp
                     i.solitude.st-thumbtack-solid.sticky.orange
-                    span.sticky.orange= _p('home.recent-post.sticky')
+                    span.sticky.orange= _p('home.sticky')
             each category in post.categories.data
                 span.original= category.name
 
             if post.prev == null && is_home()
-                span.original= _p('home.recent-post.new')
+                span.original= _p('home.new')
 
-            a.unvisited-post(href=url_for(post.path))= _p('home.recent-post.read')
+            a.unvisited-post(href=url_for(post.path))= _p('home.read')
 
         a.article-title(href=url_for(post.path), title=post.title)= post.title
 
@@ -41,7 +41,7 @@ mixin info
     div.article-meta-wrap
         span.article-meta.tags
             each tag in post.tags.data
-                a.article-meta__tags(href=tag.path, onclick="event.stopPropagation();")
+                a.article-meta__tags(href=url_for(tag.path), onclick="event.stopPropagation();")
                     span.tags-punctuation=tag.name
 
         span.post-meta-date

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

@@ -3,7 +3,7 @@ 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.top-group.recommend')
+                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
@@ -16,7 +16,7 @@ mixin todayCardContent
     .banner-button-group
         a.banner-button(onclick="window.event.cancelBubble=true;sco.hideTodayCard();")
             i.solitude.st-add-fill
-            span.banner-button-text= _p('home.top-group.recommendmore')
+            span.banner-button-text= _p('home.recommendmore')
 
 case theme.hometop.recommendList.url.startsWith('/')
     when true

package/layout/includes/widgets/nav/group.pug

@@ -7,7 +7,7 @@ if menu
                 .back-menu-list
                     each data, label in value
                         - var array = data.split('||')
-                        a.back-menu-item(href=url_for(trim(array[0])), title=index)
+                        a.back-menu-item(href=url_for(trim(array[0])), title=label)
                             if array[1]
-                                img.nolazyload.back-menu-item-icon(src=trim(array[1]), alt=index)
+                                img.nolazyload.back-menu-item-icon(src=trim(array[1]), alt=label)
                             span.back-menu-item-text= label

package/layout/includes/widgets/nav/right.pug

@@ -1,7 +1,7 @@
 - var custom = theme.nav.right.custom || []
 each item in custom
     .nav-button(id=item.id)
-        a.site-page(href=item.url || 'javascript:void(0);', onclick=item.onclick, title=item.title || '')
+        a.site-page(href=url_for(item.url) || 'javascript:void(0);', onclick=item.onclick, title=item.title || '')
             i.solitude(class=item.icon || '')
 if theme.nav.right.random
     .nav-button#randomPost_button

package/layout/includes/widgets/page/about/award.pug

@@ -4,8 +4,8 @@
 if site.data.about.rewardList
     .author-content
         .author-content-item.single.reward
-            .author-content-item-tips= _p('award.about.tip')
-            span.author-content-item-title= _p('award.about.title')
+            .author-content-item-tips= _p('award.thanks')
+            span.author-content-item-title= _p('award.title')
             .author-content-item-description
                 = award.description
             .reward-list-all
@@ -22,18 +22,17 @@ if site.data.about.rewardList
                 if theme.post.award.enable
                     .post-reward
                         .post-reward(onclick="AddRewardMask()")
-                        .reward-button(title=_p('award.about.tip1'))
+                        .reward-button(title=_p('award.tipping'))
                             i.solitude.st-hand-heart-fill
-                            = _p('award.about.tip1')
+                            = _p('award.tipping')
                         .reward-main
                             ul.reward-all
-                                span.reward-title= _p('award.about.tip2')
+                                span.reward-title= theme.post.award.title
                                 ul.reward-group
-                                    - var rewards = [{image: theme.post.award.wechat, description: _p('award.wechat')}, {image: theme.post.award.alipay, description: _p('award.alipay')}]
+                                    - var rewards = theme.post.award.list
                                     each reward in rewards
                                         li.reward-item
-                                            a(href=reward.image, target="_blank")
-                                                img.post-qr-code-img(alt=reward.description, src=reward.image)
-                                            .post-qr-code-desc= reward.description
+                                            img.post-qr-code-img(alt=reward.name, src=reward.qcode, style="border-color:" + reward.color)
+                                            .post-qr-code-desc= reward.name
             .reward-list-tips
                 p= award.tips.replace('{sum}', sum.toFixed(2))

package/layout/includes/widgets/page/about/hobbies.pug

@@ -32,6 +32,6 @@ if site.data.about.likes
                         .tips= like.subtips
                         if like.button
                             .banner-button-group
-                                a.banner-button(href=like.button_link)
+                                a.banner-button(href=url_for(like.button_link))
                                     i.solitude.st-right-btn-fill
                                     span.banner-button-text= like.button_text

package/layout/includes/widgets/page/about/other.pug

@@ -10,7 +10,7 @@
                 #statistic
                 .post-tips
                     | 统计信息来自
-                    a(href="https://invite.51.la/1NzKqTeb?target=V6") 51la网站统计
+                    a(href="https://v6.51.la/") 51la网站统计
 
             script.
                 fetch("#{tj.url}")

package/layout/includes/widgets/page/banner.pug

@@ -10,6 +10,6 @@
         if page.rightbtn
             .banner-button-group
                 - const isInternalLink = page.rightbtnlink.startsWith('/')
-                a.banner-button(onclick=isInternalLink ? `pjax.loadUrl("${page.rightbtnlink}")` : null, href=isInternalLink ? null : page.rightbtnlink, target=isInternalLink ? null : "_blank")
+                a.banner-button(onclick=isInternalLink ? `pjax.loadUrl("${page.rightbtnlink}")`: null, href=isInternalLink ? null : url_for(page.rightbtnlink), target=isInternalLink ? null : "_blank")
                     i.solitude.st-right-btn-fill
                     span.banner-button-text= page.rightbtn

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

@@ -6,10 +6,11 @@
     if theme.footer.randomlink
         a.banner-button.secondary(onclick="travelling()")
             i.solitude.st-signal-tower-fill
-            span.banner-button-text 随机访问
-    a.banner-button(onclick="sco.scrollToComment()")
-        i.solitude.st-right-btn-fill
-        span.solitude.banner-button-text 申请友链
+            span.banner-button-text=_p('link.banner.random')
+    if theme.comment.enable
+        a.banner-button(onclick="sco.scrollToComment()")
+            i.solitude.st-right-btn-fill
+            span.solitude.banner-button-text=_p('link.banner.toComment')
 
 .tags-group-all.nowrapMove
     .tags-group-wrapper

package/layout/includes/widgets/page/moments/angle.pug

@@ -5,7 +5,7 @@
             i.solitude.st-restart-line
     .title-h2-a-right
         if page.type !== 'links'
-            a.random-post-all(href="/links/", data-pjax-state="") 全部友链
+            a.random-post-all(href=url_for("/links/"), data-pjax-state="") 全部友链
 
 #random-post
 

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

@@ -1,24 +1,19 @@
 .post-reward(onclick="AddRewardMask()")
-    .reward-button(title="赞赏作者")
+    .reward-button(title=_p('award.tipping'))
         i.solitude.st-hand-heart-fill
-        | 打赏作者
+        =_p('award.tipping')
     .reward-main
         ul.reward-all
-            span.reward-title 感谢你赐予我前进的力量
+            span.reward-title=theme.post.award.title
             ul.reward-group
-                if theme.post.award.wechat
+                - let list = theme.post.award.list || []
+                for item in list
                     li.reward-item
-                        a(href=theme.post.award.wechat)
-                            img.post-qr-code-img(src=theme.post.award.wechat alt="微信")
-                        .post-qr-code-desc 微信
-                if theme.post.award.alipay
-                    li.reward-item
-                        a(href=theme.post.award.alipay target="_blank")
-                            img.post-qr-code-img(src=theme.post.award.alipay alt="支付宝")
-                        .post-qr-code-desc 支付宝
-            a.reward-main-btn(href=url_for(theme.post.award.url))
-                .reward-text 赞赏者名单
-                .reward-dec 因为你们的支持让我意识到写文章的价值🙏
+                        img.post-qr-code-img.nolazyload(src=item.qcode, alt=item.name, style="border-color: " + item.color)
+                        .post-qr-code-desc=item.name
+            a.reward-main-btn(href=url_for(theme.post.award.appreciators))
+                .reward-text= _p('award.title')
+                .reward-dec=theme.post.award.desc
 
 script.
     function RemoveRewardMask() {

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

@@ -1,6 +1,6 @@
 .post-copyright
     .post-copyright__author_group
-        a.post-copyright__author_img(href="/about/")
+        a.post-copyright__author_img(href=url_for("/about/"))
             img.post-copyright__author_img_front(src=theme.site.icon)
         .post-copyright__author_name= config.title
         .post-copyright__author_desc= config.subtitle
@@ -24,4 +24,4 @@
                     a(href=url_for(theme.post.default.copyright.licenurl))
                         | #{theme.post.default.copyright.license}
                     | 协议，完整转载请注明来自
-                    a(href="/") #{config.title}
+                    a(href=url_for("/")) #{config.title}

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

@@ -3,11 +3,11 @@
 #post-info
     #post-firstinfo
         .meta-firstline
-            - var cc = page.reprint ? _p('post.meta_reprint') : _p('post.meta_original')
-            a.post-meta-original(title=_p('post.meta_cc').replace(/\$\{cc}/, cc))= cc
+            - var cc = page.reprint ? _p('post.reprint') : _p('post.original')
+            a.post-meta-original(title=_p('post.copyright').replace(/\$\{cc}/, cc))= cc
             if page.categories.data.length > 0
                 span.post-meta-categories
-                    a.post-meta-categories(href='/' + page.categories.data[0].path)= page.categories.data[0].name
+                    a.post-meta-categories(href=url_for('/' + page.categories.data[0].path))= page.categories.data[0].name
             .tag_share
                 .post-meta__tag-list
                     each tag in page.tags.data
@@ -17,28 +17,28 @@
     #post-meta
         .meta-secondline
             if theme.post.meta.date
-                span.post-meta-date(title=_p('meta_posted') + ' ' + full_date(page.date))
+                span.post-meta-date(title=_p('post.posted') + ' ' + full_date(page.date))
                     i.post-meta-icon.solitude.st-calendar-todo-fill
                     time(datetime=date_xml(page.date))= date_xml(page.date)
             if theme.post.meta.updated
-                span.post-meta-date(title=_p('meta_updated') + ' ' + full_date(page.updated))
+                span.post-meta-date(title=_p('post.updated') + ' ' + full_date(page.updated))
                     i.post-meta-icon.solitude.st-refresh-line
                     time(datetime=date_xml(page.updated))= date_xml(page.updated)
             if theme.wordcount
                 span.post-meta-wordcount
                     if theme.post.meta.wordcount
-                        i.post-meta-icon.solitude.st-word-fill(title=_p('post.meta_wordcount'))
+                        i.post-meta-icon.solitude.st-word-fill(title=_p('post.wordcount'))
                         span.word-count= wordcount(page.content)
                     span.post-meta-separator
                     if theme.post.meta.readtime
-                        i.post-meta-icon.solitude.st-clock-fill(title=_p('post.meta_minread'))
+                        i.post-meta-icon.solitude.st-clock-fill(title=_p('post.minread'))
                         span= min2read(page.content) + " min"
             if theme.post.meta.locate
-                span.post-meta-position(title=_p('post.meta_ip') + page.locate)
+                span.post-meta-position(title=_p('post.ip') + page.locate)
                     i.post-meta-icon.solitude.st-map-pin-fill
                     span= page.locate
             if theme.post.meta.pv
-                a.post-meta-pv(href=url_for(page.path), title=_p('post.meta_pv'))
+                a.post-meta-pv(href=url_for(page.path), title=_p('post.pv'))
                     i.post-meta-icon.solitude.st-fire-fill
                     if theme.comment.enable
                         case theme.comment.type
@@ -52,7 +52,7 @@
                         span#busuanzi_value_page_pv
                             i.solitude.st-loading-line
             if theme.post.meta.comment && page.comment
-                span.post-meta-commentcount(title=_p('post.meta_comment'), onclick="sco.scrollTo('post-comment')")
+                span.post-meta-commentcount(title=_p('post.comment'), onclick="sco.scrollTo('post-comment')")
                     i.solitude.st-chat-fill
                     a(href=url_for(page.path) + "#post-comment")
                         case theme.comment.type

package/layout/includes/widgets/randomlink.pug

@@ -8,9 +8,10 @@ if(data)
 
 script.
     const links = !{JSON.stringify(datalinks)}
+    const randomText = '!{_p('link.random')}'
     function travelling() {
         const link = links[utils.randomNum(links.length)];
-        utils.snackbarShow('您即将前往 ⌈ ' + link.name + ' ⌋ , 安全性未知', false, 3000);
+        utils.snackbarShow(randomText.replace(/\$\{name}/, link.name), false, 3000);
         setTimeout(() => {
             window.open(link.link, "_blank")
         }, 3000)
@@ -33,5 +34,5 @@ if theme.footer.randomlink
                 linksCopy.splice(index, 1);
             }
 
-            linkcard.innerHTML = data + '<a class="footer-item" href="/links/">更多</a>';
+            linkcard.innerHTML = data + '<a class="footer-item" href="#{url_for(/links/)}">#{_p('more')}</a>';
         }

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

@@ -6,6 +6,7 @@ script.
                 el: '#comment',
                 onCommentLoaded: function () {
                     GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
+                    sco.owoBig()
                 },
                 lang: '#{theme.comment.twikoo.lang}',
             }

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

@@ -13,4 +13,5 @@ script.
         }, !{JSON.stringify(option)}))
 
         GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll('#comment .wl-content img:not(.wl-emoji)'))
+        sco.owoBig()
     }

package/package.json

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

package/scripts/event/cdn.js

@@ -44,11 +44,6 @@ hexo.extend.filter.register('before_generate', () => {
             file: 'js/covercolor/api.js',
             version
         },
-        rightside_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/rightside.js',
-            version
-        },
         music_js: {
             name: 'hexo-theme-solitude',
             file: 'js/music.js',
@@ -66,12 +61,12 @@ hexo.extend.filter.register('before_generate', () => {
         },
         twikoo_commentBarrage: {
             name: 'hexo-theme-solitude',
-            file: 'js/comment/twikoo_commentBarrage.js',
+            file: 'js/commentBarrage/twikoo.js',
             version
         },
         waline_commentBarrage: {
             name: 'hexo-theme-solitude',
-            file: 'js/comment/waline_commentBarrage.js',
+            file: 'js/commentBarrage/waline.js',
             version
         },
         waterfall: {

package/scripts/event/merge_config.js

@@ -137,7 +137,7 @@ hexo.extend.filter.register('before_generate', () => {
             enable: true, limit: 200, copy: true, expand: true, theme: 'default', color: 'default',
         }, lightbox: false, fancybox: false, mediumZoom: false, mermaid: false, translate: {
             enable: false, defaultEncoding: 2, translateDelay: 0,
-        }, opengraph: {
+        }, OpenGraph: {
             enable: false, options: null
         }, wordcount: false, busuanzi: false, search: {
             enable: false, type: 'local', tags: [], algolia: null, local: {
@@ -145,7 +145,15 @@ hexo.extend.filter.register('before_generate', () => {
             }
         }, rightside: {
             enable: false
-        }, post_ai: {
+        },
+        copy: {
+            enable: true,
+            copyright: {
+                enable: false,
+                limit_count: 50
+            }
+        }
+        , post_ai: {
             enable: false,
             modelName: 'GPT 3',
             key: 'your key',

package/source/css/_comments/index.styl

@@ -110,4 +110,17 @@ div#post-comment
 
   &:hover
     a
-      color var(--efu-theme)
+      color var(--efu-theme)
+
+#owo-big
+  position fixed
+  align-items center
+  background-color var(--heo-card-bg)
+  border var(--style-border-always)
+  border-radius 10px
+  z-index 9999
+  display none
+  transform translate(0, -105%)
+  overflow hidden
+  animation owoIn .3s cubic-bezier(.42,0,.3,1.11)
+  padding 1rem

package/source/css/_comments/twikoo.styl

@@ -1,4 +1,7 @@
 #twikoo
+  .tk-admin-config-group-title
+    margin-top 0
+    line-height normal
   .tk-row
     .tk-col
       flex-direction column-reverse !important

package/source/css/_highlight/prismjs/line-number.styl

@@ -6,7 +6,7 @@
       > code
         display block
         position relative
-        padding 8px 0 8px 45px
+        padding 8px 0 8px 38px
 
       .line-numbers-rows
         position absolute

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

@@ -47,7 +47,7 @@
       display flex
       flex-direction column
       -webkit-box-flex 1
-      flex 1 1 0%
+      flex 1 1 0
 
       a
         overflow hidden

package/source/css/_layout/aside.styl

@@ -205,7 +205,7 @@ if "about" in aside
 
     > .card-widget.card-info
       &:before
-        background linear-gradient(-25deg, var(--efu-main), var(--efu-main-op-deep), var(--efu-main), var(--efu-main-op-deep))
+        background linear-gradient(-25deg, var(--efu-main), var(--efu-main-op-deep))
         background-size 400%
         position absolute
         width 100%
@@ -336,7 +336,7 @@ if "about" in aside
         .author-info__description
           line-height 1.38
           margin .3rem 0
-          text-align justify
+          text-align left
           color var(--efu-card-bg)
 
           b
@@ -345,7 +345,7 @@ if "about" in aside
         .author-info__description2
           line-height 1.38
           margin .3rem 0
-          text-align justify
+          text-align left
           width 100%
           z-index 2
           color var(--efu-card-bg)

package/source/css/_layout/console.styl

@@ -170,7 +170,7 @@
       transition .3s
       cursor pointer
 
-      a.darkmode_switchbutton
+      span.darkmode_switchbutton
         [data-theme="dark"] &
           background var(--efu-orange)
           color var(--efu-white)
@@ -180,10 +180,10 @@
         margin-right .5rem
 
       &:hover
-        a
+        span
           background var(--efu-main)
 
-      a
+      span
         width 100%
         height 100%
         background var(--efu-card-bg)
@@ -193,22 +193,23 @@
         align-items center
         justify-content center
         color var(--efu-fontcolor)
+        transition all .3s
 
         i
           font-size 1rem
 
       &.on
-        a
+        span
           background var(--efu-orange)
           color var(--efu-white)
           transition .3s
 
       &:not(.on)
-        a:hover
+        span:hover
           background var(--efu-main)
 
       &:hover
-        a
+        span
           color var(--efu-white)
 
   .console-card.tags

package/source/css/_layout/footer.styl

@@ -161,6 +161,7 @@
 
     .random-friends-btn
       display flex
+      margin-left 8px
 
   /#footer-bar
     padding 1rem

package/source/css/_layout/header.styl

@@ -886,6 +886,8 @@ if hexo-config('nav.group')
           height 35px
           line-height 35px
           border-radius 40px
+          if hexo-config('language') == 'en'
+            letter-spacing 0
 
 #travellings_button
   display inline