hexo-theme-solitude 2.0.2 → 2.0.4

package/languages/default.yml

@@ -94,19 +94,19 @@ award:
 search:
   empty: No results found
   hit: Found ${query} results for you
-  placeholder: Enter keywords to quickly search
+  placeholder: Enter keywords to search
   count: Total <b>${count}</b> results.
 
 head:
   noscript: Please enable JavaScript to view the site
 
 aside:
-  postcount: 'Posts :'
-  pv: 'PV :'
-  uv: 'UV :'
-  runtime: 'Runtime :'
-  updatetime: 'Last update :'
-  wordcount: 'Word count :'
+  postcount: 'Posts:'
+  pv: 'PV:'
+  uv: 'UV:'
+  runtime: 'Runtime:'
+  updatetime: 'Last update:'
+  wordcount: 'Word count:'
   toc: Table of contents
   tagmore: View all
   avatar: Avatar
@@ -125,7 +125,7 @@ console:
   comment_title: Latest comments
   tag_tip: Tags
   tag_title: Find interesting areas
-  switch_darkmode: Day and night switching
+  switch_darkmode: Day and night mode
   switch_hideAside: Sidebar display control
   switch_keyboard: Keyboard operation
   switch_music: Music switch
@@ -170,7 +170,7 @@ keyboard:
   title: Blog shortcuts
 
 newest_comment:
-  error: Unable to get a comment, please confirm that the relevant configuration is correct.
+  error: Unable to get comments, please check the configuration.
   zero: No comments.
 
 comment:
@@ -196,19 +196,19 @@ right_menu:
   cht_to_chs: 转为简体
   img_error: This image cannot be copied or downloaded.
   barrage:
-    open: OpenBarrage
-    close: CloseBarrage
+    open: Open Barrage
+    close: Close Barrage
   music:
     start: Play
     stop: Pause
     back: Back
     forward: Forward
-    copyMusicName: CopyName
+    copyMusicName: Copy Name
 
 pagination:
   prev: Prev
   next: Next
-  to: To page
+  to: Go to page
 
 about:
   other:

package/languages/en.yml

@@ -77,6 +77,7 @@ post:
     next: Next
     prev: Previous
     
+
 nav:
   site_name_title: Back to home
   backtop: Back to top
@@ -93,19 +94,19 @@ award:
 search:
   empty: No results found
   hit: Found ${query} results for you
-  placeholder: Enter keywords to quickly search
+  placeholder: Enter keywords to search
   count: Total <b>${count}</b> results.
 
 head:
   noscript: Please enable JavaScript to view the site
 
 aside:
-  postcount: 'Posts :'
-  pv: 'PV :'
-  uv: 'UV :'
-  runtime: 'Runtime :'
-  updatetime: 'Last update :'
-  wordcount: 'Word count :'
+  postcount: 'Posts:'
+  pv: 'PV:'
+  uv: 'UV:'
+  runtime: 'Runtime:'
+  updatetime: 'Last update:'
+  wordcount: 'Word count:'
   toc: Table of contents
   tagmore: View all
   avatar: Avatar
@@ -124,7 +125,7 @@ console:
   comment_title: Latest comments
   tag_tip: Tags
   tag_title: Find interesting areas
-  switch_darkmode: Day and night switching
+  switch_darkmode: Day and night mode
   switch_hideAside: Sidebar display control
   switch_keyboard: Keyboard operation
   switch_music: Music switch
@@ -169,7 +170,7 @@ keyboard:
   title: Blog shortcuts
 
 newest_comment:
-  error: Unable to get a comment, please confirm that the relevant configuration is correct.
+  error: Unable to get comments, please check the configuration.
   zero: No comments.
 
 comment:
@@ -195,19 +196,19 @@ right_menu:
   cht_to_chs: 转为简体
   img_error: This image cannot be copied or downloaded.
   barrage:
-    open: OpenBarrage
-    close: CloseBarrage
+    open: Open Barrage
+    close: Close Barrage
   music:
     start: Play
     stop: Pause
     back: Back
     forward: Forward
