Merge pull request #118 from wleelw/dev

🎉release: update v1.4.1
everfu · Jan 27, 2024 · bfe0ae1 · bfe0ae1
2 parents 5f1c5bf + 9b3a5cb
commit bfe0ae1
Show file tree

Hide file tree

Showing 29 changed files with 832 additions and 911 deletions.
diff --git a/_config.yml b/_config.yml
@@ -404,18 +404,14 @@ aside:
 errorpage:
   # 图片
   # image
-  img: https://npm.elemecdn.com/[email protected]/image/source/404.png
+  img: https://bu.dusays.com/2023/03/03/6401a7906aa4a.gif
   # 文字
   # text
   text: =awa= 页面走丢了
   # 推荐文章列表
   # Recommended article list
   recommendList: true
 
-# 关于页
-# about page
-about: false
-
 # 即刻说说页
 # jike says page
 # 前置要求：需配置即刻说说页面
@@ -430,8 +426,8 @@ says:
   # 1：张洪heo样式 / 2：Leonus样式
   # 1: Zhang Hong heo style / 2: Leonus style
   style: 1
-  # 即刻短文数量（条）。建议范围：1 ~ 999，当数量为-1时，将显示全部。
-  # Number of immediate short articles (pieces). Suggested range: 1~999, when the quantity is -1, all will be displayed.
+  # 即刻短文仅展示前n条
+  # Jike short text only shows the first n
   strip: 30
   # 模式选择。local：本地静态 / json：动态json / memos：动态Memos
   # Mode selection. Local: local static/JSON: dynamic JSON/memory: dynamic Memos
@@ -832,11 +828,11 @@ pwa:
   enable: false
   manifest: /manifest.json # manifest.json 文件路径
   theme_color: '#ffffff' # 主题颜色
-  mask_icon: https://cdn.cbd.int/solitude-source@1.0.3/img/pwa/180.png # 遮罩图标
-  apple_touch_icon: https://cdn.cbd.int/solitude-source@1.0.3/img/pwa/180.png # 苹果触摸图标
-  bookmark_icon: https://cdn.cbd.int/solitude-source@1.0.3/img/pwa/180.png # 书签图标
-  favicon_32_32: https://cdn.cbd.int/solitude-source@1.0.3/img/pwa/32.png # 32x32图标
-  favicon_16_16: https://cdn.cbd.int/solitude-source@1.0.3/img/pwa/16.png # 16x16图标
+  mask_icon: https://cdn.cbd.int/solitude-source/img/pwa/180.png # 遮罩图标
+  apple_touch_icon: https://cdn.cbd.int/solitude-source/img/pwa/180.png # 苹果触摸图标
+  bookmark_icon: https://cdn.cbd.int/solitude-source/img/pwa/180.png # 书签图标
+  favicon_32_32: https://cdn.cbd.int/solitude-source/img/pwa/32.png # 32x32图标
+  favicon_16_16: https://cdn.cbd.int/solitude-source/img/pwa/16.png # 16x16图标
 
 # CDN
 # Don't modify the following settings unless you know how they work
@@ -858,9 +854,9 @@ CDN:
   custom_format: https://cdn.staticfile.org/${cdnjs_name}/${version}/${min_cdnjs_file}
 
   option:
-    scoicon_css: https://cdn.cbd.int/solitude-source@1.0.3/icon/scoicon.min.css
-    waterfall: https://cdn.cbd.int/solitude-source@1.0.3/js/waterfall.min.js
-    view_image: https://cdn.cbd.int/solitude-source@1.0.3/js/view-image.min.js
+    scoicon_css: https://cdn.cbd.int/solitude-source/icon/scoicon.min.css
+    waterfall: https://cdn.cbd.int/solitude-source/js/waterfall.min.js
+    view_image: https://cdn.cbd.int/solitude-source/js/view-image.min.js
 #    algolia_search:
 #    instantsearch:
 #    pjax:

diff --git a/languages/en-US.yml b/languages/en-US.yml
@@ -19,7 +19,7 @@ page:
   tags: All tags
   categories: All categories
   archives: Archives
-  echarts: Echarts
+  404: Page not found
 
 home:
   bannertext: Just browsing
@@ -71,7 +71,7 @@ search:
 
 head:
   noscript: Please enable JavaScript to view the site
-  console: 'Program: Hexo | Theme: Hexo-Theme-Solitude | Author: WangZhuoSco、YiFeng | Github: https://github.com/DuoSco/Hexo-theme-solitude | Version: v1.4.0 😄'
+  console: 'Program: Hexo | Theme: Hexo-Theme-Solitude | Author: WangZhuoSco、YiFeng | Github: https://github.com/DuoSco/Hexo-theme-solitude | Version: v1.4.1 😄'
 
 aside:
   postcount: 'Posts :'

diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
@@ -19,7 +19,7 @@ page:
   tags: 全部标签
   categories: 全部分类
   archives: 文章
-  echarts: 博客统计
+  404: 页面没有找到
 
 nav:
   site_name_title: 返回博客主页
@@ -70,7 +70,7 @@ search:
 
 head:
   noscript: 开启JavaScript才能访问本站哦~
-  console: '程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：王卓Sco、亦封 | Github: https://github.com/DuoSco/Hexo-theme-solitude | 版本：v1.4.0 😄'
+  console: '程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：王卓Sco、亦封 | Github: https://github.com/DuoSco/Hexo-theme-solitude | 版本：v1.4.1 😄'
 
 aside:
   postcount: '文章总数 :'

