hexo-theme-solitude 2.1.16 → 3.0.1

package/package.json

@@ -1,18 +1,15 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.1.16",
+  "version": "3.0.1",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by everfu.",
   "main": "package.json",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "keywords": [
     "hexo",
     "theme",
     "solitude",
     "Card UI Design",
-    "everfu",
-    "伍十七",
+    "@everfu",
+    "everly",
     "hexo-theme-solitude"
   ],
   "repository": {
@@ -25,9 +22,12 @@
   },
   "bugs": {
     "url": "https://github.com/everfu/hexo-theme-solitude/issues",
-    "email": "o@everfu.org"
+    "email": "o@efu.me"
   },
   "homepage": "https://solitude.js.org",
-  "author": "Hexo-Theme-Solitude<o@everfu.org>",
-  "license": "MIT"
-}
+  "author": "Hexo-Theme-Solitude<o@efu.me>",
+  "license": "Apache-2.0",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  }
+}

package/plugins.yml

@@ -111,7 +111,7 @@ mermaid_js:
 chart_js:
   name: chart.js
   file: dist/chart.umd.js
-  version: 4.4.1
+  version: 4.4.7
   other_name: Chart.js
 typeit_js:
   name: typeit

package/scripts/event/cdn.js

@@ -3,117 +3,48 @@
  * Merge CDN
  */
 
-'use strict'
+'use strict';
 
-const { version } = require('../../package.json')
-const path = require('path')
+const { version } = require('../../package.json');
+const path = require('path');
 
 hexo.extend.filter.register('before_generate', () => {
-    const themeConfig = hexo.theme.config
-    const { CDN } = themeConfig
+    const themeConfig = hexo.theme.config;
+    const { CDN } = themeConfig;
+    const name = 'hexo-theme-solitude';
 
-    const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' })
+    const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' });
     const internalSrc = {
-        main: {
-            name: 'hexo-theme-solitude',
-            file: 'js/main.js',
-            version
-        },
-        utils: {
-            name: 'hexo-theme-solitude',
-            file: 'js/utils.js',
-            version
-        },
-        local_search: {
-            name: 'hexo-theme-solitude',
-            file: 'js/search/local.js',
-            version
-        },
-        algolia_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/search/algolia.js',
-            version
-        },
-        cover_local: {
-            name: 'hexo-theme-solitude',
-            file: 'js/covercolor/local.js',
-            version
-        },
-        cover_api: {
-            name: 'hexo-theme-solitude',
-            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',
-            version
-        },
-        right_menu_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/right_menu.js',
-            version
-        },
-        translate_js:{
-            name: 'hexo-theme-solitude',
-            file: 'js/tw_cn.js',
-            version
-        },
-        post_ai: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/post_ai.min.js',
-            version
-        },
-        commentBarrage: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/barrage.min.js',
-            version
-        },
-        waterfall: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/waterfall.min.js',
-            version
-        },
-        universe_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/universe.min.js',
-            version
-        },
-        envelope_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/envelope.min.js',
-            version
-        }
-    }
+        main: { name, file: 'js/main.js', version },
+        utils: { name, file: 'js/utils.js', version },
+        local_search: { name, file: 'js/search/local.js', version },
+        algolia_js: { name, file: 'js/search/algolia.js', version },
+        cover_local: { name, file: 'js/covercolor/local.js', version },
+        cover_api: { name, file: 'js/covercolor/api.js', version },
+        cover_ave: { name, file: 'js/covercolor/ave.js', version },
+        music_js: { name, file: 'js/music.js', version },
+        right_menu_js: { name, file: 'js/right_menu.js', version },
+        translate_js: { name, file: 'js/tw_cn.js', version },
+        post_ai: { name, file: 'js/third_party/post_ai.min.js', version },
+        commentBarrage: { name, file: 'js/third_party/barrage.min.js', version },
+        waterfall: { name, file: 'js/third_party/waterfall.min.js', version },
+        universe_js: { name, file: 'js/third_party/universe.min.js', version },
+        envelope_js: { name, file: 'js/third_party/envelope.min.js', version }
+    };
 
