hexo-theme-solitude 2.1.1 → 2.1.3

package/_config.yml

@@ -12,6 +12,8 @@
 # 赞助：https://afdian.com/a/everfu
 # ---------------------------
 
+### Basic configuration
+
 # --------------------------- start ---------------------------
 # Site information
 # 网站信息
@@ -169,15 +171,6 @@ aside:
     backcolor: "var(--efu-blue)" # Background color
   # --------------------------- end ---------------------------
 
-  # --------------------------- start ---------------------------
-  # recent comments(⚠️ Comments need to be configured first.)
-  # 最新评论(⚠️ 需要先配置评论)
-  newest_comment:
-    enable: true
-    storage: .5 # 缓存时间 1: 1天 / .5 : 半天 / Cache time 1: 1 day .5 : half a day
-    limit: 5 # 评论数 / Number of comments
-  # --------------------------- end ---------------------------
-
   # --------------------------- start ---------------------------
   # article table of contents
   # 文章目录
@@ -232,15 +225,6 @@ aside:
   # --------------------------- end ---------------------------
 # --------------------------- end ---------------------------
 
-# --------------------------- start ---------------------------
-# Home page article configuration information
-# 首页文章配置信息
-index_post_list:
-  direction: column # row / column
-  column: 2 # 2: 2 columns 3: 3 columns
-  cover: both
-# --------------------------- end ---------------------------
-
 # --------------------------- start ---------------------------
 # Page default settings
 # 页面默认设置
@@ -388,6 +372,60 @@ display_mode:
   universe: false
 # --------------------------- end ---------------------------
 
+# --------------------------- start ---------------------------
+# Font
+# 字体
+font:
+  font-size: 16px
+  code-font-size: 16px
+  # Global font
+  # 全局字体
+  font-family: "PingFang SC, Hiragino Sans GB, Microsoft YaHei"
+  # Code font
+  # 代码字体
+  code-font-family: '"monospace", monospace'
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# Background
+# 背景图片
+background:
+  enable: false
+  opacity: .2
+  dark: https://i.pinimg.com/originals/d8/b3/9d/d8b39d12b653810db452c437211aeb2e.png
+  light: https://i.pinimg.com/originals/93/57/38/935738ed9657b296c2ef0ebd2151eb66.jpg
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# Lure
+# When the user exits the page, modify the title
+# 当用户退出页面时，修改标题
+lure:
+  enable: false
+  jump: 404 Not Found
+  back: ヾ(≧∇≦*)ゝHey, hey, you fell for it.
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# Article expiration
+# 文章过期
+expire:
+  enable: false
+  time: 30 # days
+  position: top # top / bottom
+  text_prev: "This article expired "
+  text_next: " day ago, if the content does not match, please contact the webmaster to update it."
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# Home page article configuration information
+# 首页文章配置信息
+index_post_list:
+  direction: column # row / column
+  column: 2 # 2: 2 columns 3: 3 columns
+  cover: both
+# --------------------------- end ---------------------------
+
 # --------------------------- start ---------------------------
 # Related articles
 # 相关文章
@@ -399,6 +437,113 @@ related_post:
   date_type: created
 # --------------------------- end ---------------------------
 