diff --git a/layout/404.pug b/layout/404.pug
@@ -14,7 +14,7 @@ block content
     if theme.errorpage.recommendList
         .aside-list
             .aside-list-group
-                each post, index in site.posts.sort('-date').data
+                each post, index in site.posts.sort('-date').data.slice(0, 6)
                     if index >= 5
                         break
                     .aside-list-item

diff --git a/layout/includes/head.pug b/layout/includes/head.pug
@@ -3,7 +3,7 @@
 - else if (is_archive()) title = _p('page.archives') + (page.year || "")
 - else if (is_tag()) title = _p('page.tag')+': '  + page.tag
 - else if (is_category()) title = _p('page.category') +': ' + page.category
-- else if (page.type === '404') title = '404'+': '  + theme.errorpage.text
+- else if (page.type === '404') title = _p('page.404')
 - else if (page.type === 'tags') title = _p('page.tags')
 - else if (page.type === 'categories') title = _p('page.categories')
 - else if (is_post() || is_page()) title = page.title

diff --git a/layout/includes/page/about.pug b/layout/includes/page/about.pug
@@ -1,4 +1,4 @@
-if theme.about && site.data.about
+if site.data.about
     #about-page
         include ../widgets/page/about/authorinfo
         include ../widgets/page/about/contentinfo

diff --git a/layout/includes/widgets/page/says/json.pug b/layout/includes/widgets/page/says/json.pug
@@ -2,11 +2,10 @@ case theme.says.style
     when 1
         script.
             !async function () {
-                let say_strip = !{theme.says.strip}
                 await fetch('!{url_for(theme.says.mode_link)}')
                     .then(res => res.json())
                     .then(res => {
-                        let list = say_strip === -1 || say_strip >= res.length ? res : res.slice(0, say_strip)
+                        let list = res.slice(0, !{theme.says.strip})
                         let aplayer = null
                         let video = null
                         let imageBox = null
@@ -43,11 +42,10 @@ case theme.says.style
     when 2
         script.
             !async function () {
-                let say_strip = !{theme.says.strip}
                 await fetch('!{url_for(theme.says.mode_link)}')
                     .then(res => res.json())
                     .then(res => {
-                        let list = say_strip === -1 || say_strip >= res.length ? res : res.slice(0, say_strip)
+                        let list = res.slice(0, !{theme.says.strip})
                         let aplayer = null
                         let video = null
                         let imageBox = null

diff --git a/layout/includes/widgets/page/says/local.pug b/layout/includes/widgets/page/says/local.pug
@@ -1,8 +1,4 @@
-if theme.says.strip === -1
-    - var limitedList = site.data.essay.essay_list
-else
-    - var limitedList = site.data.essay.essay_list.slice(0, theme.says.strip)
-each item in limitedList
+each item in site.data.essay.essay_list.slice(0, theme.says.strip)
     li.item
         if theme.says.style === 2
             .meta
@@ -45,4 +41,4 @@ each item in limitedList
                             | 链接
                 if item.content
                     a.bber-reply(onclick=`sco.toTalk('${item.content}')`)
-                        i.scoicon.sco-chat-fill(style="font-size: 1rem;")
+                        i.scoicon.sco-chat-fill
diff --git a/layout/includes/widgets/page/says/memos.pug b/layout/includes/widgets/page/says/memos.pug
@@ -2,7 +2,6 @@ case theme.says.style
     when 1
         script.
             !async function () {
-                let say_strip = !{theme.says.strip};
                 let aplayerRegex = /{aplayer,(.*?),(.*?)}/g;
                 let linkRegex = /(?<!\!)\[([^\]]*)\]\(([^\)]*)\)/g;
                 let bilibiliRegex = /{bilibili,(.*?)}/g;
@@ -13,7 +12,7 @@ case theme.says.style
                 await fetch("!{url_for(theme.says.mode_link)}")
                     .then(res => res.json())
                     .then(data => {
-                        let list = say_strip === -1 || say_strip >= data.length ? data : data.slice(0, say_strip);
+                        let list = data.slice(0, !{theme.says.strip});
                         let aplayer = null;
                         let video = null;
                         let imageBox = null;
@@ -59,7 +58,6 @@ case theme.says.style
     when 2
         script.
             !async function () {
-                let say_strip = !{theme.says.strip};
                 let aplayerRegex = /{aplayer,(.*?),(.*?)}/g;
                 let bilibiliRegex = /{bilibili,(.*?)}/g;
                 let playerRegex = /{player,(.*?)}/g;
@@ -69,7 +67,7 @@ case theme.says.style
                 await fetch("!{url_for(theme.says.mode_link)}")
                     .then(res => res.json())
                     .then(data => {
-                        let list = say_strip === -1 || say_strip >= data.length ? data : data.slice(0, say_strip);
+                        let list = data.slice(0, !{theme.says.strip})
                         let aplayer = null;
                         let video = null;
                         let imageBox = null;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the DuoSco team",
   "main": "package.json",
   "scripts": {

diff --git a/source/css/_layout/basic.styl b/source/css/_layout/basic.styl
@@ -295,4 +295,9 @@ table thead
   background var(--sco-secondbg)
 
 b, strong
-  color var(--sco-lighttext)
+  color var(--sco-lighttext)
+
+.button--animated
+  border-radius 8px
+  transition .3s
+  position relative