hexo-theme-solitude 1.5.10 → 1.5.11

package/_config.yml

@@ -274,7 +274,7 @@ aside:
     postcount: true
     # 总字数
     # The number of words on the web site
-    wordcount: true
+    wordcount: false
     # 访问量
     # PV
     pv: true
@@ -310,7 +310,7 @@ post:
     # 文章默认图片
     # default cover
     cover:
-      # - /img/default.png # 默认图片 / default cover
+      # -  # 默认图片 / default cover
     # 文章发布默认地址
     # default post locate
     locate: 衡阳
@@ -595,7 +595,7 @@ highlight:
   theme: default # default: 默认 / mac : apple terminal
   # 代码配色
   # Code color
-  color: default # default: 默认  / vscode / solarized-dark / solarized-light / dracula / monokai
+  color: default # default: 默认  / dark / funky / okaidia / tomorrow / twilight / darcula / solarized-dark / solarized-light / material / github
 
 # 图片灯箱
 # image lightbox

package/layout/includes/inject/head.pug

@@ -78,7 +78,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.10",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.11",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"

package/package.json

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

package/scripts/event/merge_config.js

@@ -0,0 +1,203 @@
+hexo.extend.filter.register('before_generate', () => {
+    const defaultConfig = {
+        site: {
+            name: {
+                class: 'text', custom: 'Solitude'
+            }, siteIcon: '/img/logo.png', icon: 'icon'
+        }, nav: {
+            group: null, menu: null, right: {
+                random: false, console: false, custom: [],
+            }
+        }, hometop: {
+            enable: false, banner: {
+                title: 'Solitude', url: 'A simple theme for Hexo', icon: null,
+            }, group: null, recommendList: {
+                sup: 'Recommend',
+                title: 'Solitude Docs',
+                url: 'https://solitude-docs.efu.me/',
+                img: '/img/default.png',
+                color: 'none',
+            }
+        }, aside: {
+            home: {
+                noSticky: 'about', Sticky: 'allInfo'
+            }, post: {
+                noSticky: 'about', Sticky: 'allInfo'
+            }, page: {
+                noSticky: 'about', Sticky: 'allInfo'
+            }, card: {
+                author: {
+                    img: '/img/logo.png', sticker: '/img/happy-sticker.png',
+                },
+                url: '/about/',
+                content1: 'Solitude',
+                content2: 'A simple theme for Hexo',
+                sayhello: {
+                    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'],
+                information: null,
+            }, flip: {
+                favicon: '', face: '', backface: '', backcolor: 'var(--efu-blue)'
+            }, toc: {
+                post: true, page: false, vague: true,
+            }, tags: {
+                enable: true, limit: 20, highlight: false, list: [],
+            }, archive: {
+                enable: true, type: 'month'
+            }, siteinfo: {
+                postcount: true,
+                wordcount: false,
+                pv: true,
+                uv: true,
+                updatetime: true,
+                runtimeenable: true,
+                runtime: "2023-04-20 00:00:00",
+            },
+        }, page: {
+            error: true, tags: true, categories: true, default: {
+                cover: ['/img/default.png'],
+            }
+        }, post: {
+            default: {
+                cover: ['/img/default.png'], locate: 'China, Changsha', copyright: {
+                    enable: true,
+                    license: 'CC BY-NC-SA 4.0',
+                    licenurl: 'https://creativecommons.org/licenses/by-nc-sa/4.0/',
+                }
+            }, meta: {
+                date: false,
+                updated: false,
+                locate: false,
+                wordcount: false,
+                readtime: false,
+                pv: false,
+                uv: false,
+                comment: false,
+            }, award: {
+                enable: false,
+                wechat: 'https://7.isyangs.cn/34/65f2e5814db1a-34.png',
+                alipay: 'https://7.isyangs.cn/34/65f2e5a6d2ef5-34.png',
+                url: '/about/',
+            }, rss: null, covercolor: {
+                enable: false, mode: 'local', api: 'https://api.qjqq.cn/api/Imgcolor?img=', time: 43200000,
+            }
+        }, 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"
+        }, display_mode: {
+            type: 'auto', universe: false
+        }, related_post: {
+            enable: false, limit: 2, date_type: 'created'
+        }, footer: {
+            information: {
+                left: null, right: null,
+            }, group: null, randomlink: false, privacy: null, license: null, links: [{
+                name: 'Solitude', url: 'https://github.com/valor-x/hexo-theme-solitude',
+            }]
+        }, errorpage: {
+            img: 'https://7.isyangs.cn/34/65f2e65eae32a-34.png', text: '404 Not Found', recommendList: true
+        }, says: {
+            enable: false, home_mini: false, style: 1, strip: 30
+        }, meting_api: "https://meting.qjqq.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r", music: {
+            enable: false, id: '8407304077', server: 'netease', type: 'playlist', volume: 0.8, mutex: true,
+        }, capsule: {
+            enable: false, id: '8407304077', server: 'netease', type: 'playlist',
+        }, moments: {
+            enable: false,
+            api: '',
+            error_img: '/img/logo.png',
+            sort_rule: 'created',
+            expire_days: 1,
+            page_init_number: 10,
+            page_turning_number: 5,
+            angle: false,
+            appjs: 'https://cdn.cbd.int/st-source@1.0.3/js/fcircle.min.js',
+            bundlejs: 'https://cdn.cbd.int/st-source/js/moment/bundle.min.js',
+            randompostjs: 'https://cdn.cbd.int/st-source/js/moment/random_post.min.js'
+        }, keyboard: {
+            enable: false, list: []
+        }, lazyload: {
+            enable: false, placeholder: '/img/loading.gif', errorimg: '/img/error_load.png'
+        }, loading: {
+            fullpage: false, pace: true,
+        }, highlight: {
+            enable: true, limit: 200, copy: true, expand: true, theme: 'default', color: 'default',
+        }, lightbox: false, fancybox: false, mediumZoom: false, mermaid: false, translate: {
+            enable: false, defaultEncoding: 2, translateDelay: 0,
+        }, opengraph: {
+            enable: false, options: null
+        }, wordcount: false, busuanzi: false, search: {
+            enable: false, type: 'local', tags: [], algolia: null, local: {
+                preload: false, CDN: null,
+            }
+        }, rightside: {
+            enable: false
+        }, post_ai: {
+            enable: false,
+            modelName: 'GPT 3',
+            key: 'your key',
+            talk: 'I am a AI.',
+            randomPost: false,
+            tips: 'AI is not perfect, please use it with caution.'
+        }, katex: {
+            enable: false, per_page: false, copytex: false,
+        }, comment: {
+            enable: false,
+            type: 'twikoo',
+            commentBarrage: false,
+            newComment: false,
+            randomInfoStart: [`baby's`, `little`, `my`,],
+            randomInfoEnd: [`home`, `world`, `heart`,],
+            twikoo: {
+                envId: 'your envId', lang: 'zh-CN', accessToken: null,
+            },
+            waline: {
+                envId: 'your envId', pageview: true, option: null,
+            },
+            verify_site: [],
+            css_prefix: false,
+            extends: {
+                head: [], body: [],
+            },
+            pwa: {
+                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'
+            },
+            google_adsense: {
+                enable: false,
+                auto_ads: false,
+                enable_page_level_ads: true,
+                js: 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js',
+                client: '',
+                slot: '',
+            },
+            CDN: {
+                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',
+                }
+            }
+        }
+    }
+    hexo.theme.config = Object.assign(defaultConfig, hexo.theme.config)
+}, 1)