+# --------------------------- start ---------------------------
+# Custom right menu
+# 自定义右键菜单
+right_menu:
+  enable: false
+  # Whether to display the hot comment switch.
+  # 是否显示热门评论开关
+  commentBarrage: false
+  # Whether to display the browser's context menu when hold Ctrl key.
+  # 是否在按住 Ctrl 键时显示浏览器右键菜单
+  ctrlOriginalMenu: false
+  # Simplified and Traditional Chinese translation.
+  # 简繁体转换
+  translate: false
+  # Custom list
+  # 自定义列表
+  custom_list:
+    # - name: 随机文章
+    #   click: toRandomPost()
+    #   id: menu-randomPost
+    #   class:
+    #   icon: fas fa-tower-broadcast
+    # - name: 全部分类
+    #   click: pjax.loadUrl('/categories/') # External links with window.open, pjax can not request cross-domain content.
+    #   id:
+    #   class:
+    #   icon: fas fa-clone
+    # - name: 全部标签
+    #   click: pjax.loadUrl('/tags/')
+    #   id:
+    #   class:
+    #   icon: fas fa-tags
+# --------------------------- end -----------------------
+
+# --------------------------- start ---------------------------
+# Copy
+#  information
+# 复制信息
+copy:
+  enable: false
+  # Turn on Link copyright information after copying.
+  # 复制后链接版权信息
+  copyright:
+    enable: false
+    # Display when the number of words copied exceeds
+    # 复制文字时超过多少字数显示
+    limit: 50
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# Mermaid
+mermaid: false
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# Chart.js
+chart: false
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# typeit
+typeit: false
+# --------------------------- end ---------------------------
+
+### Extended configuration
+
+# --------------------------- start ---------------------------
+# Console
+# 控制台
+console:
+  enable: false
+  # Recent comments
+  # 最新评论
+  recentComment:
+    enable: false
+    # Cache time 1: 1 day / .5 : half a day
+    # 缓存时间 1: 1天 / .5 : 半天
+    storage: .2
+  card:
+    # Tags
+    # 标签
+    tags: true
+    # Archives
+    # 归档
+    archive: true
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+translate:
+  enable: true
+  defaultEncoding: 2 # 1: 默认繁体 2: 默认简体
+  translateDelay: 0 # 首次加载翻译迟疑时间
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# Right-Sidebar
+# 右下角悬停导航栏
+rightside:
+  enable: false
+  percent: false
+  hide:
+    enable: false
+    translate: false
+    mode: false
+    aside: false
+# --------------------------- start ---------------------------
+
 # --------------------------- start ---------------------------
 # Footer
 # 页脚
@@ -408,7 +553,7 @@ footer:
     author: false # img url / false
     left:
       # Github: https://github.com/everfu || fab fa-github # Name: link || icon
-      # Mail: mailto:o@efu.me || fab fa-envelope
+      # Mail: mailto:o@everfu.cn || fab fa-envelope
     right:
       # Bilibili: https://space.bilibili.com/1329819902 || fab fa-bilibili
       # Douyin: https://v.douyin.com/iJsLc8jt/ || fab fa-tiktok
@@ -449,57 +594,15 @@ errorpage:
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# Says Page
-# 即可短文
-says:
-  enable: false
-  home_mini: false
-  page: /essay/
-  style: 1
-  strip: 30
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# Recent comments Page
-# 最近评论页面
-recent_comments:
-  enable: false
-  limit: 50 # ⚠️waline 仅支持最大50条评论 / ⚠️waline only supports a maximum of 50 comments
-  cache: 0.2 # 1 = 1天 / 1 = 1 day
-  page: /recentcomments/ # 最近评论页面 / recent comments page
-  img: /img/recent_c.avif # 中控台显示图片（不填不显示） / image displayed in the console
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# Danmaku Page
-# 弹幕留言页面
-envelope:
-  enable: false
-  line: 10 # 显示行数
-  speed: 20 # 播放速度
-  hover: true # 鼠标悬停暂停
-  loop: true # 循环播放
-  page: /message/ # 留言板页面 / message board page
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
+# Meting API
 # This part of the content uses metingjs,
 # can only use NetEase Cloud Music, QQ Music and other music platforms supported by the mainland China region,
 # the subsequent consideration of the use of JSON files to store music information and customize the implementation of the third-party API does not depend on the page.
 # Music Page
 meting_api: "https://meting.everfu.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r" # Custom API
-music:
-  enable: false
-  # 歌单 ID / 单曲 ID
-  id: 1994908354
-  # 服务商：netease / qq / xiami / kugou / baidu
-  server: netease
-  # 类型：playlist / song
-  type: playlist
-  # 默认音量
-  volume: 0.8
-  # 是否自动播放
-  mutex: true
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
 # Capsule music
 # 音乐胶囊
 capsule:
@@ -534,21 +637,6 @@ keyboard:
     #   url: /links/
 # --------------------------- end ---------------------------
 
-# --------------------------- start ---------------------------
-# Copy
-#  information
-# 复制信息
-copy:
-  enable: false
-  # Turn on Link copyright information after copying.
-  # 复制后链接版权信息
-  copyright:
-    enable: false
-    # Display when the number of words copied exceeds
-    # 复制文字时超过多少字数显示
-    limit: 50
-# --------------------------- end ---------------------------
-
 # --------------------------- start ---------------------------
 # Lazyload
 # 图片懒加载