-    const minFile = file => {
-        return file.replace(/(?<!\.min)\.(js|css)$/g, ext => '.min' + ext)
-    }
+    const minFile = file => file.replace(/(?<!\.min)\.(js|css)$/g, ext => `.min${ext}`);
 
     const createCDNLink = (data, type, cond = '') => {
         Object.keys(data).forEach(key => {
-            let { name, version, file, other_name } = data[key]
-            const cdnjs_name = other_name || name
-            const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '')
-            const min_cdnjs_file = minFile(cdnjs_file)
-            if (cond === 'internal') file = `source/${file}`
-            const min_file = minFile(file)
-            const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : ''
+            let { name, version, file, other_name } = data[key];
+            const cdnjs_name = other_name || name;
+            const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '');
+            const min_cdnjs_file = minFile(cdnjs_file);
+            if (cond === 'internal') file = `source/${file}`;
+            const min_file = minFile(file);
+            const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : '';
 
-            const value = {
-                version,
-                name,
-                file,
-                cdnjs_file,
-                min_file,
-                min_cdnjs_file,
-                cdnjs_name
-            }
+            const value = { version, name, file, cdnjs_file, min_file, min_cdnjs_file, cdnjs_name };
 
             const cdnSource = {
                 local: cond === 'internal' ? `${cdnjs_file + verType}` : `/pluginsSrc/${name}/${file + verType}`,
@@ -121,27 +52,26 @@ hexo.extend.filter.register('before_generate', () => {
                 unpkg: `https://unpkg.com/${name}${verType}/${file}`,
                 cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
                 custom: (CDN.custom_format || '').replace(/\$\{(.+?)}/g, (match, $1) => value[$1]),
-            }
+            };
 
-            data[key] = cdnSource[type]
-        })
+            data[key] = cdnSource[type];
+        });
 
-        if (cond === 'internal') data.main_css = 'css/index.css' + (CDN.version ? `?v=${version}` : '')
-        return data
-    }
+        if (cond === 'internal') data.main_css = `css/index.css${CDN.version ? `?v=${version}` : ''}`;
+        return data;
+    };
 
-    // delete null value
     const deleteNullValue = obj => {
-        if (!obj) return
-        for (const i in obj) {
-            obj[i] === null && delete obj[i]
+        if (!obj) return;
+        for (const key in obj) {
+            if (obj[key] === null) delete obj[key];
         }
-        return obj
-    }
+        return obj;
+    };
 
     themeConfig.cdn = Object.assign(
         createCDNLink(internalSrc, CDN.internal, 'internal'),
         createCDNLink(thirdPartySrc, CDN.third_party),
         deleteNullValue(CDN.options)
-    )
-})
+    );
+});

package/scripts/event/merge_config.js

