hexo-theme-solitude 1.5.11 → 1.6.0

package/package.json

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

package/plugins.yml

@@ -74,10 +74,6 @@ busuanzi_js:
   name: busuanzi
   file: bsz.pure.mini.js
   version: 2.3.0
-snackbar_css:
-  name: node-snackbar
-  file: dist/snackbar.min.css
-  version: 0.1.16
 snackbar:
   name: node-snackbar
   file: dist/snackbar.min.js

package/scripts/event/cdn.js

@@ -61,7 +61,7 @@ hexo.extend.filter.register('before_generate', () => {
         },
         sco_ai_js: {
             name: 'hexo-theme-solitude',
-            file: 'js/sco-ai.min.js',
+            file: 'js/third_party/sco-ai.min.js',
             version
         },
         twikoo_commentBarrage: {
@@ -76,17 +76,17 @@ hexo.extend.filter.register('before_generate', () => {
         },
         waterfall: {
             name: 'hexo-theme-solitude',
-            file: 'js/waterfall.min.js',
+            file: 'js/third_party/waterfall.min.js',
             version
         },
         universe_js: {
             name: 'hexo-theme-solitude',
-            file: 'js/universe.min.js',
+            file: 'js/third_party/universe.min.js',
             version
         },
         lately_js: {
             name: 'hexo-theme-solitude',
-            file: 'js/lately.min.js',
+            file: 'js/third_party/lately.min.js',
             version
         },
     }

package/scripts/event/merge_config.js

@@ -58,6 +58,8 @@ hexo.extend.filter.register('before_generate', () => {
                 runtimeenable: true,
                 runtime: "2023-04-20 00:00:00",
             },
+        }, index_post_list: {
+            direction: 'column', content: false, length: 500, cover: 'both'
         }, page: {
             error: true, tags: true, categories: true, default: {
                 cover: ['/img/default.png'],
@@ -128,7 +130,7 @@ hexo.extend.filter.register('before_generate', () => {
         }, keyboard: {
             enable: false, list: []
         }, lazyload: {
-            enable: false, placeholder: '/img/loading.gif', errorimg: '/img/error_load.png'
+            enable: false, field: 'site', placeholder: '/img/loading.gif', errorimg: '/img/error_load.png'
         }, loading: {
             fullpage: false, pace: true,
         }, highlight: {
@@ -167,6 +169,12 @@ hexo.extend.filter.register('before_generate', () => {
             },
             verify_site: [],
             css_prefix: false,
+            font: {
+                'font-size': '16px',
+                'code-font-size': '16px',
+                'font-family': '"PingFang SC","Hiragino Sans GB","Microsoft YaHei"',
+                'code-font-family': '"monospace", "monospace"',
+            },
             extends: {
                 head: [], body: [],
             },

package/scripts/event/welcome.js

@@ -1,6 +1,6 @@
 hexo.on('ready', () => {
-  const { version } = require('../../package.json')
-  hexo.log.info(`
+    const {version} = require('../../package.json')
+    hexo.log.info(`
   ===================================================================
        #####  ####  #     #####  ###### #     # ######   ######
       #      #    # #       #      #    #     # #      # #

package/scripts/filter/checkThemeConfig.js

@@ -4,12 +4,12 @@ hexo.extend.filter.register('before_post_render', () => {
         const data = hexo.locals.get('data');
         const logger = hexo.log;
         const theme = hexo.theme.config;
-        if (theme.hometop.banner.enable && !theme.hometop.banner.icon) {
+        if (theme.hometop.enable && !theme.hometop.banner.icon) {
             logger.error('\n 启用banner的情况下，必须提供 icon 图片！\n 请在主题配置文件中设置 hometop.banner.icon 选项。');
             logger.error('\n If banner is enabled, icon image must be supplied! \n Please set the hometop.banner.icon option in the theme configuration file.');
             process.exit(-1);
         }
-        if (theme.says.enable && theme.says.mode === 'local' && !data.essay) {
+        if (theme.says.enable && !data.essay) {
             logger.error('\n 启用说说的情况下，必须提供 essay 数据文件！\n 请新建 essay.yaml。');
             logger.error('\n If says is enabled, essay data must be supplied! \n Please create essay.yaml.');
             process.exit(-1);

package/scripts/filter/default.js

@@ -4,7 +4,8 @@ hexo.extend.filter.register('after_post_render', function (data) {
     data.title = data.title || 'Untitled';
     const {config} = hexo.theme;
     if (data.layout === 'post') {
-        const {copyright, locate, cover} = hexo.theme.config.post.default
+        let {copyright, locate, cover} = hexo.theme.config.post.default
+        cover = cover !== null ? cover : ['/img/default.png']
         data.locate = data.locate || locate
         data.cc = data.cc || copyright
         data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
@@ -12,7 +13,8 @@ hexo.extend.filter.register('after_post_render', function (data) {
         data.toc = !!(config.aside.toc.post && data.toc !== false);
     }
     if (data.layout === 'page') {
-        const {cover} = hexo.theme.config.page.default
+        let {cover} = hexo.theme.config.page.default
+        cover = cover !== null ? cover : ['/img/default.png']
         data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
         data.excerpt = data.title
         data.toc = !!(config.aside.toc.page && data.toc !== false && data.aside);

package/scripts/filter/lazyload.js

@@ -1,7 +1,20 @@
+'use strict'
+
+const urlFor = require('hexo-util').url_for.bind(hexo)
+
+const lazyload = (content, img) => {
+    return content.replace(/(<img(?!.*?class[\t]*=[\t]*['"].*?nolazyload.*?['"]).*? src=)/gi, `$1 "${img}" data-lazy-src=`)
+}
+
 hexo.extend.filter.register('after_render:html', function (data) {
-    if (!hexo.theme.config.lazyload.enable) return
-    return data.replace(
-        /(<img(?!.*?class\t*=\t*['"].*?nolazyload.*?['"]).*?)( src=)/gi,
-        `$1 data-lazy-src=`
-    )
+    const { enable, placeholder ,field } = hexo.theme.config.lazyload
+    if (!enable || field !== 'site') return;
+    return lazyload(data, urlFor(placeholder))
+})
+
+hexo.extend.filter.register('after_post_render', data => {
+    const { enable, placeholder, field } = hexo.theme.config.lazyload
+    if (!enable || field !== 'post') return
+    data.content = lazyload(data.content, urlFor(placeholder))
+    return data
 })

package/scripts/filter/randomPosts.js

@@ -1,5 +1,5 @@
 hexo.extend.filter.register('after_render:html', function (data) {
     const posts = hexo.locals.get('posts').filter(post => post.random !== false).map(post => post.path);
-    data += `<script>const posts=${JSON.stringify(posts)};function toRandomPost(){ pjax.loadUrl('/'+posts[Math.floor(Math.random()*posts.length)]); };</script>`;
+    data += `<script>const posts=${JSON.stringify(posts)};function toRandomPost(){ pjax.loadUrl('/'+posts[Math.floor(Math.random()*posts.length)]); }</script>`;
     return data;
 });

package/scripts/helper/stylus.js

@@ -7,14 +7,7 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
         style.define('highlightTags', array);
     }
 
-    const aside = [
-        theme.config.aside.home.noSticky,
-        theme.config.aside.home.Sticky,
-        theme.config.aside.post.noSticky,
-        theme.config.aside.post.Sticky,
-        theme.config.aside.page.Sticky,
-        theme.config.aside.page.noSticky
-    ].join(',').split(',');
+    const aside = [theme.config.aside.home.noSticky, theme.config.aside.home.Sticky, theme.config.aside.post.noSticky, theme.config.aside.post.Sticky, theme.config.aside.page.Sticky, theme.config.aside.page.noSticky].join(',').split(',');
     const uniqueArr = [...new Set(aside)];
     if (uniqueArr.length > 0) {
         style.define('aside', uniqueArr);
@@ -22,12 +15,12 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
 
     style.define('about', data && data.about ? Object.keys(data.about) : []);
 
-    initGroupColor(theme.config.hometop.group,style);
+    initGroupColor(theme.config.hometop.group, style);
 
     // highlight
-    const { syntax_highlighter: syntaxHighlighter, highlight, prismjs } = hexo.config
-    let { enable: highlightEnable, line_number: highlightLineNumber } = highlight
-    let { enable: prismjsEnable, line_number: prismjsLineNumber } = prismjs
+    const {syntax_highlighter: syntaxHighlighter, highlight, prismjs} = hexo.config
+    let {enable: highlightEnable, line_number: highlightLineNumber} = highlight
+    let {enable: prismjsEnable, line_number: prismjsLineNumber} = prismjs
 
     // for hexo > 7.0
     if (syntaxHighlighter) {
@@ -41,8 +34,8 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     style.define('$prismjs_line_number', prismjsLineNumber)
 });
 
-function initGroupColor(gg,style) {
-    if(gg === null || gg === undefined) {
+function initGroupColor(gg, style) {
+    if (gg === null || gg === undefined) {
         style.define('banner_group', [])
         return;
     }
@@ -63,5 +56,6 @@ function initGroupColor(gg,style) {
         });
         return color;
     }
+
     style.define('getGroupColor', getGroupColor);
 }

package/source/css/_global/index.styl

@@ -54,4 +54,365 @@
   --card-box-shadow 0 3px 8px 6px rgba(7, 17, 27, 0.06)
   --card-hover-box-shadow 0 3px 8px 6px rgba(7, 17, 27, 0.15)
   --offset 0px
-  --hlscrollbar-bg #121212
+  --hlscrollbar-bg #121212
+
+body
+  position relative
+  min-height 100%
+  background var(--efu-background)
+  color var(--efu-fontcolor)
+  font-size $font-size
+  font-family $font-family
+  line-height 2
+  -webkit-tap-highlight-color transparent
+  margin 0
+
+*
+  box-sizing border-box
+
+html
+  line-height 1.15
+  -webkit-text-size-adjust 100%
+  text-size-adjust 100%
+  height: 100%;
+  font-size: 20px
+  overflow-y: overlay
+
+main
+  display block
+
+// scrollbar - chrome/safari
+*::-webkit-scrollbar
+  width 5px
+  height 5px
+
+*::-webkit-scrollbar-thumb
+  background var(--scrollbar-color)
+
+*::-webkit-scrollbar-track
+  background-color transparent
+
+#site-title,
+#site-subtitle,
+.site-name,
+#aside-content .author-info__name,
+#aside-content .author-info__description
+  font-family "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", sans-serif
+
+
+if hexo-config('lazyload.enable') && !hexo-config('lazyload.placeholder')
+  img
+    &[data-lazy-src]:not(.loaded)
+      filter blur(8px) brightness(1)
+
+    &[data-lazy-src].error
+      filter none
+
+::selection
+  background var(--efu-main)
+  color var(--efu-white)
+
+h1
+  font-size 2em
+  margin .67em 0
+
+h1, h2, h3, h4, h5, h6
+  padding-top 0
+  padding-left 0
+  font-weight 700
+  position relative
+  margin 1rem 0 0.7rem
+  color var(--efu-fontcolor)
+
+hr
+  box-sizing content-box
+  height 0
+  overflow visible
+  display: none
+
+pre
+  font-family monospace, monospace
+
+a
+  color var(--efu-fontcolor)
+  text-decoration none
+  transition all .3s ease 0s
+  overflow-wrap break-word
+  -webkit-user-drag none
+
+abbr[title]
+  border-bottom none
+  text-decoration underline dotted
+
+b, strong
+  font-weight bolder
+
+code, kbd, samp
+  font-family $code-font-family
+  font-size $code-font-size
+
+small
+  font-size 80%
+
+sub, sup
+  font-size 75%
+  line-height 0
+  position relative
+  vertical-align baseline
+
+sub
+  bottom -.25em
+
+sup
+  top -.5em
+
+button, input, optgroup, select, textarea
+  font-family inherit
+  font-size 100%
+  line-height 1.15
+  margin 0
+
+button, input
+  overflow visible
+
+input::placeholder
+  color var(--efu-gray)
+
+button, select
+  text-transform none
+
+[type=button], [type=reset], [type=submit], button
+  appearance button
+
+fieldset
+  padding .35em .75em .625em
+
+legend
+  box-sizing border-box
+  color inherit
+  display table
+  max-width 100%
+  padding 0
+  white-space normal
+
+progress
+  vertical-align baseline
+
+textarea
+  overflow auto
+
+[type=checkbox], [type=radio]
+  box-sizing border-box
+  padding 0
+
+[type=number]::-webkit-inner-spin-button, [type=number]::-webkit-outer-spin-button
+  height auto
+
+[type=search]
+  appearance textfield
+  outline-offset -2px
+
+[type=search]::-webkit-search-decoration
+  appearance none
+
+input[type=checkbox] + label::before, input[type=radio] + label::before
+  content ''
+  display inline-block
+  width 16px
+  height 16px
+  border 1px solid #999
+  background-color #fff
+  margin-right 5px
+  vertical-align middle
+
+::-webkit-file-upload-button
+  appearance button
+  font inherit
+
+summary
+  display list-item
+
+template
+  display none
+
+[hidden]
+  display none
+
+input::placeholder
+  color var(--efu-fontcolor)
+
+.table-wrap
+  overflow-x scroll
+  margin 0 0 1rem
+
+table
+  display table
+  width 100%
+  border-spacing 0
+  border-collapse collapse
+  empty-cells show
+
+table thead
+  background rgba(153, 169, 191, .1)
+
+table td, table th
+  padding .3rem .6rem
+  border 1px solid var(--light-grey)
+  vertical-align middle
+
+button
+  padding 0
+  outline 0
+  border none
+  color var(--efu-fontcolor)
+  background 0 0
+  cursor pointer
+
+img
+  border-style none
+  max-width 100%
+  transition all .2s ease 0s
+  -webkit-user-drag none
+
+img:not([src]), img[src=""]
+  opacity 0
+
+.img-alt
+  font-size 12px
+  margin 0
+  margin-top 8px
+  color var(--efu-secondtext)
+
+.is-center
+  text-align center
+  display flex
+  flex-wrap wrap
+  justify-content center
+  flex-direction row
+  align-items center
+
+.copy-true
+  user-select all
+
+.pull-left
+  float left
+
+.pull-right
+  float right
+
+blockquote
+  border var(--style-border-always)
+  background-color var(--efu-secondbg)
+  color var(--efu-secondtext)
+  border-radius 8px
+  margin 1rem 0
+  padding .5rem .8rem
+
+  p
+    padding 0
+    margin 0
+
+li, ul
+  list-style none
+  display block
+  margin 0
+  padding 0
+
+::-webkit-scrollbar
+  width 6px
+  height 6px
+
+::-webkit-scrollbar-thumb
+  background var(--efu-scrollbar)
+  border-radius 8px
+  cursor pointer
+
+::-webkit-scrollbar-thumb:hover
+  background var(--efu-main)
+  opacity 1
+  display block !important
+
+::-webkit-scrollbar-track
+  background-color var(--efu-none)
+
+[data-theme=dark] img
+  filter brightness(1)
+
+a.extend
+  .next
+    right 0
+
+  .prev
+    left 0
+
+table td, table th
+  border var(--style-border-always)
+
+table thead
+  background var(--efu-secondbg)
+
+b, strong
+  color var(--efu-lighttext)
+
+.button--animated
+  border-radius 8px
+  transition .3s
+  position relative
+
+i.solitude
+  font-size 22px
+  line-height 1
+
+.layout
+  display: flex
+  margin: 0 auto
+  padding: 1rem 1.5rem
+  max-width: 1200px
+  +maxWidth768()
+    padding 0
+
+  &#content-inner
+    max-width: 1400px
+
+  /.hide-aside.layout
+    max-width: 1400px
+
+    > div
+      width: 100% !important
+
+  > div:first-child
+    width calc(100% - 300px)
+
+    +maxWidth1200()
+      width 100%
+
+  > div:first-child:not(.recent-posts)
+    box-shadow var(--efu-shadow-border)
+    padding 1rem 2rem
+    border-radius 12px
+    background var(--efu-card-bg)
+    border var(--style-border)
+    align-self flex-start
+    animation slide-in .6s .1s backwards
+    position relative
+
+    +maxWidth768()
+      box-shadow none
+      border none
+      padding 0 1rem
+      background var(--efu-background)
+
+span.tags-punctuation::before
+  content: "\e071"
+  font-family: solitude, serif !important
+  font-size: 12px
+  transition none
+  margin-right: 2px
+  opacity: .4
+
+  .hide-aside #page &
+    font-size 16px
+
+  #post-info &
+    font-size 14px
+    line-height 32px