-    copyMusicName: CopyName
+    copyMusicName: Copy Name
 
 pagination:
   prev: Prev
   next: Next
-  to: To page
+  to: Go to page
 
 about:
   other:

package/layout/archive.pug

@@ -3,8 +3,15 @@ extends includes/layout.pug
 block content
     main.layout#content-inner
         #archive
-            .article-sort-title #{__('page.archives')}<sup>#{site.posts.find({ parent: { $exists: false } }).length}</sup>
-            .article-sort
-                include includes/mixins/articleSort
-            include includes/mixins/pagination
+            .article-sort-title #{__('page.archives')}<sup>#{site.posts.find({parent: {$exists: false}}).length}</sup>
+            case theme.page.archives
+                when 0
+                    .article-sort
+                        include includes/mixins/articleSort
+                    include includes/mixins/pagination
+                when 1
+                    .recent-posts#recent-posts
+                        each post,index in page.posts.find({ parent: { $exists: false } }).data
+                            include includes/widgets/home/postList
+                        include includes/mixins/pagination
         include includes/widgets/aside/aside

package/layout/includes/footer.pug

@@ -56,11 +56,12 @@ div#footer-bar
         div.footer-bar-right
             each item in theme.footer.links
                 a.footer-bar-link(href=url_for(item.url), alt=item.name)!= item.name
-            a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright')
-                i.solitude.fa-solid.fa-copyright
-                i.solitude.fa-brands.fa-creative-commons-by
-                i.solitude.fa-brands.fa-creative-commons-nc
-                i.solitude.fa-brands.fa-creative-commons-nd
+            if theme.footer.license
+                a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright')
+                    i.solitude.fa-solid.fa-copyright
+                    i.solitude.fa-brands.fa-creative-commons-by
+                    i.solitude.fa-brands.fa-creative-commons-nc
+                    i.solitude.fa-brands.fa-creative-commons-nd
 if theme.footer.privacy
     div.needEndHide#cookies-window
         div.cookies-window-title= __('cookies.title')

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

@@ -12,4 +12,5 @@ div.category-bar-right
     if wordcount > 40 || categories.data.length > 10
         .category-bar-next#category-bar-next(onclick="sco.scrollCategoryBarToRight()")
             i.solitude.fa-solid.fa-angles-right
-    a.category-bar-more(href=url_for('/categories/'))= __('more')
+    if theme.page.categories
+        a.category-bar-more(href=url_for('/categories/'))= __('more')

package/package.json

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

package/scripts/event/merge_config.js