@@ -606,18 +694,15 @@ mediumZoom: false # mediumZoom
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# Mermaid
-mermaid: false
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# Chart.js
-chart: false
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# typeit
-typeit: false
+# Memorial
+# Turn the entire site gray on memorable days.
+# 在纪念日整个网站变灰
+memorial:
+  enable: false
+  date:
+  #  - 7-7
+  #  - 9-18
+  #  - 12-13 # 国家公祭日
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
@@ -642,51 +727,6 @@ OpenGraph:
 wordcount: false
 # --------------------------- end ---------------------------
 
-# --------------------------- start ---------------------------
-# Busuanzi
-busuanzi: false
-# 0: Original / 1: Custom
-# 0: 原版 / 1: 自定义版
-busuanzi_use: 0
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# Search
-# warning: Please open the search page config: https://solitude.js.org/search/algolia or https://solitude.js.org/search/local
-# 警告: 请打开搜索页面配置: https://solitude.js.org/zh/search/algolia 或 https://solitude.js.org/zh/search/local
-search:
-  enable: false
-  # type: 使用的搜索引擎 / search engine
-  type: local # local / algolia
-  tags:
-    # - Solitude
-    # - Hexo
-  algolia:
-    # hits:
-    #   per_page: 6
-  local:
-    preload: false
-    CDN: # url: search.xml
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# This part is only supported in mainland China, and we will consider supporting ChatGPT Key in the future.
-# 该部分仅支持中国大陆，后续会考虑支持 ChatGPT Key。
-tianli_talk:
-  enable: false
-  title: 智能客服与搜索 # title
-  key: # key
-  option:
-post_ai:
-  enable: false
-  modelName: GPT 4
-  key:
-  talk: # 我是 Efu 开发的摘要生成助理EfuGPT，EfuGPT在静态部署时进行摘要的撰写，并且在访客访问时通过EfuCorrection转译后的文本摘要实现工具。我在这里只负责已经生成的摘要显示，你无法与我直接沟通，但我可以回答一些预设的问题。
-  randomPost: false
-  report: https://solitude.js.org
-  tips: # 此内容根据文章生成，并经过人工审核，仅用于文章内容的解释与总结
-# --------------------------- end ---------------------------
-
 # --------------------------- start ---------------------------
 # Katex
 # Latex formula support
@@ -701,6 +741,53 @@ katex:
   copytex: false
 # --------------------------- end ---------------------------
 
+# --------------------------- start ---------------------------
+# verification
+# 验证
+verify_site:
+  # - name: google-site-verification
+  #   content: xxxxxx
+  # - name: baidu-site-verification
+  #   content: xxxxxxx
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# CSS Prefix
+# CSS 前缀
+# When turned on, it will automatically prefix the CSS (to get better browser support), but this will increase the size of the CSS file.
+# 开启后会自动给 CSS 加前缀（以获得更好的浏览器支持），但这会增加 CSS 文件的大小。
+css_prefix: false
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# Extend
+# 扩展
+extends:
+  # Insert in head
+  # 插入到 head
+  head:
+  #  - <script src="https://cdn.bootcdn.net/ajax/libs/pace/1.2.4/pace.min.js"></script>
+
+  # Insert in body
+  # 插入到 body
+  body:
+  #  - <script src="https://cdn.bootcdn.net/ajax/libs/pace/1.2.4/pace.min.js"></script>
+# --------------------------- end ---------------------------
+
+# --------------------------- start ---------------------------
+# PWA
+# Progressive Web App
+pwa:
+  enable: false
+  manifest: /manifest.json # manifest.json
+  theme_color: "#006a73" # Theme color
+  mask_icon: /img/pwa/favicon.png # Mask icon
+  apple_touch_icon: /img/pwa/favicon.png # Apple touch icon
+  bookmark_icon: /img/pwa/favicon.png # Bookmark icon
+  favicon_32_32: /img/pwa/favicon_32.png # 32x32 icon
+  favicon_16_16: /img/pwa/favicon_16.png # 16x16 icon
+# --------------------------- end ---------------------------
+
 # --------------------------- start ---------------------------
 # Comment
 # 评论
@@ -727,6 +814,12 @@ comment:
     enable: false
     # Number of hot comments
     count: 3
+  # recent comments(⚠️ Comments need to be configured first.)
+  # 最新评论(⚠️ 需要先配置评论)
+  newest_comment:
+    enable: true
+    storage: .5 # 缓存时间 1: 1天 / .5 : 半天 / Cache time 1: 1 day .5 : half a day
+    limit: 5 # 评论数 / Number of comments
 # Twikoo: https://solitude.js.org/comment/twikoo
 twikoo: # https://twikoo.js.org/
   envId: # url: https://twikoo.sondy.top/
