Merge pull request #278 from valor-x/dev

Dev

README.md

@@ -62,7 +62,7 @@
 - [x] 弹幕留言页
 - [ ] 首页顶部新样式 
 
-> 如有問題請提 [issue](https://github.com/valor-x/hexo-theme-solitude/issues)
+> 如有问题请提 [issue](https://github.com/valor-x/hexo-theme-solitude/issues)
 
 ## 应用
 

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.10.5",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.10.6",
         "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;border-radius:0 5px 5px 0",

layout/includes/widgets/home/hometop.pug

@@ -3,6 +3,5 @@
         #bannerGroup
             #banners
                 include ./banner.pug
-            include ./categoryGroup.pug
         .topGroup
             include ./topGroup.pug

layout/includes/widgets/home/topGroup.pug

@@ -1,12 +1,13 @@
 - var filteredPosts = site.posts.data.filter(item => item.recommend === true).slice(0,6)
-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.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
+.recent-post-group
+    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.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
 
 mixin todayCardContent
     .todayCard-info

layout/includes/widgets/third-party/news-comment/artalk.pug

@@ -61,7 +61,7 @@ script.
                     nick: e.nick,
                     url: e.page_key,
                     date: e.date,
-                }))
+                })).slice(0, 6)
                 utils.saveToLocal.set('artalk-newest-comments', artalk, !{theme.comment.newest_comment.storage})
                 generateHtml(artalk, asideList)
             }).catch(error => {

layout/includes/widgets/third-party/news-comment/twikoo.pug

@@ -46,7 +46,7 @@ script.
                         nick: e.nick,
                         url: `${e.url}#${e.id}`,
                         date: new Date(e.created).toString()
-                    }))
+                    })).slice(0, 6)
                     utils.saveToLocal.set('twikoo-newest-comment', twikooArray, !{theme.comment.newest_comment.storage})
                     generateHtml(twikooArray)
                 }).catch((err) => {

layout/includes/widgets/third-party/news-comment/waline.pug

@@ -39,7 +39,7 @@ script.
                         'url': e.url + '#' + e.objectId,
                         'date': e.time || e.insertedAt
                     }
-                })
+                }).slice(0, 6)
                 utils.saveToLocal.set('waline-newest-comment', walineArray, !{theme.comment.newest_comment.storage})
                 generateHtml(walineArray)
             }).catch(error => {

package.json

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

source/css/_global/index.styl

@@ -86,15 +86,38 @@ main
 
 // scrollbar - chrome/safari
 *::-webkit-scrollbar
-  width 5px
-  height 5px
+  width 12px
+  height 6px
 
 *::-webkit-scrollbar-thumb
   background var(--scrollbar-color)
+  opacity .5
+  border-radius 8px
+  cursor pointer
+  border 2px solid var(--efu-background)
+
+  &:hover
+    background var(--efu-lighttext)
+    display block
 
 *::-webkit-scrollbar-track
   background-color transparent
 
+::-webkit-scrollbar-thumb
+  background var(--efu-card-border)
+  opacity .5
+  border-radius 8px
+  cursor pointer
+  border 2px solid var(--efu-background)
+
+::-webkit-scrollbar-thumb:hover
+  background var(--efu-main)
+  opacity 1
+  display block !important
+
+::-webkit-scrollbar-track
+  background-color var(--efu-none)
+
 if hexo-config('lazyload.enable') && !hexo-config('lazyload.placeholder')
   img
     &[data-lazy-src]:not(.loaded)
@@ -116,7 +139,7 @@ h1, h2, h3, h4, h5, h6
   padding-left 0
   font-weight 700
   position relative
-  margin 1rem 0 0.7rem
+  margin .5rem 0
   color var(--efu-fontcolor)
 
 hr
@@ -319,25 +342,6 @@ li, ul
   margin 0
   padding 0
 
-::-webkit-scrollbar
-  width 10px
-  height 6px
-
-::-webkit-scrollbar-thumb
-  background var(--efu-card-border)
-  opacity .5
-  border-radius 8px
-  cursor pointer
-  border 2px solid var(--efu-background)
-
-::-webkit-scrollbar-thumb:hover
-  background var(--efu-main)
-  opacity 1
-  display block !important
-
-::-webkit-scrollbar-track
-  background-color var(--efu-none)
-
 [data-theme=dark] img
   filter brightness(1)
 
@@ -383,7 +387,7 @@ i.solitude
     +maxWidth1200()
       width 100%
 
-  > #post,#category,#tag,#archive
+  > #post, #category, #tag, #archive
     box-shadow var(--efu-shadow-border)
     padding 1rem 2rem
     border-radius 12px

source/css/_layout/article-container.styl

@@ -191,7 +191,7 @@
       font-size 1.3rem
       line-height 1.3
       border-top 1px dashed var(--efu-theme-op)
-      padding-top 1.5rem
+      padding-top 1rem
 
     h3
       font-size 1.1rem

source/css/_layout/aside.styl

@@ -678,6 +678,7 @@ if hexo-config('aside.card.style') == 2
     opacity 0
     transition .3s
     display flex
+    pointer-events none
     gap 5px
   .more-info
     if hexo-config('aside.position') == 0

source/css/_layout/console.styl

@@ -35,11 +35,13 @@
     +maxHeight800()
       display none
 
+
   &.show
     .console-card-group
       transform translateY(0)
       opacity 1
       transition-delay .1s
+      max-height 80%
 
   .console-card-group-left
     margin-right .5rem

source/css/_layout/header.styl

@@ -521,33 +521,6 @@
           padding 4px
           transition transform .3s ease 0s
 
-  &.hide-menu
-    #toggle-menu
-      display inline-block
-
-      +minWidth768()
-        display none
-
-      .site-page
-        font-size inherit
-
-        +maxWidth768()
-          width 35px
-          height 35px
-          display flex
-          align-items center
-          justify-content center
-
-    .menus_items
-      position absolute
-      left 0
-      visibility hidden
-      opacity 0
-
-    #search-button
-      span
-        display none
-
   #search-button
     display inline
     padding 0 .4rem

source/css/_layout/rightmenu.styl

@@ -23,7 +23,7 @@ if hexo-config('right_menu.enable')
       box-shadow var(--efu-shadow-theme)
 
     .rightMenu-group
-      padding .5rem .3rem
+      padding .35rem .3rem
 
       &.rightMenu-small
         display flex

source/css/_page/_about/about.styl

@@ -3,11 +3,12 @@
   padding-top 1rem
   flex-direction column
   align-items center
+  gap .5rem
 
   .author-title
     font-size 2rem
     font-weight 700
-    margin 1rem 0
+    margin .5rem 0
     line-height 1
 
 if "tenyear" in $about

source/css/_page/_about/buff.styl

@@ -13,7 +13,7 @@
     animation gradient 15s ease infinite
     min-height 200px
     height fit-content
-    width 59%
+    width 59.5%
 
     .card-content
       display flex

source/css/_page/_about/contentinfo.styl

@@ -7,7 +7,7 @@
     background linear-gradient(120deg, #5b27ff 0, #00d4ff 100%)
     background-size 200%
     animation gradient 15s ease infinite
-    width 59%
+    width 59.5%
 
     .title1
       opacity .8
@@ -28,7 +28,7 @@
     justify-content center
     align-items flex-start
     flex-direction column
-    width 39%
+    width 39.5%
 
     h2
       margin-right auto

source/css/_page/_about/maxim.styl

@@ -7,7 +7,7 @@
     align-items flex-start
     flex-direction column
     justify-content center
-    width 39%
+    width 39.5%
 
     .maxim-title
       display flex

source/css/_page/_about/myphoto.styl

@@ -4,7 +4,7 @@
     min-height 240px
     position relative
     overflow hidden
-    width 39%
+    width 39.5%
     display flex
     align-items center
     justify-content center

source/css/_page/_about/oneself.styl

@@ -10,7 +10,8 @@
         width 100% !important
 
     &.mapAndInfo
-      width 59%
+      width 59.5%
+      gap .5rem
 
   .author-content-item
     +minWidth1300()
@@ -22,7 +23,6 @@
       max-height 400px
       position relative
       overflow hidden
-      margin-bottom 0.5rem
       height 60%
       background-size 100%
       transition 1s ease-in-out

source/css/_page/_about/personalities.styl

@@ -1,7 +1,7 @@
 .author-content-item.personalities
   overflow hidden
   position relative
-  width 59%
+  width 59.5%
   +maxWidth768()
     min-height 360px
 

source/css/_page/_about/skills.styl

@@ -4,7 +4,7 @@
     justify-content center
     align-items flex-start
     flex-direction column
-    width 49%
+    width 49.5%
     min-height 450px
 
     .tags-group-all

source/css/_page/_about/statistic.styl

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