package/scripts/filter/default.js

@@ -2,18 +2,18 @@
 
 hexo.extend.filter.register('after_post_render', function (data) {
     data.title = data.title || 'Untitled';
-    const { config } = hexo.theme;
+    const {config} = hexo.theme;
     if (data.layout === 'post') {
-        const { copyright, locate,cover } = hexo.theme.config.post.default
+        const {copyright, locate, cover} = hexo.theme.config.post.default
         data.locate = data.locate || locate
         data.cc = data.cc || copyright
-        data.cover = data.cover || cover ? cover[getRandomInt(0, cover?.length)] : '/img/default.png'
+        data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
         data.excerpt = data.description || data.excerpt
         data.toc = !!(config.aside.toc.post && data.toc !== false);
     }
     if (data.layout === 'page') {
-        const { cover } = hexo.theme.config.page.default
-        data.cover = data.cover || cover ? cover[getRandomInt(0, cover?.length)] :'/img/default.png'
+        const {cover} = hexo.theme.config.page.default
+        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/helper/stylus.js

@@ -24,7 +24,7 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
 
     initGroupColor(theme.config.hometop.group,style);
 
-    // hightlight
+    // highlight
     const { syntax_highlighter: syntaxHighlighter, highlight, prismjs } = hexo.config
     let { enable: highlightEnable, line_number: highlightLineNumber } = highlight
     let { enable: prismjsEnable, line_number: prismjsLineNumber } = prismjs

package/source/css/_global/var.styl

@@ -11,18 +11,16 @@ $light_theme_none = hexo-config('theme_color.light_none')
 
 $todayCardColor = convert(hexo-config('hometop.recommendList.color'))
 
-// highlight code
-if hexo-config('hightlight.theme') == 'default'
+// code
+if hexo-config('highlight.theme') == 'default'
   $hl_bg_light = #fff
   $hltools_bg_light = #f7f7f9
   $hl_bg_dark = #1b1c20
   $hltools_bg_dark = #21232a
-
-else if hexo-config('hightlight.theme') == 'mac'
+else if hexo-config('highlight.theme') == 'mac'
   $hl_bg_light = #FFFFFF
   $hltools_bg_light = #E7E7E7
   $hl_bg_dark = #1C1E1E
-  $hltools_bg_dark = #2A282A
+  $hltools_bg_dark = #454a50
 
-// code
 $line-height-code-block = 1.6

package/source/css/_highlight/color.styl

@@ -1,4 +1,4 @@
-$highlight_color = hexo-config('hightlight.color')
+$highlight_color = hexo-config('highlight.color')
 
 if $highlight_color == "default"
   $highlight-comment = #969896
@@ -11,18 +11,84 @@ if $highlight_color == "default"
   $highlight-purple = #C792EA
   $highlight-deletion = #BF42BF
   $highlight-addition = #105EDE
-else if $highlight_color == "vscode"
-  $highlight-comment = #6A9955
-  $highlight-red = #D16969
-  $highlight-orange = #D7BA7D
-  $highlight-yellow = #D7BA7D
-  $highlight-green = #608B4E
-  $highlight-aqua = #4EC9B0
-  $highlight-blue = #569CD6
-  $highlight-purple = #C586C0
-  $highlight-deletion = #D16969
-  $highlight-addition = #608B4E
-else if $highlight_color == "solarized-dark"
+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
@@ -31,38 +97,38 @@ else if $highlight_color == "solarized-dark"
   $highlight-aqua = #2AA198
   $highlight-blue = #268BD2
   $highlight-purple = #6C71C4
-  $highlight-deletion = #DC322F
+  $highlight-deletion = #D33682
   $highlight-addition = #859900
-else if $highlight_color == "solarized-light"
-  $highlight-comment = #586E75
-  $highlight-red = #D30102
-  $highlight-orange = #BD3613
-  $highlight-yellow = #A57705
-  $highlight-green = #728A05
-  $highlight-aqua = #259185
-  $highlight-blue = #2176C7
+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 = #D30102
-  $highlight-addition = #728A05
-else if $highlight_color == "dracula"
+  $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 = #FF5555
-  $highlight-orange = #FFB86C
-  $highlight-yellow = #F1FA8C
-  $highlight-green = #50FA7B
-  $highlight-aqua = #8BE9FD
-  $highlight-blue = #BD93F9
-  $highlight-purple = #FF79C6
-  $highlight-deletion = #FF5555
-  $highlight-addition = #50FA7B
-else if $highlight_color == "monokai"
-  $highlight-comment = #75715E
-  $highlight-red = #F926
-  $highlight-orange = #FD971F
-  $highlight-yellow = #E6DB74
-  $highlight-green = #A6E22E
-  $highlight-aqua = #66D9EF
-  $highlight-blue = #AE81FF
-  $highlight-purple = #F92672
-  $highlight-deletion = #F926
-  $highlight-addition = #A6E22E
+  $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

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

@@ -1,184 +1,80 @@
-if hexo-config('hightlight.color') == 'default'
-  pre[class*='language-']
-    .token.function
-      color: #ffb62c
-
-    .token.comment,
-    .token.prolog,
-    .token.doctype,
-    .token.cdata
-      color: rgba(149, 165, 166, .8)
-
-    .token.punctuation
-      color: #5e6687
-
-    .token.namespace
-      opacity: .7
-
-    .token.operator,
-    .token.boolean,
-    .token.number
-      color: #c76b29
-
-    .token.property
-      color: #c08b30
-
-    .token.tag
-      color: #3d8fd1
-
-    .token.string
-      color: #22a2c9
-
-    .token.selector
-      color: #6679cc
-
-    .token.attr-name
-      color: #c76b29
-
-    .token.entity,
-    .token.url,
-    .language-css .token.string,
-    .style .token.string
-      color: #22a2c9
-
-    .token.attr-value,
-    .token.keyword,
-    .token.control,
-    .token.directive,
-    .token.unit
-      color: #ac9739
-
-    .token.statement,
-    .token.regex,
-    .token.atrule
-      color: #22a2c9
-
-    .token.placeholder,
-    .token.variable
-      color: #3d8fd1
-
-    .token.deleted
-      text-decoration: line-through
-
-    .token.inserted
-      border-bottom: 1px dotted #202746
-      text-decoration: none
-
-    .token.italic
-      font-style: italic
-
-    .token.important,
-    .token.bold
-      font-weight: bold
-
-    .token.important
-      color: #c94922
-
-    .token.entity
-      cursor: help
-
-    pre > code.highlight
-      outline: .4em solid #c94922
-      outline-offset: .4em
-
-if hexo-config('hightlight.color') == 'vscode'
-    pre[class*='language-']
-      .token.comment
-        color #6a737d
-
-      .token.prolog
-        color #6a737d
-
-      .token.doctype
-        color #6a737d
-
-      .token.cdata
-        color #6a737d
-
-      .token.punctuation
-        color #d4d4d4
-
-      .token.namespace
-        opacity .7
-
-      .token.operator
-        color #d4d4d4
-
-      .token.boolean
-        color #4ec9b0
-
-      .token.number
-        color #4ec9b0
-
-      .token.property
-        color #c08b30
-
-      .token.tag
-        color #3d8fd1
-
-      .token.string
-        color #4ec9b0
-
-      .token.selector
-        color #6679cc
-
-      .token.attr-name
-        color #c76b29
-
-      .token.entity
-        color #c76b29
-
-      .token.url
-        color #22a2c9
-
-      .token.attr-value
-        color #4ec9b0
-
-      .token.keyword
-        color #c94922
-
-      .token.control
-        color #c94922
-
-      .token.directive
-        color #c94922
-
-      .token.unit
-        color #c94922
-
-      .token.statement
-        color #c94922
-
-      .token.regex
-        color #22a2c9
-
-      .token.atrule
-        color #22a2c9
-
-      .token.placeholder
-        color #3d8fd1
-
-      .token.variable
-        color #3d8fd1
-
-      .token.deleted
-        color #c94922
-
-      .token.inserted
-        color #4ec9b0
-
-      .token.italic
-        font-style italic
-
-      .token.important
-        font-weight bold
-
-      .token.important
-        color #c94922
-
-      .token.entity
-        cursor help
-
-      pre > code.highlight
-        outline .4em solid #c94922
-        outline-offset .4em
+pre[class*='language-']
+  .token
+    &.function,
+    &.punctuation
+     color $highlight-blue
+
+  .token.comment,
+  .token.prolog,
+  .token.doctype,
+  .token.cdata
+    color $highlight-comment
+
+  .token.namespace
+    opacity: .7
+
+  .token.operator,
+  .token.boolean,
+  .token.number
+    color: $highlight-orange
+
+  .token.property
+    color: $highlight-yellow
+
+  .token.tag
+    color: $highlight-blue
+
+  .token.string
+    color: $highlight-green
+
+  .token.selector
+    color: $highlight-deletion
+
+  .token.attr-name
+    color: $highlight-orange
+
+  .token.entity,
+  .token.url,
+  .language-css .token.string,
+  .style .token.string
+    color: $highlight-aqua
+
+  .token.attr-value,
+  .token.keyword,
+  .token.control,
+  .token.directive,
+  .token.unit
+    color: $highlight-yellow
+
+  .token.statement,
+  .token.regex,
+  .token.atrule
+    color: $highlight-aqua
+
+  .token.placeholder,
+  .token.variable
+    color: $highlight-blue
+
+  .token.deleted
+    text-decoration: line-through
+
+  .token.inserted
+    border-bottom: 1px dotted #202746
+    text-decoration: none
+
+  .token.italic
+    font-style: italic
+
+  .token.important,
+  .token.bold
+    font-weight: bold
+
+  .token.important
+    color: $highlight-orange
+
+  .token.entity
+    cursor: help
+
+  pre > code.highlight
+    outline: .4em solid $highlight-orange
+    outline-offset: .4em

package/source/css/_highlight/prismjs/index.styl

@@ -4,6 +4,8 @@
 
 #article-container
   pre[class*='language-']
+    margin 0
+    overflow-x auto
     scrollbar-color var(--hlscrollbar-bg) transparent
 
     &::-webkit-scrollbar-thumb

package/source/css/_highlight/prismjs/line-number.styl

@@ -2,8 +2,6 @@
   pre[class*='language-']
     &.line-numbers
       position relative
-      margin 0
-      overflow-x auto
 
       > code
         display block
@@ -15,7 +13,6 @@
         top 0
         left 0
         color var(--efu-secondtext)
-        background var(--efu-hltools-bg)
         border-right var(--style-border-always)
         padding 8px 0