@@ -766,85 +859,97 @@ giscus:
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# Console
-# 控制台
-console:
+# Search
+search:
   enable: false
-  # Recent comments
-  # 最新评论
-  recentComment:
-    enable: false
-    # Cache time 1: 1 day / .5 : half a day
-    # 缓存时间 1: 1天 / .5 : 半天
-    storage: .2
-  card:
-    # Tags
-    # 标签
-    tags: true
-    # Archives
-    # 归档
-    archive: true
+  # type: 使用的搜索引擎 / search engine
+  type: local # local / algolia
+  tags:
+    # - Solitude
+    # - Hexo
+  algolia:
+    # hits:
+    #   per_page: 6
+  local:
+    preload: false
+    CDN: # url: search.xml
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# verification
-# 验证
-verify_site:
-  # - name: google-site-verification
-  #   content: xxxxxx
-  # - name: baidu-site-verification
-  #   content: xxxxxxx
+# Music Page
+# 音乐馆
+music:
+  enable: false
+  # 歌单 ID / 单曲 ID
+  id: 1994908354
+  # 服务商：netease / qq / xiami / kugou / baidu
+  server: netease
+  # 类型：playlist / song
+  type: playlist
+  # 默认音量
+  volume: 0.8
+  # 是否自动播放
+  mutex: true
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# CSS Prefix
-# CSS 前缀
-# When turned on, it will automatically prefix the CSS (to get better browser support), but this will increase the size of the CSS file.
-# 开启后会自动给 CSS 加前缀（以获得更好的浏览器支持），但这会增加 CSS 文件的大小。
-css_prefix: false
+# Danmaku Page
+# 弹幕留言页面
+envelope:
+  enable: false
+  line: 10 # 显示行数
+  speed: 20 # 播放速度
+  hover: true # 鼠标悬停暂停
+  loop: true # 循环播放
+  page: /message/ # 留言板页面 / message board page
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# Font
-# 字体
-font:
-  font-size: 16px
-  code-font-size: 16px
-  # Global font
-  # 全局字体
-  font-family: "PingFang SC, Hiragino Sans GB, Microsoft YaHei"
-  # Code font
-  # 代码字体
-  code-font-family: '"monospace", monospace'
+# Says Page
+# 即可短文
+says:
+  enable: false
+  home_mini: false
+  page: /essay/
+  style: 1
+  strip: 30
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# Extend
-# 扩展
-extends:
-  # Insert in head
-  # 插入到 head
-  head:
-  #  - <script src="https://cdn.bootcdn.net/ajax/libs/pace/1.2.4/pace.min.js"></script>
+# Recent comments Page
+# 最近评论页面
+recent_comments:
+  enable: false
+  limit: 50 # ⚠️waline 仅支持最大50条评论 / ⚠️waline only supports a maximum of 50 comments
+  cache: 0.2 # 1 = 1天 / 1 = 1 day
+  page: /recentcomments/ # 最近评论页面 / recent comments page
+  img: /img/recent_c.avif # 中控台显示图片（不填不显示） / image displayed in the console
+# --------------------------- end ---------------------------
 
-  # Insert in body
-  # 插入到 body
-  body:
-  #  - <script src="https://cdn.bootcdn.net/ajax/libs/pace/1.2.4/pace.min.js"></script>
+# --------------------------- start ---------------------------
+# Busuanzi
+busuanzi: false
+# 0: Original / 1: Custom
+# 0: 原版 / 1: 自定义版
+busuanzi_use: 0
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# PWA
-# Progressive Web App
-pwa:
+# This part is only supported in mainland China, and we will consider supporting ChatGPT Key in the future.
+# 该部分仅支持中国大陆，后续会考虑支持 ChatGPT Key。
+tianli_talk:
   enable: false