@@ -37,23 +37,20 @@ hexo.extend.filter.register('before_generate', () => {
       post: { noSticky: 'about', Sticky: 'allInfo' },
       page: { noSticky: 'about', Sticky: 'allInfo' },
       card: {
-        style: 0,
         author: {
           img: '/img/logo.png',
           sticker: '/img/happy-sticker.avif',
         },
         url: '/about/',
-        background: null,
         content1: 'Solitude',
-        content2: 'A simple theme for Hexo',
-        sayhello: {
+        state: {
           morning: 'Good Morning',
           noon: 'Good Noon',
           afternoon: 'Good Afternoon',
           night: 'Good Night',
           goodnight: 'Good Night',
         },
-        sayhello2: ['Welcome to Solitude', 'A simple theme for Hexo', 'Enjoy your time', 'Have a nice day', 'Good luck'],
+        witty_words: [],
         information: null,
       },
       flip: {
@@ -171,8 +168,9 @@ hexo.extend.filter.register('before_generate', () => {
       text: '404 Not Found',
       recommendList: true
     },
-    says: {
+    brevity: {
       enable: false,
+      music: false,
       home_mini: false,
       style: 1,
       strip: 30
@@ -327,7 +325,7 @@ hexo.extend.filter.register('before_generate', () => {
     font: {
       'font-size': '16px',
       'code-font-size': '16px',
-      'font-family': 'PingFang SC, Hiragino Sans GB,Microsoft YaHei',
+      'font-family': 'PingFang SC, Hiragino Sans GB,Microsoft YaHei, sans-serif',
       'code-font-family': '"monospace", monospace',
     },
     extends: {

package/scripts/filter/checkThemeConfig.js

@@ -4,9 +4,9 @@ hexo.extend.filter.register('before_post_render', () => {
         const data = hexo.locals.get('data');
         const logger = hexo.log;
         const theme = hexo.theme.config;
-        if (theme.says.enable && !data.essay) {
-            logger.error('\n 启用即刻短文的情况下，请新建 essay.yaml。');
-            logger.error('\n If says is enabled, essay data must be supplied! \n Please create essay.yaml.');
+        if (theme.brevity.enable && !data.brevity) {
+            logger.error('\n 启用即刻短文的情况下，请新建 brevity.yaml。');
+            logger.error('\n If brevity is enabled, brevity data must be supplied! \n Please create brevity.yaml.');
             process.exit(-1);
         }
         if (theme.footer.randomlink && !data.links){

package/scripts/helper/stylus.js

@@ -2,9 +2,7 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     const {config, theme} = this;
     const data = hexo.locals.get('data');
 
-    style.define('$about', data && data.about ? Object.keys(data.about) : false);
-    style.define('$link', !!(data && data.links) || !!(data && data.tlink))
-    style.define('$equipment', !!(data && data.equipment))
+    style.define('$about', data && data.about ? Object.keys(data.about) : {});
 
     // highlight
     const {syntax_highlighter: syntaxHighlighter, highlight, prismjs} = hexo.config

package/source/css/_comments/twikoo.styl

@@ -282,7 +282,7 @@
   code
   kbd
   samp
-    font-family ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace
+    font-family $code-font-family
 
   pre
     background var(--efu-secondbg)

package/source/css/{_layout → _components}/capsule.styl

@@ -1,19 +1,18 @@
-if hexo-config('capsule.enable')
-  @keyframes changeright
-    0%, 50%, 100%
-      transform: rotate(0deg) scale(1.1)
-      box-shadow: 0 0 2px #ffffff00
-    25%, 75%
-      transform: rotate(90deg) scale(1.1)
-      box-shadow: 0 0 14px #ffffff
-
-  @keyframes playingShadow 
+@keyframes changeright
+  0%, 50%, 100%
+    transform: rotate(0deg) scale(1.1)
+    box-shadow: 0 0 2px #ffffff00
+  25%, 75%
+    transform: rotate(90deg) scale(1.1)
+    box-shadow: 0 0 14px #ffffff
+
+  @keyframes playingShadow
     0%, 100%
       box-shadow: 0 0px 12px -3px var(--efu-none)
     50%
       box-shadow: 0 0px 12px 0px var(--efu-main)
 
-  @keyframes lightBar 
+  @keyframes lightBar
     0%, 100%
       opacity: 0.1
     60%
@@ -21,11 +20,11 @@ if hexo-config('capsule.enable')
 
   .aplayer.aplayer-narrow
     .aplayer-body,
-    .aplayer-pic 
+    .aplayer-pic
       height: 66px
       width: 66px
 
-  #nav-music 
+  #nav-music
     display: flex
     align-items: center
     z-index: 12
@@ -39,41 +38,41 @@ if hexo-config('capsule.enable')
     border-radius: 40px
     overflow: hidden
 
-    &:active 
+    &:active
       transform: scale(0.97)
 
-    &.playing 
+    &.playing
       border: var(--style-border)
       box-shadow: 0 0px 12px -3px var(--efu-none)
       animation: playingShadow 5s linear infinite
 
       .aplayer.aplayer-withlrc
-        .aplayer-pic 
+        .aplayer-pic
           box-shadow: 0 0 14px #ffffffa6
           transform: rotate(0deg) scale(1.1)
           border-color: var(--efu-white)
-          animation-play-state: running  
+          animation-play-state: running
 
-        .aplayer-info 
+        .aplayer-info
           color: var(--efu-white)
 
-      #nav-music-hoverTips 
+      #nav-music-hoverTips
         width: 0
 
-      .aplayer 
+      .aplayer
         background: var(--efu-main)
         border: var(--style-border-hover)
         backdrop-filter: saturate(180%) blur(20px)
         transform: translateZ(0)
 
-      .aplayer .aplayer-info .aplayer-controller .aplayer-bar-wrap .aplayer-bar .aplayer-played 
+      .aplayer .aplayer-info .aplayer-controller .aplayer-bar-wrap .aplayer-bar .aplayer-played
         animation-play-state: running
 
-    &:hover:not(.playing) #nav-music-hoverTips 
+    &:hover:not(.playing) #nav-music-hoverTips
       opacity: 1
 
     .aplayer.aplayer-withlrc
-      .aplayer-pic 
+      .aplayer-pic
         height: 25px
         width: 25px
         border-radius: 40px
@@ -84,7 +83,7 @@ if hexo-config('capsule.enable')
         animation: changeright 24s linear infinite
         animation-play-state: paused
 
-      .aplayer-info 
+      .aplayer-info
         height: 100%
         color: var(--efu-fontcolor)
         margin: 0
@@ -92,7 +91,7 @@ if hexo-config('capsule.enable')
         display: flex
         align-items: center
 
-    #nav-music-hoverTips 
+    #nav-music-hoverTips
       color: var(--efu-white)
       background: var(--efu-main)
       width: 100%
@@ -109,7 +108,7 @@ if hexo-config('capsule.enable')
       z-index: 2
       transition: 0.3s
 
-    .aplayer 
+    .aplayer
       background: var(--efu-card-bg)
       border-radius: 60px
       height: 41px
@@ -121,16 +120,16 @@ if hexo-config('capsule.enable')
 
       .aplayer-notice,
       .aplayer-miniswitcher,
-      .aplayer-list 
+      .aplayer-list
         display: none
 
-      .aplayer-body 
+      .aplayer-body
         position: relative
         display: flex
         align-items: center
 
-      .aplayer-info 
-        .aplayer-music 
+      .aplayer-info
+        .aplayer-music
           margin: 0
           display: flex
           align-items: center
@@ -139,7 +138,7 @@ if hexo-config('capsule.enable')
           z-index: 1
           height: 100%
 
-          .aplayer-title 
+          .aplayer-title
             cursor: pointer
             line-height: 1
             display: inline-block
@@ -150,35 +149,35 @@ if hexo-config('capsule.enable')
             transition: 0.3s
             user-select: none
 
-        .aplayer-controller 
+        .aplayer-controller
           position: absolute
           width: 100%
           height: 100%
           top: 0
           left: 0
 
-          .aplayer-bar-wrap 
+          .aplayer-bar-wrap
             margin: 0
             padding: 0
 
-            .aplayer-bar 
+            .aplayer-bar
               height: 100%
               background: 0 0
 
-              .aplayer-loaded 
+              .aplayer-loaded
                 display: none
 
-              .aplayer-played 
+              .aplayer-played
                 height: 100%
                 opacity: 0.1
                 background-color: var(--efu-white) !important
                 animation: lightBar 5s ease infinite
                 animation-play-state: paused
 
-      .aplayer-pic 
+      .aplayer-pic
         pointer-events: none
 
-        .aplayer-button 
+        .aplayer-button
           bottom: 50%
           right: 50%
           transform: translate(50%, 50%)
@@ -186,44 +185,44 @@ if hexo-config('capsule.enable')
           transition: 0.3s
           pointer-events all
 
-        &:has(.aplayer-button.aplayer-play) 
+        &:has(.aplayer-button.aplayer-play)
           animation-play-state: paused
           transform: rotate(0deg) scale(1) !important
 
         margin-left: 8px
 
       .aplayer-info .aplayer-controller .aplayer-time,
-      .aplayer-info .aplayer-music .aplayer-author 
+      .aplayer-info .aplayer-music .aplayer-author
         display: none
 
-      &.aplayer-withlist .aplayer-info 
+      &.aplayer-withlist .aplayer-info
         border: none
 
-      .aplayer-lrc 
+      .aplayer-lrc
         width: 0
         opacity: 0
         transition: 0.3s
         margin-bottom: -15px
 
-        p.aplayer-lrc-current 
+        p.aplayer-lrc-current
           color: var(--efu-white)
           border: none
           min-height: 20px
           filter: none
 
         &:after,
-        &:before 
+        &:before
           display: none
 
-        p 
+        p
           color: #ffffffb3
           filter: blur(.8px)
 
-    &.stretch .aplayer.aplayer-withlrc .aplayer-lrc 
+    &.stretch .aplayer.aplayer-withlrc .aplayer-lrc
       width: 200px
       margin-left: 8px
       opacity: 1
 
   .aplayer-thumb
-    width: 0!important
-    height: 0!important
+    width: 0 !important
+    height: 0 !important

package/source/css/_components/expire.styl

@@ -0,0 +1,12 @@
+.expire
+  display flex
+  align-items center
+  border-radius 8px
+  background-color rgba(255, 0, 0, .5)
+  border-left 5px solid var(--efu-red)
+  padding 10px 16px
+  color var(--efu-white)
+
+  i.solitude
+    color var(--efu-white)
+    margin-right 8px

package/source/css/_components/index.styl

@@ -0,0 +1,17 @@
+if hexo-config('capsule.enable')
+    @import 'capsule.styl'
+
+if hexo-config('rightside.enable')
+    @import 'rightside.styl'
+
+if hexo-config('expire.enable')
+    @import 'expire.styl'
+
+if hexo-config('keyboard.enable')
+    @import 'keyboard.styl'
+
+if hexo-config('loading.pace')
+    @import 'pace.styl'
+
+if hexo-config('display_mode.universe')
+    @import 'universe.styl'

package/source/css/_components/keyboard.styl

@@ -0,0 +1,59 @@
+#keyboard-tips
+  position fixed
+  top 80px
+  left 20px
+  z-index 999
+  background var(--efu-maskbgdeep)
+  border-radius 12px
+  border var(--style-border)
+  padding 20px
+  display flex
+  flex-direction column
+  backdrop-filter saturate(180%) blur(20px)
+  transform translateZ(0)
+  pointer-events none
+  box-shadow var(--efu-shadow-border)
+  opacity 0
+  transition .3s
+
+  &.show
+    opacity 1
+    transition .1s
+
+  .keyboardTitle
+    font-size 12px
+    color var(--efu-secondtext)
+    line-height 1
+
+  .keyboardList
+    display flex
+    flex-direction column
+    margin-top 8px
+
+  .keyboardItem
+    display flex
+    margin-top 4px
+
+  .keyGroup
+    display flex
+    align-items center
+    width 90px
+
+    .key
+      padding 0.2em 0.4em
+      font-family inherit
+      background-color var(--efu-card-bg)
+      color var(--efu-fontcolor)
+      border var(--style-border)
+      border-color var(--efu-secondtext)
+      border-bottom 2px solid var(--efu-secondtext)
+      box-shadow var(--efu-shadow-border)
+      border-radius 0.25rem
+      overflow-wrap break-word
+      overflow-x auto
+      font-weight 500
+      font-size .875em
+      margin-right 4px
+      vertical-align baseline
+      line-height 1
+      height 24px