Merge pull request #170 from valor-x/dev

v1.5.6

README.md

@@ -1,12 +1,12 @@
-简体中文丨[繁体中文](README_zh-tw.md)丨[English](README_EN.md)
+[简体中文](README_zh-cn.md)丨[繁体中文](README_zh-tw.md)丨English
 
 <div align="center">
 
    <img src=".github/logo.svg" alt="Solitude logo" height="200">
 
-   <h1 align="center">Hexo Theme Solitude</h1>
+  <h1 align="center">Hexo Theme Solitude</h1>
 
-   <p align="center">一款优雅的 Hexo 主题，支持懒加载、PWA、Latex以及多种评论系统。</p>
+  <p align="center">An elegant Hexo theme that supports lazy loading, PWA, Latex, and multiple comment systems.</p>
 
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![https://img.shields.io/npm/v/hexo-theme-solitude?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-solitude?color=%09%23bf00ff)
@@ -15,47 +15,47 @@
 [![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
 [![GitHub all releases](https://img.shields.io/github/downloads/valor-x/hexo-theme-solitude/total)](https://github.com/valor-x/hexo-theme-solitude/releases/latest)
 
-[预览](https://solitude-demo.efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
+[Preview](https://solitude-demo.efu.me/) 丨  [Documentation](https://solitude-docs.efu.me/)
 
 </div>
 
 ![Screenshot](.github/screenshot.png)
 
-## 特性
+## Features
 
-- 页面懒加载（Pjax）、图片懒加载（LazyLoad）、离线应用（PWA）
-- 评论(Twikoo、Waline)
-- 显示切换(ColorMode)
-- 灯箱(medium-zoom、fancybox)
-- 数学公式(Latex)
-- 特色页面：即刻短文、我的装备、在线工具、音乐馆、友链鱼塘、相册页、豆瓣页
-- 文章功能：AI 摘要、代码高亮
+- Pjax、LazyLoad、PWA
+- Comments(Twikoo、Waline)
+- ColorMode
+- Lightbox(medium-zoom、fancybox)
+- Mathematical formulas(Latex)
+- Featured pages: Instant Short Article, My Equipment, Online Tools, Music Gallery, Friend Chain Fish Pond, Photo Album Page, Douban Page
+- Article features: AI summary, code highlighting
 
 ## Todo
 
-- [x] Waline 评论支持
-- [ ] Tags plugin 插件化
-- [ ] 相册页重构
+- [x] Support Waline
+- [ ] Tags plugin
+- [ ] Album reconstruction(Removed, to be refactored)
 
-## 应用
+## Setup
 
-1. 使用 NPM 包进行安装
+1. Use the NPM package
       ```bash
       npm i hexo-theme-solitude
       ```
-2. 应用主题
+2. Apply
       ```yaml
       theme: solitude
       ```
-
-前往 [文档](https://solitude-docs.efu.me/) 获取更多信息。
 
-## 贡献者
+Check out the [Documentation](https://solitude-docs.efu.me/) for more information.
+
+## Contributors
 
 <a href="https://github.com/valor-x/hexo-theme-solitude/graphs/contributors">
   <img alt="contributors" src="https://contrib.rocks/image?repo=valor-x/hexo-theme-solitude" />
 </a>
 
-**主题由 [@张洪Heo](https://github.com/zhheo) 作者全权授权、设计！**
+**Theme is fully licensed and designed by the author of [@张洪Heo](https://github.com/zhheo)!**
 
-> 欢迎你对本主题做出贡献！[贡献指南](/CONTRIBUTING.md)
+> You are welcome to contribute to this topic! [Contribution Guide](/CONTRIBUTING.md)

README_EN.md → README_zh-cn.md

@@ -1,12 +1,12 @@
-[简体中文](README.md)丨[繁体中文](README_zh-tw.md)丨English
+简体中文丨[繁体中文](README_zh-tw.md)丨[English](README.md)
 
 <div align="center">
 
    <img src=".github/logo.svg" alt="Solitude logo" height="200">
 
-  <h1 align="center">Hexo Theme Solitude</h1>
+   <h1 align="center">Hexo Theme Solitude</h1>
 
-  <p align="center">An elegant Hexo theme that supports lazy loading, PWA, Latex, and multiple comment systems.</p>
+   <p align="center">一款优雅的 Hexo 主题，支持懒加载、PWA、Latex以及多种评论系统。</p>
 
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![https://img.shields.io/npm/v/hexo-theme-solitude?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-solitude?color=%09%23bf00ff)
@@ -15,47 +15,47 @@
 [![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
 [![GitHub all releases](https://img.shields.io/github/downloads/valor-x/hexo-theme-solitude/total)](https://github.com/valor-x/hexo-theme-solitude/releases/latest)
 
-[Preview](https://solitude-demo.efu.me/) 丨  [Documentation](https://solitude-docs.efu.me/)
+[预览](https://solitude-demo.efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
 
 </div>
 
 ![Screenshot](.github/screenshot.png)
 
-## Features
+## 特性
 
-- Pjax、LazyLoad、PWA
-- Comments(Twikoo、Waline)
-- ColorMode
-- Lightbox(medium-zoom、fancybox)
-- Mathematical formulas(Latex)
-- Featured pages: Instant Short Article, My Equipment, Online Tools, Music Gallery, Friend Chain Fish Pond, Photo Album Page, Douban Page
-- Article features: AI summary, code highlighting
+- 页面懒加载（Pjax）、图片懒加载（LazyLoad）、离线应用（PWA）
+- 评论(Twikoo、Waline)
+- 显示切换(ColorMode)
+- 灯箱(medium-zoom、fancybox)
+- 数学公式(Latex)
+- 特色页面：即刻短文、我的装备、在线工具、音乐馆、友链鱼塘、相册页、豆瓣页
+- 文章功能：AI 摘要、代码高亮
 
 ## Todo
 
-- [x] Support Waline
-- [ ] Tags plugin
-- [ ] Album reconstruction
+- [x] Waline 评论支持
+- [ ] Tags plugin 插件化
+- [ ] 相册页重构（已移除，待重构）
 
-## Setup
+## 应用
 
-1. Use the NPM package
+1. 使用 NPM 包进行安装
       ```bash
       npm i hexo-theme-solitude
       ```
-2. Apply
+2. 应用主题
       ```yaml
       theme: solitude
       ```
+
+前往 [文档](https://solitude-docs.efu.me/) 获取更多信息。
 
-Check out the [Documentation](https://solitude-docs.efu.me/) for more information.
-
-## Contributors
+## 贡献者
 
 <a href="https://github.com/valor-x/hexo-theme-solitude/graphs/contributors">
   <img alt="contributors" src="https://contrib.rocks/image?repo=valor-x/hexo-theme-solitude" />
 </a>
 
-**Theme is fully licensed and designed by the author of [@张洪Heo](https://github.com/zhheo)!**
+**主题由 [@张洪Heo](https://github.com/zhheo) 作者全权授权、设计！**
 
-> You are welcome to contribute to this topic! [Contribution Guide](/CONTRIBUTING.md)
+> 欢迎你对本主题做出贡献！[贡献指南](/CONTRIBUTING.md)

README_zh-tw.md

@@ -1,4 +1,4 @@
-[简体中文](README.md)丨繁体中文丨[English](README_EN.md)
+[简体中文](README_zh-cn.md)丨繁体中文丨[English](README.md)
 
 <div align="center">
 
@@ -35,7 +35,7 @@
 
 - [x] Waline 評論支援
 - [ ] Tags plugin 外掛程式化
-- [ ] 相冊頁重構
+- [ ] 相冊頁重構（已移除，待重構）
 
 ## 應用
 

layout/includes/inject/body.pug

@@ -20,9 +20,6 @@ div
     if theme.mermaid
         script(src=url_for(theme.cdn.mermaid_js))
 
-    if theme.album.enable
-        script(src=url_for(theme.cdn.macy_js))
-
     if theme.rightside.enable
         include ../widgets/rightside/index
         script(src=url_for(theme.cdn.rightside_js))
@@ -116,9 +113,6 @@ div#js-pjax
     if theme.mermaid
         script.
             mermaid.run();
-    if page.type === 'album' && theme.album.enable
-        script.
-            initGallery()
     if is_home() && theme.says.home_mini
         script.
             sco.initbbtalk();

layout/includes/inject/head.pug

@@ -78,7 +78,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.5",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.6",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"

layout/includes/page/music.pug

@@ -1,16 +1,6 @@
 if theme.music.enable
     #Music-bg
     #Music-page
+        meting-js(id=theme.music.id, server=theme.music.server, type=theme.music.type, mutex=theme.music.mutex, volume=theme.music.volume, preload="none", data-lrctype="0", order="random")
     .Music-loading
-        div APlayer加载中...
-
-    script.
-        if (!window.musicConfig) {
-            window.musicConfig = {
-                userId: '#{theme.music.id}',
-                userServer: "#{theme.music.server}",
-                userType: "#{theme.music.type}",
-                volume: #{theme.music.volume},
-                mutex: #{theme.music.mutex}
-            }
-        }
+        div APlayer加载中...

layout/includes/widgets/page/about/personalities.pug

@@ -7,7 +7,7 @@ if personalities
             span.author-content-item-title= personalities.title
             .title2(style=`color:${personalities.color}`)= personalities.type
             .image
-                img(src=personalities.image)
+                img.nolazyload(src=personalities.image)
             .post-tips
                 | 在
                 a(href="https://www.16personalities.com/")= personalities.linkText

package.json

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

source/css/_global/function.styl

@@ -58,6 +58,10 @@ minWidth1200()
   @media screen and (min-width: 1200px)
     {block}
 
+minWidth1201()
+  @media screen and (min-width: 1201px)
+    {block}
+
 maxWidth1024()
   @media screen and (max-width: 1024px)
     {block}

source/css/_page/_home/home-top.styl

@@ -128,7 +128,7 @@
   /.topGroup
     display: flex
 
-    +minWidth1200()
+    +minWidth1201()
       display flex
       flex-direction row
       flex-wrap wrap

source/css/_page/music.styl

@@ -26,7 +26,6 @@ body[data-type=music]
   left -50%
   background-size 40%
   transition 0.6s
-  background-image url(https://bu.dusays.com/2023/11/08/654af68b25bb8.jpg)
 
   &:before
     content ''
@@ -54,6 +53,7 @@ body[data-type=music]
 
   .aplayer-body 
     width 70%
+    height 88vh
 
     +maxWidth798()
       width 100%
@@ -64,10 +64,10 @@ body[data-type=music]
       left 0
       right 0
       top 0
-      height calc(var(--vh) - 250px)
+      height 75vh
 
   ol
-    max-height calc(var(--vh) - 170px)!important
+    max-height 88vh !important
 
     +maxWidth798()
       max-height 100%!important
@@ -194,7 +194,7 @@ body[data-type=music]
       +maxWidth798()
         display flex
         position fixed
-        top calc(var(--vh) - 178px)
+        top 88vh
         left 0
         margin 0
         margin-left 32px
@@ -229,7 +229,7 @@ body[data-type=music]
 
     .aplayer-lrc 
       padding-top 240px
-      height var(--vh)
+      height 100vh
 
       +maxWidth798()
         margin-top 0
@@ -254,7 +254,7 @@ body[data-type=music]
         opacity 0.3
         transition all 0.9s cubic-bezier(0.56, 0.17, 0.22, 0.76)
         user-select none
-        text-shadow 0px 4px 0px #ffffff00
+        text-shadow 0 4px 0 #ffffff00
         overflow hidden
 
         +maxWidth798()
@@ -414,10 +414,10 @@ body[data-type=music]
       bottom 0px
       left 0
       background var(--efu-white)
-      border-radius 16px 16px 0px 0px
-      padding 15px 0px
+      border-radius 16px 16px 0 0
+      padding 15px 0
       max-width 100%
-      height calc(var(--vh) - 200px)
+      height 75vh
 
       &.aplayer-list-hide
         bottom -100% !important

source/js/main.js

@@ -792,7 +792,6 @@ window.refreshFn = () => {
     GLOBAL_CONFIG.comment.commentBarrage && PAGE_CONFIG.comment && initializeCommentBarrage()
     document.body.setAttribute('data-type', PAGE_CONFIG.page)
     PAGE_CONFIG.page === "music" && scoMusic.init()
-    GLOBAL_CONFIG.music.enable && !document.querySelector('#Music-page') && document.removeEventListener('keydown', scoMusic.setKeydown)
     GLOBAL_CONFIG.ai.enable && PAGE_CONFIG.page === "post" && ScoAI.init()
 }