-  manifest: /manifest.json # manifest.json
-  theme_color: "#006a73" # Theme color
-  mask_icon: /img/pwa/favicon.png # Mask icon
-  apple_touch_icon: /img/pwa/favicon.png # Apple touch icon
-  bookmark_icon: /img/pwa/favicon.png # Bookmark icon
-  favicon_32_32: /img/pwa/favicon_32.png # 32x32 icon
-  favicon_16_16: /img/pwa/favicon_16.png # 16x16 icon
+  title: 智能客服与搜索 # title
+  key: # key
+  option:
+post_ai:
+  enable: false
+  modelName: GPT 4
+  key:
+  talk: # 我是 Efu 开发的摘要生成助理EfuGPT，EfuGPT在静态部署时进行摘要的撰写，并且在访客访问时通过EfuCorrection转译后的文本摘要实现工具。我在这里只负责已经生成的摘要显示，你无法与我直接沟通，但我可以回答一些预设的问题。
+  randomPost: false
+  report: https://solitude.js.org
+  tips: # 此内容根据文章生成，并经过人工审核，仅用于文章内容的解释与总结
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
@@ -874,103 +979,6 @@ google_adsense:
   slot: # 4236388782
 # --------------------------- end ---------------------------
 
-# --------------------------- start ---------------------------
-# Custom right menu
-# 自定义右键菜单
-right_menu:
-  enable: false
-  # Whether to display the hot comment switch.
-  # 是否显示热门评论开关
-  commentBarrage: false
-  # Whether to display the browser's context menu when hold Ctrl key.
-  # 是否在按住 Ctrl 键时显示浏览器右键菜单
-  ctrlOriginalMenu: false
-  # Simplified and Traditional Chinese translation.
-  # 简繁体转换
-  translate: false
-  # Custom list
-  # 自定义列表
-  custom_list:
-    # - name: Random
-    #   click: toRandomPost()
-    #   id: menu-randomPost
-    #   class:
-    #   icon: fas fa-tower-broadcast
-    # - name: Categories
-    #   click: pjax.loadUrl('/categories/') # External links with window.open, pjax can not request cross-domain content.
-    #   id:
-    #   class:
-    #   icon: fas fa-clone
-    # - name: Tags
-    #   click: pjax.loadUrl('/tags/')
-    #   id:
-    #   class:
-    #   icon: fas fa-tags
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# Memorial
-# Turn the entire site gray on memorable days.
-# 在纪念日整个网站变灰
-memorial:
-  enable: false
-  date:
-  #  - 7-7
-  #  - 9-18
-  #  - 12-13 # 国家公祭日
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# Lure
-# When the user exits the page, modify the title
-# 当用户退出页面时，修改标题
-lure:
-  enable: false
-  jump: 404 Not Found
-  back: ヾ(≧∇≦*)ゝHey, hey, you fell for it.
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# Article expiration
-# 文章过期
-expire:
-  enable: false
-  time: 30 # days
-  position: top # top / bottom
-  text_prev: "This article expired "
-  text_next: " day ago, if the content does not match, please contact the webmaster to update it."
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# Background
-# 背景图片
-background:
-  enable: false
-  opacity: .2
-  dark: https://i.pinimg.com/originals/d8/b3/9d/d8b39d12b653810db452c437211aeb2e.png
-  light: https://i.pinimg.com/originals/93/57/38/935738ed9657b296c2ef0ebd2151eb66.jpg
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-translate:
-  enable: true
-  defaultEncoding: 2 # 1: 默认繁体 2: 默认简体
-  translateDelay: 0 # 首次加载翻译迟疑时间
-# --------------------------- end ---------------------------
-
-# --------------------------- start ---------------------------
-# Right-Sidebar
-# 右下角悬停导航栏
-rightside:
-  enable: false
-  percent: false
-  hide:
-    enable: false
-    translate: false
-    mode: false
-    aside: false
-# --------------------------- start ---------------------------
-
 # --------------------------- start ---------------------------
 # Do not modify unless necessary
 # 非必要请勿修改

package/languages/zh-CN.yml

@@ -114,7 +114,7 @@ aside:
   back: 欢迎再次回来，
   sticker: 心情贴纸
   newpost: 最近发布
-  newcomment: 最新评论
+  newcomment: 最近评论
   card:
     posts: '累计文章数:'
     tags: '标签总数:'

package/languages/zh-TW.yml

@@ -114,7 +114,7 @@ aside:
   back: 歡迎再次回來，
   sticker: 心情貼紙
   newpost: 最近發佈
-  newcomment: 最新評論
+  newcomment: 最近評論
   card:
     posts: '累計文章數:'
     tags: '標籤總數:'

package/layout/includes/widgets/post/copyright.pug

@@ -2,9 +2,9 @@
 .post-copyright
     .post-copyright__author_group
         a.post-copyright__author_img(href=url_for(copyright.author.url))
