hexo-theme-solitude 2.0.10 → 2.0.12-rc.1

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,3 @@
-<!---
-☝️ PR title should follow conventional commits (https://conventionalcommits.org)
-
-Please carefully read the contribution docs before creating a pull request
- 👉 https://github.com/valor-x/hexo-theme-solitude/blob/main/CONTRIBUTING.md
--->
-
 ### 🔗 链接 issue
 
 <!-- 请确保存在未解决的问题，将编号提及为 #123（示例） -->
@@ -32,4 +25,4 @@ Please carefully read the contribution docs before creating a pull request
 
 - [ ] 我已链接问题或讨论。
 - [ ] 我已经添加了测试（如果可能的话）。
-- [ ] 我已相应地更新了[文档](https://github.com/efuo/theme-solitude-docs)。
+- [ ] 我已相应地更新了[文档](https://github.com/everfu/solitude.js.org)。

package/CONTRIBUTING.md

@@ -40,4 +40,4 @@ $ git rebase upstream/dev
 $ git push -f origin dev
 ```
 
-* 不得添加任何第三方的创作
+* 不得添加任何第三方的创作

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 EverFu
+Copyright (c) 2024 everfu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/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)
 
-[Documentation](https://solitude.js.org/)丨[Preview](https://solitude.js.org/preview/)
+[Docs](https://solitude.js.org/)丨[Preview](https://solitude.js.org/preview/)丨[Author](https://blog.everfu.cn/)
 
 </div>
 

package/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://solitude.js.org/)丨[预览](https://solitude.js.org/preview/zh/)丨[作者](https://blog.everfu.cn/)
 
 </div>
 

package/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://solitude.js.org/)丨[預覽](https://solitude.js.org/preview/zh/)丨[作者](https://blog.everfu.cn/)
 
 </div>
 

package/SECURITY.md

@@ -1,9 +1,9 @@
 # Security Policy
 
-## Report a vulnerability
+## Reporting a Vulnerability
 
-To report a vulnerability, please [report privately via security tab](https://github.com/everfu/hexo-theme-solitude/security/advisories/new) on the correct GitHub repository (see [Document](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability)). If you are unable to report, please feel free to email us at o@everfu.org.
+If you discover a vulnerability, please report it privately through the [GitHub Security tab](https://github.com/everfu/hexo-theme-solitude/security/advisories/new) on the appropriate repository. For detailed instructions, refer to this [documentation](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability). If you're unable to report via GitHub, you can email us at o@everfu.org.
 
-All security vulnerabilities will be verified and resolved in a timely manner.
+We take security seriously and will verify and resolve any reported vulnerabilities promptly.
 
-While it is rare for new vulnerabilities to be discovered, it is recommended to always use the latest version of the theme and other dependencies by maintaining locked files (`yarn.lock`, `package-lock.json`) to ensure that they are as secure as possible.
+To minimize risks, always use the latest version of the theme and dependencies. Keep your lock files (`yarn.lock`, `package-lock.json`) up to date to ensure maximum security.

package/_config.yml

@@ -238,16 +238,6 @@ aside:
 index_post_list:
   direction: column # row / column
   column: 2 # 2: 2 columns 3: 3 columns
-  # 1: 1 post.description / 1: 使用自己写的文章摘要
-  # 2: 2 Automatically get descriptions or screenshots / 2: 自动获取描述或截图
-  # 3: 3 Use only interception / 3: 仅使用截取
-  # false: Do not display / false: 不显示
-  content: false
-  # The length of the screenshot content
-  # 截图内容长度
-  length: 500
-  # left: on the left : left / right: on the right : right / both: both sides : both
-  # left: 左侧 : left / right: 右侧 : right / both: 两侧 : both
   cover: both
 # --------------------------- end ---------------------------
 
@@ -364,7 +354,7 @@ post:
   # 文章封面取色
   covercolor:
     enable: false
-    # local: local color / api: api color
+    # local: local color / api: api color / ave: oss average color
     mode: local
     # api address / api 地址
     api: https://api.qjqq.cn/api/Imgcolor?img=
@@ -382,14 +372,8 @@ post:
 # --------------------------- start ---------------------------
 # Custom Theme Color
 theme_color:
-  dark: "#ffc848" # Dark mode
-  dark_op: "#f2b94b23" # Dark mode transparent
-  dark_op_deep: "#f2b94bdd" # Dark mode transparent dark
-  dark_none: "#f2b94b00" # Dark mode transparent colorless
-  light: "#425AEF" # Light mode
-  light_op: "#4259ef23" # Light mode transparent
-  light_op_deep: "#4259efdd" # Light mode transparent dark
-  light_none: "#4259ef01" # Light mode transparent colorless
+  dark: "#ffc848" # dark
+  light: "#425AEF" # light
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
@@ -661,10 +645,8 @@ wordcount: false
 # --------------------------- start ---------------------------
 # Busuanzi
 busuanzi: false
-# 0: Use the original version of busuanzi / 1: Use the custom version of busuanzi
-# The difference between the original and the default: please search by yourself
-# 0：使用原版的不蒜子 / 1：使用不蒜子的自定义版本
-# 原版和默认的区别：请自行搜索
+# 0: Original / 1: Custom
+# 0: 原版 / 1: 自定义版
 busuanzi_use: 0
 # --------------------------- end ---------------------------
 
@@ -933,9 +915,9 @@ right_menu:
 memorial:
   enable: false
   date:
-  #  - 7-7 # 卢沟桥事变
-  #  - 9-18 # 九一八事变
-  #  - 12-13 # 南京大屠杀国家公祭日
+  #  - 7-7
+  #  - 9-18
+  #  - 12-13 # 国家公祭日
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
@@ -978,8 +960,7 @@ CDN:
   version: true # Whether to use the version number
   custom_format: //open.lightxi.com/cdnjs/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file} # Custom format
   # Directly override the default CDN link (highest priority)
-  option:
-    busuanzi_qj_js: https://pv.lemonso.com/js
+  options:
     # algolia_search:
     # instantsearch:
     # pjax:

package/layout/includes/console.pug

@@ -53,7 +53,7 @@ div#console
                 i.solitude.fa-solid.fa-circle-half-stroke
         div.console-btn-item#consoleHideAside
             span.asideSwitch(onclick="sco.switchHideAside()", title=_p('console.switch_hideAside'))
-                i.solitude.fa-solid.fa-mattress-pillow
+                i.solitude.fas.fa-arrows-left-right-to-line
         if theme.keyboard.enable
             div.console-btn-item#consoleKeyboard(onclick="sco.switchKeyboard()")
                 span.keyboardSwitch(title=_p('console.switch_keyboard'))

package/layout/includes/inject/body.pug

@@ -54,7 +54,7 @@ div
     script(src=url_for(theme.cdn.swiper_js))
 
   if theme.post_ai.enable
-    script(src=url_for(theme.cdn.efu_ai))
+    script(src=url_for(theme.cdn.post_ai))
 
   if theme.capsule.enable || theme.music.enable || theme.says.enable
     script.
@@ -65,6 +65,7 @@ div
   if theme.post.covercolor.enable
     case theme.post.covercolor.mode
       when 'local'
+        script(src=url_for(theme.cdn.color_thief))
         script(src=url_for(theme.cdn.cover_local))
       when 'api'
         script.
@@ -73,6 +74,12 @@ div
             time: !{theme.post.covercolor.time}
           }
         script(src=url_for(theme.cdn.cover_api))
+      when 'ave'
+        script.
+          const coverColorConfig = {
+            time: !{theme.post.covercolor.time}
+          }
+        script(src=url_for(theme.cdn.cover_ave))
 
   if theme.loading.pace
     script(src=url_for(theme.cdn.pace_js))
@@ -105,10 +112,7 @@ div
       script.
         carousel_swiper()
     if theme.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv)
-      if theme.busuanzi_use === 0
-        script(defer pjax src=url_for(theme.cdn.busuanzi_js))
-      else
-        script(defer pjax src=url_for(theme.cdn.busuanzi_qj_js))
+      script(defer pjax src=url_for(theme.cdn.busuanzi_js))
 
 
 if theme.footer.randomlink

package/layout/includes/nav.pug

@@ -3,7 +3,7 @@ nav#nav.show
         #blog_name
             if theme.nav.group
                 .back-home-button(tabindex="-1")
-                    i.back-home-button-icon.solitude.fab.fa-squarespace
+                    i.back-home-button-icon.solitude.fas.fa-bars-progress
                     include ./widgets/nav/group
             a#site-name(href=url_for("/"), title=_p('nav.site_name_title'))
                 if theme.site.name.class === 'i_class'
@@ -20,4 +20,4 @@ nav#nav.show
             include ./widgets/nav/menu.pug
         #nav-left
         #nav-right
-            include ./widgets/nav/right.pug
+            include ./widgets/nav/right.pug

package/layout/includes/widgets/aside/aside.pug

@@ -15,4 +15,4 @@
         if page.toc
             include ./asideToc.pug
         each item in Sticky
-            include ./asideSwitch.pug
+            include ./asideSwitch.pug

package/layout/includes/widgets/home/postList.pug

@@ -19,25 +19,6 @@ mixin info
 
         a.article-title(href=url_for(post.path), title=post.title)= post.title
 
-    case theme.index_post_list.content
-        when false
-            break
-        when 1
-            .content!= post.description
-        when 2
-            if post.description
-                .content!= post.description
-            else
-                - const content = strip_html(post.content)
-                - let expert = content.substring(0, theme.index_post_list.length).replace(/\d+/g, '').replace(/&#xF/g, '').replace(/&#x/g, '')
-                - content.length > theme.index_post_list.length ? expert += ' ...' : ''
-                .content!= expert
-        default
-            - const content = strip_html(post.content)
-            - let expert = content.substring(0, theme.index_post_list.length).replace(/\d+/g, '').replace(/&#xF/g, '').replace(/&#x/g, '')
-            - content.length > theme.index_post_list.length ? expert += ' ...' : ''
-            .content!= expert
-
     div.article-meta-wrap
         span.article-meta.tags
             each tag in post.tags.data
@@ -80,4 +61,4 @@ if theme.google_adsense && theme.google_adsense.enable && theme.google_adsense.a
         div.recent-post-item.google-ads-warp
             ins.adsbygoogle(style="display:block; text-align:center; min-width: 100%; height:" + ads_height, data-ad-layout="in-article", data-ad-format="fluid", hide-unfilled="true", data-ad-client=theme.google_adsense.client, data-ad-slot=theme.google_adsense.slot)
             script.
-                (adsbygoogle = window.adsbygoogle || []).push({});
+                (adsbygoogle = window.adsbygoogle || []).push({});

package/layout/includes/widgets/page/links/banner.pug

@@ -16,17 +16,17 @@
     .tags-group-wrapper
         - const data = site.data.links.links
         - for (let i = 0; i < 2; i++)
-        each x in data
-            if x.type === "item"
-                - var pairs = []
-                each y, index in x.link_list
-                    if (index % 2 === 0)
-                        - pairs.push([y])
-                    else
-                        - pairs[pairs.length - 1].push(y)
-                each pair in pairs
-                    .tags-group-icon-pair
-                        each y in pair
-                            a.tags-group-icon(href=url_for(y.link), title=y.name)
-                                img(src=y.avatar + (site.data.links.banner_suffix || ''), title=y.name)
-                                span.tags-group-title=y.name
+        each item in [1,2]
+            each x in data
+                    - var pairs = []
+                    each y, index in x.link_list
+                        if (index % 2 === 0)
+                            - pairs.push([y])
+                        else
+                            - pairs[pairs.length - 1].push(y)
+                    each pair in pairs
+                        .tags-group-icon-pair
+                                each y in pair
+                                    a.tags-group-icon(href=url_for(y.link), title=y.name)
+                                        img(src=y.avatar + (site.data.links.banner_suffix || ''), title=y.name)
+                                        span.tags-group-title=y.name

package/layout/includes/widgets/post/post-ai.pug

@@ -1,7 +1,7 @@
 .post-ai
     .ai-title
         .ai-title-left
-            i.ai-title-icon.solitude.fa-solid.fa-robot
+            i.ai-title-icon.solitude.fab.fa-bilibili
             .ai-title-text=_p('post.ai.title')
         .ai-tag#ai-tag= theme.post_ai.modelName
     .ai-explanation(style="display: block;")

package/layout/includes/widgets/randomlink.pug

@@ -2,7 +2,6 @@
 - var data = site.data.links.links
 if(data)
     each item in data
-        if item.type === "item"
             each y in item.link_list
                 - datalinks.push({ name: y.name,link: y.link})
 
@@ -41,4 +40,4 @@ if theme.footer.randomlink
             }
 
             linkcard.innerHTML = data + '<a class="footer-item" href="#{url_for(/links/)}">#{_p('more')}</a>';
-        }
+        }

package/layout/includes/widgets/third-party/tianli-talk.pug

@@ -1,7 +1,7 @@
 - const {key,option,title} = theme.tianli_talk
 
 span.needEndHide#efuTalk(onclick="togglePostChatContainer(); return false;" title=title)
-    i.solitude.fa-solid.fa-robot
+    i.solitude.fab.fa-bilibili
     span.efuTalkTitle=title
 
 script.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.0.10",
-  "description": "A beautiful, powerful, and efficient Hexo theme developed by Ever Fu.",
+  "version": "2.0.12-rc.1",
+  "description": "A beautiful, powerful, and efficient Hexo theme developed by everfu.",
   "main": "package.json",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -11,7 +11,8 @@
     "theme",
     "solitude",
     "Card UI Design",
-    "Ever Fu",
+    "everfu",
+    "一小只托尼",
     "hexo-theme-solitude"
   ],
   "repository": {

package/plugins.yml

@@ -81,10 +81,6 @@ busuanzi_js:
   name: busuanzi
   file: bsz.pure.mini.js
   version: 2.3.0
-busuanzi_qj_js:
-  name: pearssauce-busuanzi
-  file: bsz.pure.js
-  version: 1.0.0
 snackbar:
   name: node-snackbar
   file: dist/snackbar.min.js
@@ -130,3 +126,8 @@ qrcode:
   file: qrcode.min.js
   version: 1.0.0
   other_name: qrcodejs
+color_thief:
+  name: colorthief
+  file: color-thief.min.js
+  version: 2.4.0
+  other_name: color-thief

package/scripts/event/cdn.js

@@ -44,6 +44,11 @@ hexo.extend.filter.register('before_generate', () => {
             file: 'js/covercolor/api.js',
             version
         },
+        cover_ave: {
+            name: 'hexo-theme-solitude',
+            file: 'js/covercolor/ave.js',
+            version
+        },
         music_js: {
             name: 'hexo-theme-solitude',
             file: 'js/music.js',
@@ -59,9 +64,9 @@ hexo.extend.filter.register('before_generate', () => {
             file: 'js/tw_cn.js',
             version
         },
-        efu_ai: {
+        post_ai: {
             name: 'hexo-theme-solitude',
-            file: 'js/third_party/efu_ai.min.js',
+            file: 'js/third_party/post_ai.min.js',
             version
         },
         commentBarrage: {

package/scripts/event/merge_config.js

@@ -104,8 +104,6 @@ hexo.extend.filter.register('before_generate', () => {
     index_post_list: {
       direction: 'column',
       column: 2,
-      content: false,
-      length: 500,
       cover: 'both'
     },
     page: {
@@ -168,13 +166,7 @@ hexo.extend.filter.register('before_generate', () => {
     },
     theme_color: {
       dark: "#ffc848",
-      dark_op: "#f2b94b23",
-      dark_op_deep: "#f2b94bdd",
-      dark_none: "#f2b94b00",
-      light: "#425AEF",
-      light_op: "#4259ef23",
-      light_op_deep: "#4259efdd",
-      light_none: "#4259ef01"
+      light: "#425AEF"
     },
     display_mode: {
       type: 'auto',
@@ -298,7 +290,7 @@ hexo.extend.filter.register('before_generate', () => {
       enable: false,
       modelName: 'GPT 3',
       key: 'your key',
-      talk: 'I am a AI.',
+      talk: '我是 Ai 机器人',
       randomPost: false,
       tips: 'AI is not perfect, please use it with caution.'
     },
@@ -361,7 +353,7 @@ hexo.extend.filter.register('before_generate', () => {
       'font-size': '16px',
       'code-font-size': '16px',
       'font-family': 'PingFang SC, Hiragino Sans GB,Microsoft YaHei',
-      'code-font-family': 'monospace, monospace',
+      'code-font-family': '"monospace", monospace',
     },
     extends: {
       head: [],
@@ -420,10 +412,8 @@ hexo.extend.filter.register('before_generate', () => {
       internal: 'local',
       third_party: 'cdnjs',
       version: true,
-      custom_format: 'https://cdn.staticfile.net/${cdnjs_name}/${version}/${min_cdnjs_file}',
-      option: {
-        solitude_css: 'https://cdn2.codesign.qq.com/icons/7pOrz0WXB5ZWJPX/latest/iconfont.css',
-      }
+      custom_format: '//open.lightxi.com/cdnjs/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}',
+      option: {}
     }
   }
   hexo.theme.config = Object.assign(defaultConfig, hexo.theme.config)

package/source/css/_global/function.styl

@@ -89,4 +89,4 @@ minWidth2000()
 .limit-more-line
   display: -webkit-box
   overflow: hidden
-  -webkit-box-orient: vertical
+  -webkit-box-orient: vertical

package/source/css/_layout/console.styl

@@ -34,6 +34,7 @@
     transform translateY(20px)
     transition .3s
     max-width 1400px
+    min-width 1000px
 
     +maxWidth1300()
       justify-content center
@@ -69,8 +70,7 @@
     overflow hidden
 
     +maxWidth1300()
-      width 100%
-      margin 0
+      display none
 
   .console-card
     background var(--efu-maskbg)
@@ -79,6 +79,9 @@
     border var(--style-border)
     box-shadow var(--efu-shadow-border)
     padding 40px
+    gap 24px
+    display: flex
+    flex-direction: column
 
   .console-card.tags
     height calc(100% - 172px)
@@ -179,10 +182,10 @@
 
   .console-card.tags
     .card-tag-cloud
-      margin-top 1.5rem
       display flex
       gap .5rem
       flex-wrap wrap
+      verflow-y: scroll
 
       a
         color var(--efu-fontcolor)
@@ -308,4 +311,4 @@
 
   #consoleHideAside
     +maxWidth768()
-      display none
+      display none

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

@@ -92,26 +92,18 @@ if hexo-config('index_post_list.direction') == "column"
             border-radius: 12px 12px 0 0
 
       > .recent-post-info
-        height 174px
+        height 100%
         width 100%
+        padding 18px 32px 18px 32px
         cursor pointer
         position relative
-        padding 0
-        display inline-block
+        display flex
         overflow hidden
-
-        .content
-          -webkit-line-clamp 2
-          display -webkit-box
-          overflow hidden
-          -webkit-box-orient vertical
-          padding 5px 32px
-          opacity .8
-          font-size 14px
-          line-height 1.8
-
-          +maxWidth600()
-            -webkit-line-clamp 1
+        flex-direction column
+        gap 16px
+        justify-content space-between
+        +minWidth1300()
+          min-height 165px
 
         span.tags-punctuation
           transition .3s
@@ -122,7 +114,6 @@ if hexo-config('index_post_list.direction') == "column"
         .recent-post-info-top
           position relative
           transition .3s
-          padding 0 32px
           width 100%
 
           .article-title
@@ -137,10 +128,11 @@ if hexo-config('index_post_list.direction') == "column"
             display -webkit-box
             overflow hidden
             -webkit-box-orient vertical
+            +minWidth1300()
+              font-size 30px
 
           .recent-post-info-top-tips
             display flex
-            margin-top 20px
             user-select none
 
             > .sticky-warp
@@ -172,8 +164,10 @@ if hexo-config('index_post_list.direction') == "column"
                 color var(--efu-card-bg)
 
         /.article-meta-wrap
-          position absolute
-          bottom 16px
+          color var(--efu-fontcolor)
+          font-size .7rem
+          user-select none
+          position relative
           transition .3s
           display flex
           flex-direction row
@@ -181,10 +175,7 @@ if hexo-config('index_post_list.direction') == "column"
           justify-content space-between
           width 100%
           left 0
-          padding 0 32px
           white-space nowrap
-          color var(--efu-fontcolor)
-          font-size .7rem
 
           > .article-meta
             margin 0 8px 0 0
@@ -325,30 +316,21 @@ else if hexo-config('index_post_list.direction') == "row"
             border-radius: 12px 12px 0 0
 
       > .recent-post-info
-        height 174px
+        height 100%
         width 100%
+        padding 18px 32px 18px 32px
         cursor pointer
         position relative
-        padding 0
-        display inline-block
+        display flex
         overflow hidden
+        flex-direction column
+        gap 16px
+        justify-content space-between
+        +minWidth1300()
+          min-height 165px
         +maxWidth768()
           order 2
 
-        .content
-          -webkit-line-clamp 3
-          display -webkit-box
-          overflow hidden
-          -webkit-box-orient vertical
-          padding 5px 32px
-          opacity .8
-          font-size 14px
-          line-height 1.8
-          +maxWidth768()
-            -webkit-line-clamp 2
-          +maxWidth600()
-            -webkit-line-clamp 1
-
         span.tags-punctuation
           transition .3s
 
@@ -358,7 +340,6 @@ else if hexo-config('index_post_list.direction') == "row"
         .recent-post-info-top
           position relative
           transition .3s
-          padding 0 32px
           width 100%
 
           .article-title
@@ -410,8 +391,10 @@ else if hexo-config('index_post_list.direction') == "row"
                 color var(--efu-card-bg)
 
         /.article-meta-wrap
-          position absolute
-          bottom 0
+          color var(--efu-fontcolor)
+          font-size .7rem
+          user-select none
+          position relative
           transition .3s
           display flex
           flex-direction row
@@ -419,10 +402,7 @@ else if hexo-config('index_post_list.direction') == "row"
           justify-content space-between
           width 100%
           left 0
-          padding 0 32px
           white-space nowrap
-          color var(--efu-fontcolor)
-          font-size .7rem
           +maxWidth768()
             bottom 16px