Merge pull request #424 from everfu/dev

Dev

languages/default.yml

@@ -131,6 +131,7 @@ console:
   switch_keyboard: 键盘快捷键
   switch_music: 音乐开关
   archive_unit: 篇
+  archive_all: 全部文章
   recent_comment_more: 最近评论
   newest_comment:
     image: 图片

languages/en.yml

@@ -131,6 +131,7 @@ console:
   switch_keyboard: Keyboard operation
   switch_music: Music switch
   archive_unit: Posts
+  archive_all: All posts
   recent_comment_more: Recent comments
   newest_comment:
     image: Image

languages/zh-CN.yml

@@ -131,6 +131,7 @@ console:
   switch_keyboard: 键盘快捷键
   switch_music: 音乐开关
   archive_unit: 篇
+  archive_all: 全部文章
   recent_comment_more: 最近评论
   newest_comment:
     image: 图片

languages/zh-TW.yml

@@ -131,6 +131,7 @@ console:
   switch_keyboard: 鍵盤快捷鍵
   switch_music: 音樂開關
   archive_unit: 篇
+  archive_all: 全部文章
   recent_comment_more: 最近評論
   newest_comment:
     image: 圖片

layout/includes/inject/body.pug

@@ -82,7 +82,7 @@ div
         script(src=url_for(theme.cdn.cover_ave))
 
   if theme.loading.pace
-    script(src=url_for(theme.cdn.pace_js))
+    include ../mixins/pace.pug
 
   if theme.search.enable && theme.search.type === "algolia"
     script(src=url_for(theme.cdn.instantsearch))

layout/includes/mixins/pace.pug

@@ -0,0 +1,10 @@
+script.
+  window.paceOptions = {
+    restartOnPushState: false
+  }
+
+  utils.addGlobalFn('pjaxSend', () => {
+    Pace.restart()
+  }, 'pace_restart')
+
+script(src=url_for(theme.cdn.pace_js))

layout/includes/rightside.pug

@@ -1,3 +1,3 @@
-#rightside
+#rightside.needEndHide
     include ./widgets/rightside/hide
     include ./widgets/rightside/show

layout/includes/widgets/aside/asideArchive.pug

@@ -8,4 +8,10 @@ ul.card-archive-list
                 span.card-archive-list-date= key
                 .card-archive-list-count-group
                     span.card-archive-list-count= value
-                    span.card-archive-list-count-unit= __('console.archive_unit')
+                    span.card-archive-list-count-unit= __('console.archive_unit')
+    li.card-archive-list-item
+        a.card-archive-list-link(href='/archives/')
+            span.card-archive-list-date= __('console.archive_all')
+            .card-archive-list-count-group
+                span.card-archive-list-count= site.posts.length
+                span.card-archive-list-count-unit= __('console.archive_unit')

package.json

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

plugins.yml

@@ -86,9 +86,10 @@ snackbar:
   file: dist/snackbar.min.js
   version: 0.1.16
 fontawesome:
-  name: font-awesome
+  name: '@fortawesome/fontawesome-free'
   file: css/all.min.css
-  version: 6.6.0
+  version: 6.7.1
+  other_name: font-awesome
 medium_zoom:
   name: medium-zoom
   file: dist/medium-zoom.min.js
@@ -114,7 +115,7 @@ chart_js:
   other_name: Chart.js
 typeit_js:
   name: typeit
-  file: index.umd.min.js
+  file: dist/index.umd.min.js
   version: 8.8.7
   other_name: typeit
 blueimp_md5:

source/css/_layout/console.styl

@@ -34,7 +34,6 @@
     transform translateY(20px)
     transition .3s
     max-width 1400px
-    min-width 1000px
 
     +maxWidth1300()
       justify-content center
@@ -58,7 +57,7 @@
     width 40%
     height 100%
 
-    +maxWidth1300()
+    +maxWidth900()
       display none
 
   .console-card-group-right
@@ -69,8 +68,8 @@
     width 60%
     overflow hidden
 
-    +maxWidth1300()
-      display none
+    +maxWidth900()
+      width 100%
 
   .console-card
     background var(--efu-maskbg)
@@ -134,8 +133,8 @@
     width fit-content
 
     .console-btn-item
-      width 60px
-      height 60px
+      width 80px
+      height 40px
       transition .3s
       cursor pointer
 
@@ -162,7 +161,8 @@
         align-items center
         justify-content center
         color var(--efu-fontcolor)
-        transition all .3s
+        transition .3s
+        box-shadow var(--efu-shadow-border)
 
         i
           font-size 1rem
@@ -254,7 +254,7 @@
       gap .5rem
 
       li.card-archive-list-item
-        flex 0 1 24.101%
+        flex 0 1 calc(25% - .375rem)
 
       .card-archive-list-link
         border-radius 8px

source/css/_layout/header.styl

@@ -279,6 +279,10 @@
             opacity 1
             transition .3s
             line-height 1
+            width 70%
+            overflow hidden
+            text-overflow ellipsis
+            white-space nowrap
 
           &:hover
             &:after

source/css/_layout/rightside.styl

@@ -6,6 +6,11 @@ if hexo-config('rightside.enable')
         z-index: 1000
         opacity: 0
         transition: all .5s
+        &.needEndHide
+            display block!important
+        &.hide.needEndHide
+            bottom 0!important
+            transform: none !important
 
         button
             display: block

source/css/_page/recentcomment.styl

@@ -5,6 +5,10 @@ div.console_recentcomments
   min-height 100px
   width 100%
 
+  +maxWidth1300()
+    overflow-y scroll
+    scrollbar-width none
+
 .comment-card
   position relative
   width calc(100% / 3 - 8px)
@@ -22,8 +26,9 @@ div.console_recentcomments
   .console-card &
     width calc(100% / 2 - 8px)
 
-  +maxWidth900()
-    width calc(100% / 2 - 6px)
+  +maxWidth1300()
+    min-width 100%
+    height calc(100% / 3 - 8px)
 
   +maxWidth768()
     width 100%