-            img.post-copyright__author_img_front(src=copyright.author.img || theme.site.icon)
-        .post-copyright__author_name= config.title
-        .post-copyright__author_desc= config.subtitle
+            img.post-copyright__author_img_front(src=page.avatar || copyright.author.img || theme.site.icon)
+        .post-copyright__author_name= page.author || config.title
+        .post-copyright__author_desc= page.desc || config.subtitle
     .post-tools#post-tools
         .post-tools-left
             #quit-box(onclick="RemoveRewardMask()")

package/layout/includes/widgets/third-party/comments/comment.pug

@@ -21,6 +21,8 @@
                                     i.solitude.fa-solid.fa-spinner.fa-spin
                             when "Artalk"
                                 span.artalk-count
+                            when "Giscus"
+                                span.giscus-count
                     | )
 
         if use.length > 1

package/layout/includes/widgets/third-party/comments/giscus.pug

@@ -55,6 +55,6 @@ script.
                 loadGiscus()
             }
         } else {
-            window.loadOtherComment = loadGiscus
+            window.loadTwoComment = loadGiscus
         }
     })()

package/layout/includes/widgets/third-party/news-comment/newest-comment.pug

@@ -1,4 +1,4 @@
-- var limit = theme.aside.newest_comment.limit ? theme.aside.newest_comment.limit : 5
+- var limit = theme.comment.newest_comment.limit ? theme.comment.newest_comment.limit : 5
 if theme.comment.use
     case theme.comment.use[0]
         when 'Twikoo'

package/package.json

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

package/source/css/_layout/article-container.styl

@@ -51,8 +51,8 @@
       display none
 
     &::before
-      content "\e082"
-      font-family solitude
+      content "\f0c1"
+      font-family 'FontAwesome'
       cursor pointer
 
     &:hover
@@ -136,13 +136,13 @@
 
         &:before
           margin 0
-          top 0.78em
-          width 0.42em
-          height 0.42em
-          border-radius 0.42em
+          top .9em
+          width .2em
+          height .2em
+          border-radius 50%
           background 0 0
           content ""
-          line-height .42em
+          line-height .2em
           border 0.21em solid var(--efu-lighttext)
           background var(--efu-lighttext)
 

package/source/css/_layout/aside.styl

@@ -193,7 +193,7 @@
     +maxWidth1200()
         position: fixed
         right: 3rem
-        bottom: 2rem
+        bottom: 10px
         z-index: 100
         max-width: 380px
         max-height: calc(100% - 60px)
@@ -1040,7 +1040,7 @@ backcolor = convert(hexo-config('aside.flip.backcolor'))
   .card-widget.card-adsense
     padding 0
 
-if hexo-config('aside.newest_comment.enable')
+if hexo-config('comment.newest_comment.enable')
   .card-recent-comment
     .recent-comment-more
       margin-left auto
@@ -1060,7 +1060,7 @@ if hexo-config('aside.newest_comment.enable')
       position: relative
 
       &:not(:last-child)
-        border-bottom 1px dashed rgba(255, 255, 255, .1)
+        border-bottom var(--style-border-dashed)
 
       .thumbnail img
         width: 60px

package/source/css/_layout/recent-post.styl

@@ -23,6 +23,8 @@ if hexo-config('index_post_list.direction') == "column"
 
       +maxWidth1300()
         margin-bottom .5rem
+        #tag &
+          margin-top: 2.5rem
 
       +maxWidth768()
         border-radius 12px
@@ -253,6 +255,8 @@ else if hexo-config('index_post_list.direction') == "row"
       flex-direction row
       width 100%
       box-shadow var(--efu-shadow-border)
+      #tag &
+          margin-top: 2.5rem
 
       +maxWidth768()
         border-radius 12px

package/source/css/_layout/rightside.styl

@@ -2,7 +2,7 @@ if hexo-config('rightside.enable')
     #rightside
         position: fixed
         right: -2.5rem
-        bottom: 2.5rem
+        bottom: 20px
         z-index: 1000
         opacity: 0
         transition: all .5s

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

@@ -259,11 +259,6 @@
   flex-wrap wrap
   height 120px
 
-  +maxWidth1200()
-    flex-direction row
-    left 2rem
-    height 60px
-
 .banners-link-btn
   display flex
   flex-direction row

package/source/css/_page/equipment.styl

