Merge pull request #403 from everfu/dev

Dev

README.md

@@ -20,7 +20,7 @@ English丨[简体中文](README_zh-Hans.md)丨[繁体中文](README_zh-Hant.md)
 [![discord](https://img.shields.io/discord/1266610921942548553?style=for-the-badge&logo=discord&label=discord&logoColor=white)](https://discord.gg/HZXAnK4Sut)
 ![JetBrains](https://img.shields.io/badge/jetbrains-support-black?logo=jetbrains&style=for-the-badge)
 
-[Docs](https://solitude.js.org/)丨[Preview](https://solitude.js.org/preview/)丨[Author](https://blog.everfu.cn/)
+[Docs](https://solitude.js.org/)丨[Preview](https://blog.everfu.cn/)
 
 </div>
 

README_zh-Hans.md

@@ -20,7 +20,7 @@
 [![discord](https://img.shields.io/discord/1266610921942548553?style=for-the-badge&logo=discord&label=discord&logoColor=white)](https://discord.gg/HZXAnK4Sut)
 ![JetBrains](https://img.shields.io/badge/jetbrains-support-black?logo=jetbrains&style=for-the-badge)
 
-[文档](https://solitude.js.org/)丨[预览](https://solitude.js.org/preview/zh/)丨[作者](https://blog.everfu.cn/)
+[文档](https://solitude.js.org/)丨[预览](https://blog.everfu.cn/)
 
 </div>
 

README_zh-Hant.md

@@ -20,7 +20,7 @@
 [![discord](https://img.shields.io/discord/1266610921942548553?style=for-the-badge&logo=discord&label=discord&logoColor=white)](https://discord.gg/HZXAnK4Sut)
 ![JetBrains](https://img.shields.io/badge/jetbrains-support-black?logo=jetbrains&style=for-the-badge)
 
-[文档](https://solitude.js.org/)丨[預覽](https://solitude.js.org/preview/zh/)丨[作者](https://blog.everfu.cn/)
+[文档](https://solitude.js.org/)丨[預覽](https://blog.everfu.cn/)
 
 </div>
 

_config.yml

@@ -613,6 +613,7 @@ capsule:
   server: netease
   # 类型：playlist / song
   type: playlist
+  volume: 0.8
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------

languages/default.yml

@@ -240,6 +240,7 @@ rightside:
     toc: Toc
     comment: Comment
     top: Top
+    barrage: 弹
   hide:
     translate: 简繁转换
     mode: Mode

languages/en.yml

@@ -241,6 +241,7 @@ rightside:
     toc: Toc
     comment: Comment
     top: Top
+    barrage: 弹
   hide:
     translate: 简繁转换
     mode: Mode

languages/zh-CN.yml

@@ -240,6 +240,7 @@ rightside:
     toc: 目录
     comment: 评论
     top: 返回顶部
+    barrage: 弹
   hide:
     translate: 简繁转换
     mode: 显示模式切换

languages/zh-TW.yml

@@ -239,6 +239,7 @@ rightside:
     toc: 目錄
     comment: 評論
     top: 返回頂部
+    barrage: 彈
   hide:
     translate: 簡繁轉換
     mode: 顯示模式切換

layout/includes/footer.pug

@@ -12,39 +12,40 @@ if theme.post.footer.enable && is_post()
         div.footer-bar-description=theme.post.footer.desc
         if theme.post.footer.button.enable
             a.footer-bar-link(href=url_for(theme.post.footer.button.url))= theme.post.footer.button.name
-div#footer_deal
-    - var leftInfo = information.left || []
-    - var rightInfo = information.right || []
+if information.left || information.right || information.author
+    div#footer_deal
+        - var leftInfo = information.left || []
+        - var rightInfo = information.right || []
 
-    each value, label in leftInfo
-        - var array = value.split('||')
-        a.deal_link(href=url_for(trim(array[0])), title=label)
-            i.solitude(class=array[1])
+        each value, label in leftInfo
+            - var array = value.split('||')
+            a.deal_link(href=url_for(trim(array[0])), title=label)
+                i.solitude(class=array[1])
 
-    if information.author
-        div#footer_mini_logo.nolazyload.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()")
-            img(src=information.author, alt=_p('nav.backtop'))
+        if information.author
+            div#footer_mini_logo.nolazyload.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()")
+                img(src=information.author, alt=_p('nav.backtop'))
 
-    each value, label in rightInfo
-        - var array = value.split('||')
-        a.deal_link(href=url_for(trim(array[0])), title=label)
-            i.solitude(class=array[1])
-div#st-footer
+        each value, label in rightInfo
+            - var array = value.split('||')
+            a.deal_link(href=url_for(trim(array[0])), title=label)
+                i.solitude(class=array[1])
+if group
+    div#st-footer
+        each value, x in group || []
+            div.footer-group
+                h3.footer-title= x
+                div.footer-links
+                    each url, y in value
+                        a.footer-item(href=url_for(url), title=y)= y
 
-    each value, x in group || []
-        div.footer-group
-            h3.footer-title= x
-            div.footer-links
-                each url, y in value
-                    a.footer-item(href=url_for(url), title=y)= y
-
-    if theme.footer && theme.footer.randomlink
-        div.footer-group
-            div.footer-title-group
-                h3.footer-title= _p('footer.randomlink')
-                button.random-friends-btn(onclick='randomLinksList()', title=_p('footer.randomlink'))
-                    i.solitude.fa-solid.fa-arrows-rotate
-            div.footer-links#friend-links-in-footer
+        if theme.footer && theme.footer.randomlink
+            div.footer-group
+                div.footer-title-group
+                    h3.footer-title= _p('footer.randomlink')
+                    button.random-friends-btn(onclick='randomLinksList()', title=_p('footer.randomlink'))
+                        i.solitude.fa-solid.fa-arrows-rotate
+                div.footer-links#friend-links-in-footer
 div#footer-bar
     div.footer-bar-links
         div.footer-bar-left

layout/includes/widgets/home/topGroup.pug

@@ -1,23 +1,25 @@
 - var filteredPosts = site.posts.data.filter(item => item.recommend === true).slice(0,6)
-.top-post-group
-    each post in filteredPosts
-        .top-post-item
-            .post_cover
-                a(href=url_for(post.path), title=post.title)
-                    span.top-post-top-text= _p('home.recommend')
-                    img.post_bg(alt=post.title, src=url_for(post.cover))
-            .top-post-info
-                a.article-title(href=url_for(post.path), title=post.title)= post.title
+if filteredPosts.length > 0
+    .top-post-group
+        each post in filteredPosts
+            .top-post-item
+                .post_cover
+                    a(href=url_for(post.path), title=post.title)
+                        span.top-post-top-text= _p('home.recommend')
+                        img.post_bg(alt=post.title, src=url_for(post.cover))
+                .top-post-info
+                    a.article-title(href=url_for(post.path), title=post.title)= post.title
 
 mixin todayCardContent
     .todayCard-info
         .todayCard-tips= theme.hometop.recommendList.sup
         .todayCard-title= theme.hometop.recommendList.title
     .todayCard-cover.nolazyload(style=`background: url('${theme.hometop.recommendList.img}') no-repeat center /cover`)
-    .banner-button-group
-        a.banner-button(onclick="window.event.cancelBubble=true;sco.hideTodayCard();")
-            i.solitude.fa-solid.fa-circle-plus
-            span.banner-button-text= _p('home.recommendmore')
+    if filteredPosts.length > 0
+        .banner-button-group
+            a.banner-button(onclick="window.event.cancelBubble=true;sco.hideTodayCard();")
+                i.solitude.fa-solid.fa-circle-plus
+                span.banner-button-text= _p('home.recommendmore')
 
 case theme.hometop.recommendList.url.startsWith('/')
     when true

layout/includes/widgets/rightside/hide.pug

@@ -6,4 +6,7 @@
             i.fas.fa-circle-half-stroke
     if theme.rightside.hide.aside
         button.aside.pc(type='button' title=_p('rightside.hide.aside') onclick='sco.switchHideAside()')
-            i.fas.fa-arrows-alt-h
+            i.fas.fa-arrows-alt-h
+    if theme.keyboard.enable
+        button.keyboard.pc(type='button' title=_p('console.switch_keyboard') onclick="sco.switchKeyboard()")
+            i.fas.fa-keyboard

layout/includes/widgets/rightside/show.pug

@@ -8,6 +8,9 @@
     if page.comment
         button.comment(type='button' title=_p('rightside.show.comment') onclick="sco.scrollTo('post-comment')")
             i.fas.fa-comment
+    if theme.comment.commentBarrage && page.comment
+        button.barrage.pc(type='button' title=_p('rightside.show.barrage') onclick="sco.switchCommentBarrage()")
+            span= _p('rightside.show.barrage')
     button.top(type='button' title=_p('rightside.show.top') onclick='sco.toTop()')
         i.fas.fa-arrow-up
         span#percent= "0"

layout/includes/widgets/third-party/music.pug

@@ -1,3 +1,3 @@
-div.needEndHide#nav-music(onclick="sco.musicToggle()")
-    div#nav-music-hoverTips=__('music.hit')
-    meting-js(id=theme.capsule.id, server=theme.capsule.server, type="playlist", mutex="true", preload="none", data-lrctype="0", order="random", theme="var(--efu-main)")
+div.needEndHide#nav-music
+  #nav-music-hoverTips(onclick='sco.musicToggle()')= __('music.hit')
+  meting-js(id=theme.capsule.id server=theme.capsule.server type="playlist" mutex="true" preload="none" theme="var(--efu-main)" data-lrctype="0" order="random" volume=theme.capsule.volume)

package.json

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

plugins.yml

@@ -1,11 +1,11 @@
 algolia_search:
   name: algoliasearch
   file: dist/algoliasearch-lite.umd.js
-  version: 4.24.0
+  version: 5.4.1
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.73.3
+  version: 4.74.1
 pjax:
   name: pjax
   file: pjax.min.js
@@ -18,11 +18,11 @@ waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 3.3.0
+  version: 3.3.1
 waline_css:
   name: '@waline/client'
   file: dist/waline.css
-  version: 3.3.0
+  version: 3.3.1
   other_name: waline
 valine:
   name: valine
@@ -31,11 +31,11 @@ valine:
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.8.7
+  version: 2.9.0
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.8.7
+  version: 2.9.0
 katex:
   name: katex
   file: dist/katex.min.css

scripts/event/merge_config.js

@@ -231,6 +231,7 @@ hexo.extend.filter.register('before_generate', () => {
       id: '8407304077',
       server: 'netease',
       type: 'playlist',
+      volume: 0.8,
     },
     keyboard: {
       enable: false,

source/css/_global/function.styl

@@ -54,6 +54,10 @@ maxWidth1024()
   @media screen and (max-width: 1024px)
     {block}
 
+maxWidth1199()
+  @media screen and (max-width: 1199px)
+    {block}
+
 maxWidth1200()
   @media screen and (max-width: 1200px)
     {block}

source/css/_global/index.styl

@@ -362,16 +362,24 @@ i.solitude
   line-height 1
   font-synthesis style
 
+#body-wrap
+  display: flex
+  flex-direction: column
+  min-height: 100vh
+  justify-content: space-between
+
 .layout
   display: flex
   margin: 0 auto
   padding: 0 1.5rem
+  width 100%
   max-width: 1200px
   +maxWidth768()
     padding 0
 
   &#content-inner
     max-width: 1400px
+    flex-grow: 1
 
   /.hide-aside.layout
     max-width: 1400px

source/css/_layout/aside.styl

@@ -6,13 +6,13 @@
   else
     order 2
 
-  +minWidth900()
+  +minWidth1200()
     if hexo-config('aside.position') == 0
       padding-right 15px
     else
       padding-left 15px
 
-  +maxWidth1200()
+  +maxWidth1199()
     .card-widget:not(#card-toc)
       display: none