hexo-theme-solitude 1.11.3 → 1.12.1

package/layout/post.pug

@@ -15,28 +15,6 @@ block content
                                 span.tags-punctuation
                                 | #{data.name}
                                 span.tagsPageCount #{data.length}
-                .social-share
-                    -  const path = config.url + url_for(page.path);
-                    -  const encodedPath = encodeURIComponent(path);
-                    -  const encodedTitle = encodeURIComponent(page.title);
-                    -  const encodedDescription = encodeURIComponent(page.description);
-                    -  const encodedIcon = encodeURIComponent(page.cover || theme.site.icon);
-                    each item in theme.post.share.list || []
-                        case item
-                            when 'qq'
-                                a.social-share-ico.icon-qq(href=`https://connect.qq.com/widget/shareqq/index.html?url=${encodedPath}&title=${encodedTitle}&desc=${encodedDescription}&summary=${encodedDescription}&site=${encodedTitle}&pics=${encodedIcon}` title="QQ")
-                            when 'weibo'
-                                a.social-share-ico.icon-weibo(href=`http://service.weibo.com/share/share.php?url=${encodedPath}&title=${encodedTitle}&pic=${encodedIcon}` title="Weibo")
-                            when 'telegram'
-                                a.social-share-ico.icon-telegram(href=`https://t.me/share/url?url=${encodedPath}&text=${encodedTitle}` title="Telegram")
-                            when 'whatsapp'
-                                a.social-share-ico.icon-whatsapp(href=`https://api.whatsapp.com/send?text=${encodedTitle} ${encodedPath}` title="WhatsApp")
-                            when 'linkedin'
-                                a.social-share-ico.icon-linkedin(href=`https://www.linkedin.com/shareArticle?mini=true&url=${encodedPath}&title=${encodedTitle}&summary=${encodedDescription}&source=${encodedTitle}` title="LinkedIn")
-                            when 'facebook'
-                                a.social-share-ico.icon-facebook(href=`https://www.facebook.com/sharer/sharer.php?u=${encodedPath}` title="Facebook")
-                            when 'twitter'
-                                a.social-share-ico.icon-twitter(href=`https://twitter.com/intent/tweet?url=${encodedPath}&text=${encodedTitle}` title="Twitter")
             if theme.google_adsense.enable && !theme.google_adsense.auto_ads && theme.google_adsense.post_content
                 div.google-ads-warp
                     ins.adsbygoogle(style="display:block; text-align:center; height:284px", 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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.11.3",
+  "version": "1.12.1",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {
@@ -16,14 +16,14 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/valor-x/hexo-theme-solitude.git"
+    "url": "https://github.com/everfu/hexo-theme-solitude"
   },
   "dependencies": {
     "hexo-renderer-stylus": "^3.0.0",
     "hexo-renderer-pug": "^3.0.0"
   },
   "bugs": {
-    "url": "https://github.com/valor-x/hexo-theme-solitude/issues",
+    "url": "https://github.com/everfu/hexo-theme-solitude/issues",
     "email": "o@efu.me"
   },
   "homepage": "https://www.efu.me/",

package/plugins.yml

@@ -114,4 +114,9 @@ mermaid_js:
 blueimp_md5:
   name: blueimp-md5
   file: js/md5.min.js
-  version: 2.19.0
+  version: 2.19.0
+qrcode:
+  name: qrcodejs
+  file: qrcode.min.js
+  version: 1.0.0
+  other_name: qrcodejs

package/scripts/event/merge_config.js

@@ -29,7 +29,7 @@ hexo.extend.filter.register('before_generate', () => {
                 sup: 'Recommend',
                 title: 'Solitude Docs',
                 url: 'https://solitude.js.org/',
-                img: '/img/default.png',
+                img: '/img/default.avif',
                 color: 'none',
             }
         },
@@ -50,7 +50,7 @@ hexo.extend.filter.register('before_generate', () => {
                 style: 0,
                 author: {
                     img: '/img/logo.png',
-                    sticker: '/img/happy-sticker.png',
+                    sticker: '/img/happy-sticker.avif',
                 },
                 url: '/about/',
                 background: null,
@@ -72,6 +72,11 @@ hexo.extend.filter.register('before_generate', () => {
                 backface: '',
                 backcolor: 'var(--efu-blue)'
             },
+            newest_comment: {
+                enable: false,
+                storage: .5,
+                limit: 5
+            },
             toc: {
                 post: true,
                 page: false,
@@ -108,12 +113,12 @@ hexo.extend.filter.register('before_generate', () => {
             tags: true,
             categories: true,
             default: {
-                cover: ['/img/default.png'],
+                cover: ['/img/default.avif'],
             }
         },
         post: {
             default: {
-                cover: ['/img/default.png'],
+                cover: ['/img/default.avif'],
                 locate: 'China, Changsha',
                 copyright: {
                     enable: true,
@@ -186,7 +191,7 @@ hexo.extend.filter.register('before_generate', () => {
             license: null,
             links: [{
                 name: 'Solitude',
-                url: 'https://github.com/valor-x/hexo-theme-solitude',
+                url: 'https://github.com/everfu/hexo-theme-solitude',
             }]
         },
         errorpage: {
@@ -236,8 +241,8 @@ hexo.extend.filter.register('before_generate', () => {
         lazyload: {
             enable: false,
             field: 'site',
-            placeholder: '/img/loading.gif',
-            errorimg: '/img/error_load.webp'
+            placeholder: '/img/loading.avif',
+            errorimg: '/img/error_load.avif'
         },
         loading: {
             fullpage: false,
@@ -300,10 +305,6 @@ hexo.extend.filter.register('before_generate', () => {
             lazyload: false,
             count: false,
             avatar: 'https://cravatar.cn',
-            newest_comment: {
-                enable: false,
-                storage: .2
-            }
         },
         twikoo: {
             envId: 'your envId',
@@ -347,11 +348,11 @@ hexo.extend.filter.register('before_generate', () => {
             enable: false,
             manifest: '/manifest.json',
             theme_color: "#006a73",
-            mask_icon: '/img/logo.png',
-            apple_touch_icon: '/img/logo.png',
-            bookmark_icon: '/img/logo.png',
-            favicon_32_32: '/img/logo.png',
-            favicon_16_16: '/img/logo.png'
+            mask_icon: '/img/pwa/favicon.ico',
+            apple_touch_icon: '/img/pwa/favicon.ico',
+            bookmark_icon: '/img/pwa/favicon.ico',
+            favicon_32_32: '/img/pwa/favicon_32.ico',
+            favicon_16_16: '/img/pwa/favicon_16.ico'
         },
         google_adsense: {
             enable: false,

package/scripts/event/welcome.js

@@ -9,6 +9,6 @@ hexo.on('ready', () => {
       ######  ####  ##### #####    #      ###   ######   ######
                             ${version}
   ===================================================================
-  GitHub: https://github.com/valor-x/hexo-theme-solitude
+  GitHub: https://github.com/everfu/hexo-theme-solitude
   `)
 })

package/scripts/filter/default.js

@@ -5,7 +5,7 @@ hexo.extend.filter.register('after_post_render', function (data) {
     const {config} = hexo.theme;
     if (data.layout === 'post') {
         let {copyright, locate, cover} = hexo.theme.config.post.default
-        cover = cover !== null ? cover : ['/img/default.png']
+        cover = cover !== null ? cover : ['/img/default.avif']
         data.locate = data.locate || locate
         data.cc = data.cc || copyright
         data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
@@ -15,7 +15,7 @@ hexo.extend.filter.register('after_post_render', function (data) {
     }
     if (data.layout === 'page') {
         let {cover} = hexo.theme.config.page.default
-        cover = cover !== null ? cover : ['/img/default.png']
+        cover = cover !== null ? cover : ['/img/default.avif']
         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/post_image.js

@@ -0,0 +1,13 @@
+'use strict'
+
+hexo.extend.filter.register('before_post_render', data => {
+  const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
+  let { cover: coverVal } = data
+
+  // Add path to top_img and cover if post_asset_folder is enabled
+  if (hexo.config.post_asset_folder) {
+    if (coverVal && coverVal.indexOf('/') === -1 && imgTestReg.test(coverVal)) data.cover = `${data.path}${coverVal}`
+  }
+  
+  return data
+})

package/scripts/helper/page.js

@@ -1,5 +1,5 @@
 "use strict";
-const { stripHTML, escapeHTML } = require('hexo-util')
+const { stripHTML, escapeHTML, prettyUrls } = require("hexo-util");
 hexo.extend.helper.register('page_description', function () {
     const { config, page } = this
     let description =  page.description || page.content || page.title || config.description
@@ -10,4 +10,8 @@ hexo.extend.helper.register('page_description', function () {
         ).replace(/\n/g, ' ').replace(/\s+/g, ' ');
         return description
     }
-})
+})
+
+hexo.extend.helper.register("urlNoIndex", function (url = null) {
+    return prettyUrls(url || this.url, { trailing_index: false, trailing_html: true });
+});

package/source/css/_highlight/color.styl

@@ -1,134 +1,72 @@
 $highlight_color = hexo-config('highlight.color')
 
 if $highlight_color == "default"
-  $highlight-comment = #969896
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "dark"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "funky"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #FFCB6B
-  $highlight-yellow = #C3E88D
-  $highlight-green = #89DDFF
-  $highlight-aqua = #82AAFF
-  $highlight-blue = #C792EA
-  $highlight-purple = #FF5370
-  $highlight-deletion = #F07178
-  $highlight-addition = #C3E88D
-else if $highlight_color == "okaidia"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #FFCB6B
-  $highlight-yellow = #C3E88D
-  $highlight-green = #89DDFF
-  $highlight-aqua = #82AAFF
-  $highlight-blue = #C792EA
-  $highlight-purple = #FF5370
-  $highlight-deletion = #F07178
-  $highlight-addition = #C3E88D
-else if $highlight_color == "tomorrow"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "twilight"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "darcula"
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
-else if $highlight_color == "material"
-  $highlight-comment = #546E7A
-  $highlight-red = #FF5370
-  $highlight-orange = #FFCB6B
-  $highlight-yellow = #C3E88D
-  $highlight-green = #89DDFF
-  $highlight-aqua = #82AAFF
-  $highlight-blue = #C792EA
-  $highlight-purple = #FF5370
-  $highlight-deletion = #F07178
-  $highlight-addition = #C3E88D
-else if $highlight_color == "solarized-light"
-  $highlight-comment = #93A1A1
-  $highlight-red = #DC322F
-  $highlight-orange = #CB4B16
-  $highlight-yellow = #B58900
-  $highlight-green = #859900
-  $highlight-aqua = #2AA198
-  $highlight-blue = #268BD2
-  $highlight-purple = #6C71C4
-  $highlight-deletion = #D33682
-  $highlight-addition = #859900
-else if $highlight_color == "solarized-dark"
-  $highlight-comment = #657B83
-  $highlight-red = #DC322F
-  $highlight-orange = #CB4B16
-  $highlight-yellow = #B58900
-  $highlight-green = #859900
-  $highlight-aqua = #2AA198
-  $highlight-blue = #268BD2
-  $highlight-purple = #6C71C4
-  $highlight-deletion = #D33682
-  $highlight-addition = #859900
-else if $highlight_color == "github"
-  $highlight-comment = #969896
-  $highlight-red = #D73A49
-  $highlight-orange = #BD2C00
-  $highlight-yellow = #E5C07B
-  $highlight-green = #28A745
-  $highlight-aqua = #00A9C0
-  $highlight-blue = #0366D6
-  $highlight-purple = #6F42C1
-  $highlight-deletion = #D73A49
-  $highlight-addition = #28A745
-else
-  $highlight-comment = #6272A4
-  $highlight-red = #FF5370
-  $highlight-orange = #F78C6C
-  $highlight-yellow = #FFCB6B
-  $highlight-green = #C3E88D
-  $highlight-aqua = #89DDFF
-  $highlight-blue = #82AAFF
-  $highlight-purple = #C792EA
-  $highlight-deletion = #BF42BF
-  $highlight-addition = #105EDE
+  $highlight-variable-dark = #569CD6
+  $highlight-number-dark = #B5CEA8
+  $highlight-string-dark = #CE9178
+  $highlight-title-dark = #DCDCAA
+  $highlight-emphasis-dark = #6A9955
+  $highlight-variable-light = #0000FF
+  $highlight-number-light = #098658
+  $highlight-string-light = #A31515
+  $highlight-title-light = #795E26
+  $highlight-emphasis-light = #0451A5
+  $highlight-parameter-dark = #FFB86C
+  $highlight-parameter-light = #FFB86C
+  $highlight-comment-dark = $highlight-string-dark
+  $highlight-comment-light = $highlight-string-light
+  $highlight-deleted = #f00
+  $highlight-inserted = #35cd4b
+else if $highlight_color == "solidity"
+  $highlight-variable-dark = #D74BDE
+  $highlight-number-dark = #8DA1A0
+  $highlight-string-dark = #5B876D
+  $highlight-title-dark = #D74BDE
+  $highlight-emphasis-dark = #BA9C23
+  $highlight-variable-light = #0000FF
+  $highlight-number-light = #098658
+  $highlight-string-light = #A31515
+  $highlight-title-light = #795E26
+  $highlight-emphasis-light = #0451A5
+  $highlight-parameter-dark = #FFB86C
+  $highlight-parameter-light = #FFB86C
+  $highlight-comment-dark = $highlight-string-dark
+  $highlight-comment-light = $highlight-string-light
+  $highlight-deleted = #f00
+  $highlight-inserted = #35cd4b
+else if $highlight_color == "dracula"
+  $highlight-variable-dark = #FF79C6
+  $highlight-number-dark = #BD93F9
+  $highlight-string-dark = #F1FA8C
+  $highlight-title-dark = #50FA7B
+  $highlight-emphasis-dark = #8BE9FD
+  $highlight-variable-light = #FF79C6
+  $highlight-number-light = #BD93F9
+  $highlight-string-light = #A31515
+  $highlight-title-light = #795E26
+  $highlight-emphasis-light = #0451A5
+  $highlight-parameter-dark = #FFB86C
+  $highlight-parameter-light = #FFB86C
+  $highlight-comment-dark = #6272A4
+  $highlight-comment-light = #6272A4
+  $highlight-important-dark = #BD93F9
+  $highlight-important-light = #BD93F9
+  $highlight-deleted = #f00
+  $highlight-inserted = #35cd4b
+else 
+  $highlight-variable-dark = #569CD6
+  $highlight-number-dark = #B5CEA8
+  $highlight-string-dark = #CE9178
+  $highlight-title-dark = #DCDCAA
+  $highlight-emphasis-dark = #6A9955
+  $highlight-variable-light = #0000FF
+  $highlight-number-light = #098658
+  $highlight-string-light = #A31515
+  $highlight-title-light = #795E26
+  $highlight-emphasis-light = #0451A5
+  $highlight-parameter-dark = #FFB86C
+  $highlight-parameter-light = #FFB86C
+  $highlight-comment-dark = $highlight-string-dark
+  $highlight-comment-light = $highlight-string-light
+  $highlight-deleted = #f00
+  $highlight-inserted = #35cd4b

package/source/css/_highlight/highlight/diff.styl

@@ -5,75 +5,47 @@ figure.highlight
     background var(--efu-hl-bg)
     border-radius 6px
     display initial
-  pre .deletion
-    color $highlight-deletion
 
-  pre .addition
-    color $highlight-addition
+  .keyword
+  .attr
+  .variable
+  .literal
+  .property
+    color $highlight-variable-light
 
-  pre .meta
-    color $highlight-purple
+  .number
+    color $highlight-number-light
 
-  pre
-    .comment
-      color $highlight-comment
+  .string
+    color $highlight-string-light
 
-    .variable,
-    .attribute,
-    .regexp,
-    .ruby .constant,
-    .xml .tag .title,
-    .xml .pi,
-    .xml .doctype,
-    .html .doctype,
-    .css .id,
-    .tag .name,
-    .css .class,
-    .css .pseudo
-      color $highlight-red
+  .built_in
+  .title
+  .params
+  .name
+    color $highlight-title-light
 
-    .tag
-      color $highlight-aqua
+  .emphasis
+    color $highlight-emphasis-light
 
-    .number,
-    .preprocessor,
-    .literal,
-    .params,
-    .constant,
-    .command
-      color $highlight-orange
+  [data-theme=dark] &  
+    .keyword
+    .attr
+    .variable
+    .property
+      color $highlight-variable-dark
 
-    .built_in
-      color $highlight-yellow
-
-    .ruby .class .title,
-    .css .rules .attribute,
-    .string,
-    .value,
-    .inheritance,
-    .header,
-    .ruby .symbol,
-    .xml .cdata,
-    .special,
-    .number,
-    .formula
-      color $highlight-green
+    .number
+      color $highlight-number-dark
 
-    .keyword,
-    .title,
-    .css .hexcolor
-      color: $highlight-aqua
+    .string
+      color $highlight-string-dark
 
-    .function,
-    .python .decorator,
-    .python .title,
-    .ruby .function .title,
-    .ruby .title .keyword,
-    .perl .sub,
-    .javascript .title,
-    .coffeescript .title
-      color $highlight-blue
+    .built_in
+    .built_in
+    .title
+    .params
+      color $highlight-title-dark
 
-    .tag .attr,
-    .javascript .function
-      color $highlight-purple
+    .emphasis
+      color $highlight-emphasis-dark

package/source/css/_highlight/index.styl

@@ -86,7 +86,7 @@ figure
       border-top var(--style-border-always)
       position absolute
       bottom 0
-      z-index 10
+      z-index 1
       width 100%
       text-align center
       font-size 16px