@@ -55,7 +55,6 @@
           line-height 1
           margin-bottom 8px
           white-space nowrap
-          overflow hidden
           text-overflow ellipsis
           width fit-content
 

package/source/css/_page/other.styl

@@ -171,6 +171,7 @@ div#banners
   color var(--efu-white)
   overflow hidden
   margin-top 0
+  margin-bottom: 12px
 
 .author-content-item
   flex 4

package/source/css/_page/recentcomment.styl

@@ -1,7 +1,7 @@
 div.console_recentcomments
   display flex
   flex-wrap wrap
-  gap 8px
+  gap 12px
   min-height 100px
   width 100%
 
@@ -15,7 +15,7 @@ div.console_recentcomments
   cursor pointer
   transition .3s
   overflow hidden
-  gap 8px
+  gap .5rem
   display flex
   flex-direction column
 

package/source/css/_post/commentBarrage.styl

@@ -1,7 +1,10 @@
 .comment-barrage
   position fixed
   bottom 0
-  right 20px
+  if hexo-config('rightside.enable')
+    right 2.5rem
+  else
+    right 20px
   padding 0 0 20px 10px
   display none
   flex-direction column

package/source/css/_post/copyright.styl

@@ -51,7 +51,8 @@
         text-align center
         font-size 14px
         color var(--efu-secondtext)
-        margin-top 4px
+        margin 4px 10px 0
+        line-height 1.5
 
     .post-copyright__notice
       font-size 12px

package/source/css/_post/meta.styl

@@ -263,6 +263,7 @@
           cursor pointer
           transition .3s
           border-radius 12px
+          padding: 8px
 
           &:hover
             opacity 1

package/source/css/_tags/tabs.styl

@@ -47,7 +47,7 @@
     margin 16px 0 0 auto
     color #99a9bf
 
-  margin 1rem 0 !important
+  margin 1rem 0
   border-radius 12px
   overflow hidden
   box-shadow var(--efu-shadow-border)

package/source/js/main.js