@@ -112,6 +112,7 @@ hexo.extend.filter.register('before_generate', () => {
             error: true,
             tags: true,
             categories: true,
+            archives: 0,
             default: {
                 cover: ['/img/default.avif'],
             }
@@ -151,6 +152,10 @@ hexo.extend.filter.register('before_generate', () => {
                 api: 'https://api.qjqq.cn/api/Imgcolor?img=',
                 time: 43200000,
             },
+            share: {
+              enable: false,
+              list: []
+            },
             footer: {
                 enable: true,
                 desc: "来自 Efu 的文章",

package/scripts/filter/post_image.js

@@ -4,7 +4,6 @@ hexo.extend.filter.register('before_post_render', data => {
   const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
   let { cover: coverVal } = data
 
-  // Add path to top_img and cover if post_asset_folder is enabled
   if (hexo.config.post_asset_folder) {
     if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = `${data.path}${coverVal}`
   }

package/source/css/_layout/aside.styl

@@ -81,7 +81,7 @@
 
     / [data-theme=dark] &
       background #00000015
-      color var(--efu-black)
+      color var(--efu-white)
 
       &:hover
         color var(--efu-white)

package/source/css/_layout/header.styl

@@ -19,13 +19,22 @@
         &:hover
           color var(--efu-card-bg)
 
-    &:not(.nav-fixed)
-      #nav
-        background var(--efu-none)
-        transition .3s
+  &:not(.nav-fixed)
+    #nav
+      background var(--efu-none)
+      transition .3s
 
-        +maxWidth768()
-          transition 0s
+      +maxWidth768()
+        transition 0s
+
+      .post &
+
+        #nav-right
+          .nav-button
+            .console_switchbutton
+              label
+                i
+                  background var(--efu-white)
 
 #page-header
   #site-title
@@ -141,7 +150,8 @@
         padding 0
 
       .nav-button
-        margin-left .5rem
+        margin-left 12px
+        cursor pointer
 
         a
           height 35px
@@ -151,6 +161,9 @@
           justify-content center
           border-radius 40px
 
+          i
+            font-size 20px
+
           &.totopbtn
             width 25px
             height 25px
@@ -163,7 +176,7 @@
             transition .3s
 
           &.console_switchbutton
-            padding 10px 8px
+            padding 10px 7.5px
 
             &:hover
               label
@@ -195,9 +208,6 @@
                 border-radius 12px
                 background var(--efu-fontcolor)
 
-                .post &
-                  background var(--efu-white)
-
                 &.left
                   top 0
                   width 100%
@@ -611,9 +621,6 @@
       +maxWidth899()
         display none !important
 
-.nav-button
-  cursor pointer
-
 #site-logo
   width 121px
 
@@ -795,7 +802,7 @@ if hexo-config('nav.group')
         +minWidth900()
           align-items center
 
-      &:before
+      i.fa-solid.fa-home
         color var(--efu-white)
 
   .nav-fixed

package/source/css/_page/_about/myphoto.styl

@@ -4,7 +4,7 @@
     min-height 240px
     position relative
     overflow hidden
-    width 39.5%
+    width calc(40% - (.5rem / 2))
     display flex
     align-items center
     justify-content center

package/source/css/_page/_about/oneself.styl

@@ -3,14 +3,14 @@
     &.column
       display flex
       flex-direction column
-      width 49%
+      width calc(50% - (.5rem / 2))
       justify-content space-between
 
       +maxWidth768()
         width 100% !important
 
     &.mapAndInfo
-      width 59.5%
+      width calc(60% - (.5rem / 2))
       gap .5rem
 
   .author-content-item

package/source/css/_page/_about/personalities.styl

@@ -1,7 +1,7 @@
 .author-content-item.personalities
   overflow hidden
   position relative
-  width 59.5%
+  width calc(60% - (.5rem / 2))
   +maxWidth768()
     min-height 360px
 

package/source/css/_page/_about/skills.styl

@@ -4,7 +4,7 @@
     justify-content center
     align-items flex-start
     flex-direction column
-    width 49.5%
+    width calc(50% - (.5rem / 2))
     min-height 450px
 
     .tags-group-all

package/source/css/_page/_about/statistic.styl

@@ -5,7 +5,7 @@
 
   .about-statistic
     min-height 380px
-    width 39.5%
+    width calc(40% - (.5rem / 2))
     background-size cover
     color var(--efu-white)
     overflow hidden

package/source/css/var.styl

@@ -3,7 +3,7 @@ error_img = hexo-config('errorpage.img')
 $dark_theme = convert(hexo-config('theme_color.dark'))
 $dark_theme_op = convert(hexo-config('theme_color.dark_op'))
 $dark_theme_op_deep = convert(hexo-config('theme_color.dark_op_deep'))
-$dark_theme_none = hexo-config('theme_color.dark_none')
+$dark_theme_none = convert(hexo-config('theme_color.dark_none'))
 $light_theme = convert(hexo-config('theme_color.light'))
 $light_theme_op = convert(hexo-config('theme_color.light_op'))
 $light_theme_op_deep = convert(hexo-config('theme_color.light_op_deep'))

package/source/js/main.js

@@ -198,6 +198,7 @@ const sco = {
     },
     initConsoleState() {
         const consoleHideAside = document.querySelector("#consoleHideAside");
+        if(!consoleHideAside) return;
         consoleHideAside.classList.toggle("on", document.documentElement.classList.contains("hide-aside"));
     },
     changeSayHelloText() {