@@ -151,14 +151,14 @@ const sco = {
     }
   },
   musicToggle() {
-    const $music = document.querySelector('#nav-music');
-    const $meting = document.querySelector('meting-js');
-    const $console = document.getElementById('consoleMusic');
-    const $rm_text = document.querySelector('#menu-music-toggle span');
-    const $rm_icon = document.querySelector('#menu-music-toggle i');
+    const $music = document.querySelector('#nav-music') || null;
+    const $meting = document.querySelector('meting-js') || null;
+    const $console = document.getElementById('consoleMusic') || null;
+    const $rm_text = document.querySelector('#menu-music-toggle span') || null;
+    const $rm_icon = document.querySelector('#menu-music-toggle i') || null;
     this.musicPlaying = !this.musicPlaying;
     $music.classList.toggle("playing", this.musicPlaying);
-    $console.classList.toggle("on", this.musicPlaying);
+    $console && $console.classList.toggle("on", this.musicPlaying);
     if (this.musicPlaying) {
       $meting.aplayer.play();
       (typeof rm !== 'undefined') && rm?.menuItems.music[0] && ($rm_text.textContent = GLOBAL_CONFIG.right_menu.music.stop) && ($rm_icon.className = 'solitude fas fa-pause')
@@ -169,10 +169,11 @@ const sco = {
   },
   switchCommentBarrage() {
     let commentBarrageElement = document.querySelector(".comment-barrage");
+    let consoleCommentBarrage = document.querySelector("#consoleCommentBarrage");
     if (!commentBarrageElement) return;
     const isDisplayed = window.getComputedStyle(commentBarrageElement).display === "flex";
     commentBarrageElement.style.display = isDisplayed ? "none" : "flex";
-    document.querySelector("#consoleCommentBarrage").classList.toggle("on", !isDisplayed);
+    consoleCommentBarrage && consoleCommentBarrage.classList.toggle("on", !isDisplayed);
     utils.saveToLocal.set("commentBarrageSwitch", !isDisplayed, .2);
     rm?.menuItems.barrage && rm.barrage(isDisplayed)
   },
@@ -226,7 +227,9 @@ const sco = {
       entries.forEach(entry => {
         if (entry.isIntersecting) {
           setTimeout(() => {
-            waterfall(entry.target) || entry.target.classList.add('show');
+            waterfall(entry.target).then(() => {
+              entry.target.classList.add('show');
+            });
           }, 300);
         }
       });

package/source/js/right_menu.js

@@ -175,6 +175,7 @@ window.oncontextmenu = (ele) => {
     Array.from(display ? rm.menuItems.other : rm.menuItems.plugin).forEach(
         (item) => (item.style.display = "none")
     );
+
     Array.from(display ? rm.menuItems.plugin : rm.menuItems.other).forEach(
         (item) => (item.style.display = "block")
     );

package/source/js/third_party/waterfall.min.js

@@ -2,4 +2,4 @@
  * @license Copyright 2024 Ever Funnel. All rights reserved.
  * Licensed under the MIT License.
  */
-function waterfall(t){function e(t,e){var n=window.getComputedStyle(t);return parseFloat(n["margin"+e])||0}function n(t){return t+"px"}function r(t){return parseFloat(t.style.top)||0}function o(t){return parseFloat(t.style.left)||0}function i(t){return t.clientWidth}function l(t){return t.clientHeight}function u(t){return r(t)+l(t)+e(t,"Bottom")}function a(t){return o(t)+i(t)+e(t,"Right")}function s(t){t.sort(function(t,e){var n=u(t),r=u(e);return n===r?o(e)-o(t):r-n})}function f(e){i(t)!==containerWidth&&(window.removeEventListener(e.type,f),waterfall(t))}"string"==typeof t&&(t=document.querySelector(t));var c=Array.from(t.children).map(function(t){return t.style.position="absolute",t});t.style.position="relative";var p=Array.from(t.querySelectorAll("img")),y=p.map(function(t){return new Promise(function(e){t.complete?e():(t.addEventListener("load",e),t.addEventListener("error",e))})});Promise.all(y).then(function(){var r=[];c.length&&(c[0].style.top="0px",c[0].style.left=n(e(c[0],"Left")),r.push(c[0]));for(var l=1;l<c.length;l++){var p=c[l-1],y=c[l];if(!(a(p)+i(y)<=i(t)))break;y.style.top=p.style.top,y.style.left=n(a(p)),r.push(y)}for(var v=r.length;v<c.length;v++){s(r);var d=c[v],h=r.pop();d.style.top=n(u(h)+e(d,"Top")),d.style.left=n(o(h)),r.push(d)}s(r);var m=r[0];t.style.height=n(u(m)+e(m,"Bottom"));i(t);window.addEventListener("resize",f)})}
+function waterfall(t){function e(t,e){var n=window.getComputedStyle(t);return parseFloat(n["margin"+e])||0}function n(t){return t+"px"}function r(t){return parseFloat(t.style.top)||0}function o(t){return parseFloat(t.style.left)||0}function i(t){return t.clientWidth}function l(t){return t.clientHeight}function u(t){return r(t)+l(t)+e(t,"Bottom")}function a(t){return o(t)+i(t)+e(t,"Right")}function s(t){t.sort(function(t,e){var n=u(t),r=u(e);return n===r?o(e)-o(t):r-n})}function f(e){i(t)!==containerWidth&&(window.removeEventListener(e.type,f),waterfall(t))}"string"==typeof t&&(t=document.querySelector(t));var c=Array.from(t.children).map(function(t){return(t.style.position="absolute"),t});t.style.position="relative";var p=Array.from(t.querySelectorAll("img")),y=p.map(function(t){return new Promise(function(e){t.complete?e():(t.addEventListener("load",e),t.addEventListener("error",e))})});return Promise.all(y).then(function(){var r=[];c.length&&(c[0].style.top="0px",c[0].style.left=n(e(c[0],"Left")),r.push(c[0]));for(var l=1;l<c.length;l++){var p=c[l-1],y=c[l];if(!(a(p)+i(y)<=i(t)))break;y.style.top=p.style.top;y.style.left=n(a(p));r.push(y)}for(var v=r.length;v<c.length;v++){s(r);var d=c[v],h=r.pop();d.style.top=n(u(h)+e(d,"Top"));d.style.left=n(o(h));r.push(d)}s(r);var m=r[0];t.style.height=n(u(m)+e(m,"Bottom"));i(t);window.addEventListener("resize",f)})}

package/source/js/utils.js

@@ -37,7 +37,6 @@
             }
         },
         snackbarShow: (text, showAction = false, duration = 5000) => {
-            document.styleSheets[0].addRule(':root', `--efu-snackbar-time:${duration}ms!important`);
             Snackbar.show({
                 text,
                 showAction,