hexo-theme-solitude 1.7.1 → 1.7.3

package/.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [efuo] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
@@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: ['https://afdian.net/a/efu0u0','https://7.isyangs.cn/34/65f2e5814db1a-34.png','https://7.isyangs.cn/34/65ed434e0b8d7-34.png'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

package/_config.yml

@@ -29,7 +29,7 @@ site:
   siteIcon: /img/pwa/favicon.ico
   # 页脚的Logo、加载动画默认的logo
   # Logo in the footer, default logo for loading animation
-  icon: /img/avatar.png
+  icon: /img/pwa/favicon.ico
 
 # 导航栏
 # NavBar
@@ -38,7 +38,7 @@ nav:
   # logo group
   group:
   # 项目: # 分类名称
-  #   Solitude: https://github.com/valor-x/hexo-theme-solitude || /img/logo.png # 子菜单名称(submenu name): 链接地址(address) || 图标(icon)
+  #   Solitude: https://github.com/valor-x/hexo-theme-solitude || /img/pwa/favicon.ico # 子菜单名称(submenu name): 链接地址(address) || 图标(icon)
 
   # 中心菜单
   # center menu
@@ -172,7 +172,7 @@ aside:
     author:
       # 头像
       # Avatar
-      img: /img/logo.png
+      img: /img/avatar.png
       # 表情图片链接
       # Emoticon image link
       # tip: 26x26 size
@@ -251,13 +251,10 @@ aside:
     # 显示标签数量，当高于标签总数时，显示全部标签按钮
     # Display the number of tags, when it is higher than the total number of tags, display all tags button
     limit: 20
-    # 高亮显示
-    # Highlight
-    highlight: false
     # 高亮显示标签列表
     # Highlighted tag list
-    list:
-    # - "Solitude"
+    highlight_list:
+    #  - Hexo
 
   # 侧边栏归档
   # aside archive
@@ -455,7 +452,7 @@ footer:
 errorpage:
   # 图片
   # image
-  img: https://7.isyangs.cn/34/65f2e65eae32a-34.png
+  img: /img/404.webp
   # 文字
   # text
   text: =awa= 页面走丢了
@@ -526,7 +523,7 @@ moments:
   # example: https://example.com/
   api: # https://example.com/
   # 加载失败显示图片 / Loading failed display image
-  error_img: /img/logo.png
+  error_img: /img/pwa/favicon_64.ico
   # 排序规则：created：按创建时间排序 / updated：按更新时间排序
   # Sort rule: created: Sort by creation time / updated: Sort by update time
   sort_rule: created
@@ -782,11 +779,11 @@ pwa:
   enable: false
   manifest: /manifest.json # 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 # 32x32图标
-  favicon_16_16: /img/logo.png # 16x16图标
+  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 # 32x32图标
+  favicon_16_16: /img/pwa/favicon_16.ico # 16x16图标
 
 # 谷歌广告 (Google Adsense)
 google_adsense:

package/languages/en.yml

@@ -26,10 +26,6 @@ lately:
   ago: ' ago'
   error: ' NaN'
 
-chs:
-  chs_tw: Traditional Chinese
-  chs_cn: Simplified Chinese
-
 page:
   tag: Tags
   category: Categories
@@ -74,11 +70,11 @@ award:
   tipping: Tipping
   title: List of appreciation
 
-
 search:
   empty: No results found
   hit: Found ${query} results for you
   placeholder: Enter keywords to quickly search
+  count: Total <b>${count}</b> results.
 
 head:
   noscript: Please enable JavaScript to view the site

package/languages/zh-CN.yml

@@ -27,10 +27,6 @@ lately:
   ago: 前
   error: NaN
 
-chs:
-  chs_tw: 繁體中文
-  chs_cn: 简体中文
-
 page:
   tag: 标签
   category: 分类
@@ -80,6 +76,7 @@ search:
   empty: 找不到你查询的内容：${query}
   hit: 找到 ${hits} 条结果，用时 ${time} 毫秒
   placeholder: 输入关键词快速查找
+  count: 共 <b>${count}</b> 条结果。
 
 head:
   noscript: 开启JavaScript才能访问本站哦~

package/languages/zh-TW.yml

@@ -27,10 +27,6 @@ lately:
   ago: 前
   error: NaN
 
-chs:
-  chs_tw: 繁體中文
-  chs_cn: 簡體中文
-
 page:
   tag: 標籤
   category: 分類
@@ -80,6 +76,7 @@ search:
   empty: 找不到你查詢的內容：${query}
   hit: 找到 ${hits} 條結果，用時 ${time} 毫秒
   placeholder: 輸入關鍵詞快速查找
+  count: 共 <b>${count}<b> 條結果。
 
 head:
   noscript: 開啟JavaScript才能訪問本站哦~

package/layout/includes/head/config.pug

@@ -86,6 +86,45 @@
         })
     }
 
+    let lang = false
+    lang = {
+        theme: {
+            dark: _p('theme.dark'),
+            light: _p('theme.light'),
+        },
+        copy: {
+            success: _p('copy.success'),
+            error: _p('copy.error'),
+        },
+        backtop: _p('nav.backtop'),
+        lately: {
+            second: _p('lately.second'),
+            minute: _p('lately.minute'),
+            hour: _p('lately.hour'),
+            day: _p('lately.day'),
+            month: _p('lately.month'),
+            year: _p('lately.year'),
+            ago: _p('lately.ago'),
+            error: _p('lately.error'),
+        },
+        f12: _p('f12'),
+    }
+
+    if (theme.search.enable) {
+        lang.search = {
+            empty: _p('search.empty'),
+            hit: _p('search.hit'),
+            placeholder: _p('search.placeholder'),
+            count: _p('search.count')
+        }
+    }
+
+    if (theme.comment.enable && theme.comment.commentBarrage) {
+        lang.barrage = {
+            title: _p('commentBarrage.title'),
+        }
+    }
+
 script.
     const GLOBAL_CONFIG = {
         root: '!{config.root}',
@@ -105,40 +144,7 @@ script.
             syntax: '!{config.syntax_highlighter}'
         },
         randomlink: !{theme.footer.randomlink},
-        lang: {
-            theme: {
-                dark: '!{_p('theme.dark')}',
-                light: '!{_p('theme.light')}',
-            },
-            copy: {
-                success: '!{_p('copy.success')}',
-                error: '!{_p('copy.error')}',
-            },
-            backtop: '!{_p('nav.backtop')}',
-            lately: {
-                second: '!{_p('lately.second')}',
-                minute: '!{_p('lately.minute')}',
-                hour: '!{_p('lately.hour')}',
-                day: '!{_p('lately.day')}',
-                month: '!{_p('lately.month')}',
-                year: '!{_p('lately.year')}',
-                ago: '!{_p('lately.ago')}',
-                error: '!{_p('lately.error')}',
-            },
-            search: {
-                empty: '!{_p('search.empty')}',
-                hit: '!{_p('search.hit')}',
-                placeholder: '!{_p('search.placeholder')}',
-            },
-            chs: {
-                chs_to_cht: '!{_p('chs.chs_tw')}',
-                cht_to_chs: '!{_p('chs.chs_cn')}',
-            },
-            barrage: {
-                title: '!{_p('commentBarrage.title')}',
-            },
-            f12: '!{_p('f12')}',
-        },
+        lang: !{JSON.stringify(lang)},
         aside: {
             sayhello: {
                 morning: '!{theme.aside.card.sayhello.morning}',

package/layout/includes/inject/head.pug

@@ -111,7 +111,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.1",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.3",
         "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/layout/includes/page/says.pug

@@ -20,7 +20,7 @@ if theme.says.enable
                             if item.image
                                 .bber-content-img
                                     each img in item.image
-                                        img(src=img title="即刻短文配图")
+                                        img(src=img alt="image")
 
                         if item.aplayer
                             .bber-music
@@ -41,7 +41,7 @@ if theme.says.enable
                                         i.solitude.st-calendar-todo-fill
                                         time.datetime(datetime=moment(item.date).format())
                                     if item.link
-                                        a.bber-content-link(href=url_for(item.link) title="跳转到短文指引的链接" target="_blank")
+                                        a.bber-content-link(href=url_for(item.link) target="_blank")
                                             i.solitude.st-link-m-line
                                             | 链接
                                 if item.content

package/layout/includes/widgets/aside/asideTag.pug

@@ -1,9 +1,14 @@
+- const highlight = theme.aside.tags.highlight_list || []
 .card-tag-cloud
     each tag in site.tags.find({ parent: { $exists: false } }).data
-        a(href=url_for(tag.path))= tag.name
-            sup= tag.length
-if site.tags.length > theme.aside.tags.limit
-    a#more-tags-btn(href="javascript:void(0);", onclick="sco.openAllTags();")= __('aside.tagmore')
+        if highlight.includes(tag.name)
+            a.highlight(href=url_for(tag.path))= tag.name
+                sup= tag.length
+        else
+            a(href=url_for(tag.path))= tag.name
+                sup= tag.length
+if site.tags.length >= theme.aside.tags.limit
+    span#more-tags-btn(onclick="sco.openAllTags()")= __('aside.tagmore')
 else
     style.
         .card-tag-cloud::after {

package/layout/includes/widgets/home/banner.pug

@@ -6,7 +6,7 @@ if group
     div.banners-links
         each value,label in group
             - var array = value.split('||')
-            a.banners-link-btn(href=url_for(trim(array[0])) class="banners-link-"+label)
+            a.banners-link-btn(href=url_for(trim(array[0])) style=`background-image: ${array[2]} `)
                 if array[1]
                     i.solitude(class=array[1])
                 .banners-link-title= label

package/layout/post.pug

@@ -17,7 +17,8 @@ block content
                                 span.tagsPageCount #{data.length}
             if site.posts.length > 1
                 include includes/widgets/post/postNav
-            != related_posts(page, site.posts)
+            if theme.related_post.enable
+                != related_posts(page, site.posts)
             if page.comment
                 include includes/widgets/third-party/comments/comment
         include includes/widgets/aside/aside

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.7.1",
-  "description": "A beautiful, powerful, and efficient Hexo theme developed by the wleelw",
+  "version": "1.7.3",
+  "description": "A beautiful, powerful, and efficient Hexo theme developed by the efu.",
   "main": "package.json",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -26,7 +26,7 @@
     "url": "https://github.com/valor-x/hexo-theme-solitude/issues",
     "email": "o@efu.me"
   },
-  "homepage": "https://solitude-demo.efu.me/",
+  "homepage": "https://efu.me/",
   "author": "Hexo-Theme-Solitude<o@efu.me>",
   "license": "MIT"
 }

package/scripts/event/merge_config.js

@@ -3,7 +3,7 @@ hexo.extend.filter.register('before_generate', () => {
         site: {
             name: {
                 class: 'text', custom: 'Solitude'
-            }, siteIcon: '/img/logo.png', icon: 'icon'
+            }, siteIcon: '/img/pwa/favicon.ico', icon: 'icon'
         }, nav: {
             group: null, menu: null, right: {
                 random: false, console: false, custom: [],

package/scripts/event/welcome.js

@@ -1,14 +1,12 @@
 hexo.on('ready', () => {
     const {version} = require('../../package.json')
     hexo.log.info(`
-  ===================================================================
-       #####  ####  #     #####  ###### #     # ######   ######
-      #      #    # #       #      #    #     # #      # #
-       ##### #    # #       #      #    #     # #      # ######
-           # #    # #       #      #    #     # #      # #
-      ######  ####  ##### #####    #      ###   ######   ######
-                            ${version}
-  ===================================================================
-  GitHub: https://github.com/valor-x/hexo-theme-solitude
+  ╭─────────────────────────────────────────────────────────────────────────────────────────────╮
+  │                                                                                             │
+  │      Theme: Solitude                                                                        │
+  │      Version: v${version}                                                                        │
+  │      Changelog: https://github.com/valor-x/hexo-theme-solitude/releases/tag/v${version}          │
+  │                                                                                             │
+  ╰─────────────────────────────────────────────────────────────────────────────────────────────╯
   `)
 })

package/scripts/helper/related_post.js

@@ -1,3 +1,8 @@
+/**
+ * related post
+ * from solitude
+ */
+
 'use strict'
 
 hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {

package/scripts/helper/stylus.js

@@ -2,20 +2,14 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     const {config, theme} = this;
     const data = hexo.locals.get('data');
 
-    if (theme.config.aside.tags.highlight) {
-        const array = theme.config.aside.tags.list.map(item => encodeURIComponent(item));
-        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 uniqueArr = [...new Set(aside)];
-    if (uniqueArr.length > 0) {
-        style.define('aside', uniqueArr);
-    }
+    // about card
+    style.define('$about', data && data.about ? Object.keys(data.about) : false);
 
-    style.define('about', data && data.about ? Object.keys(data.about) : []);
+    // links
+    style.define('$link', !!(data && data.links))
 
-    initGroupColor(theme.config.hometop.group, style);
+    // equipment
+    style.define('$equipment', !!(data && data.equipment))
 
     // highlight
     const {syntax_highlighter: syntaxHighlighter, highlight, prismjs} = hexo.config
@@ -32,30 +26,4 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     style.define('$highlight_line_number', highlightLineNumber)
     style.define('$prismjs_enable', prismjsEnable)
     style.define('$prismjs_line_number', prismjsLineNumber)
-});
-
-function initGroupColor(gg, style) {
-    if (gg === null || gg === undefined) {
-        style.define('banner_group', [])
-        return;
-    }
-    let group = Object.keys(gg).map(key => {
-        return {
-            [key]: (gg[key]).split('||')[2]
-        }
-    });
-
-    style.define('banner_group', group);
-
-    function getGroupColor(key) {
-        let color = '';
-        group.forEach(item => {
-            if (item[key]) {
-                color = item[key];
-            }
-        });
-        return color;
-    }
-
-    style.define('getGroupColor', getGroupColor);
-}
+});

package/source/css/_layout/article-container.styl

@@ -0,0 +1,197 @@
+#article-container
+  overflow-wrap break-word
+  +maxWidth768()
+    overflow hidden
+
+  iframe
+    border-radius 12px
+    margin 0 0 1rem
+
+  a
+    color var(--efu-fontcolor)
+    border-radius 4px 4px 0 0
+
+    border-bottom 2px dotted var(--efu-lighttext)
+    font-weight 700
+
+    &:not(.fancybox)
+      padding 0 4px
+
+      &:hover
+        border 0
+        text-decoration none
+        color var(--efu-white)
+        border-radius 4px
+        background var(--efu-main)
+
+  .table-wrap
+    margin 1rem 0
+    border-radius 8px
+    overflow-x scroll
+
+  a.headerlink
+    float right
+    opacity .08
+    position relative
+    padding 0
+    border none
+    border-radius 8px
+    line-height 1
+    font-size .8rem
+
+    #page &
+      display none
+
+    &::before
+      content "\e082"
+      font-family solitude
+      cursor pointer
+
+    &:hover
+      border-bottom none
+      box-shadow none
+      background var(--efu-none)
+      color var(--efu-lighttext)
+      opacity 1
+
+      &::before
+        color var(--efu-main)
+
+  p
+    font-size .9rem
+    line-height 1.7
+    font-weight 400
+    margin 1rem 0
+    text-align left
+    letter-spacing .6px
+
+    img
+      margin auto
+
+    a
+      &:not(.fancybox)
+        text-decoration none
+        border-bottom 2px dotted var(--efu-lighttext)
+        color var(--efu-fontcolor)
+        font-weight 700
+        padding 0 4px
+        border-radius 4px 4px 0 0
+
+        &:hover
+          color var(--efu-white)
+          border-radius 4px
+          background var(--efu-main)
+
+  code:not([class*='language-'])
+    color var(--efu-white)
+    padding 0.2rem 0.4rem
+    border-radius 4px
+    margin 0 4px
+    background var(--efu-pink)
+    line-height 2
+    box-shadow var(--efu-shadow-border)
+
+  img
+    border-radius 12px
+    object-fit cover
+    display block
+    margin 0.8rem auto
+    max-width 90%
+    max-height 450px
+
+  ul, ol
+    padding 0
+    margin-top 0.4rem
+    list-style none
+    counter-reset li 0
+
+    li
+      &:before
+        position absolute
+        top 0
+        left 0
+        color var(--efu-fontcolor)
+        transition all .3s ease-out 0s
+        background var(--efu-lighttext)
+
+      &:not(.tab)
+        position relative
+        margin 0.2rem 0
+
+  ul
+    > li
+      &:not(.tab)
+        padding 0.2em 0.2em 0.2em 1.4em
+
+        &:before
+          margin 0
+          top 0.78em
+          width 0.42em
+          height 0.42em
+          border-radius 0.42em
+          background 0 0
+          content ""
+          line-height .42em
+          border 0.21em solid var(--efu-lighttext)
+          background var(--efu-lighttext)
+
+  ol
+    > li:before
+      margin-top .65em
+      width 1.45em
+      height 1.45em
+      border-radius .725em
+      text-align center
+      font-size .85em
+      color var(--efu-white)
+      line-height 1.45em
+
+    ul li
+      line-height 1.7
+
+    > li
+
+      &:not(.tab)
+        padding .2em .2em .2em 1.8em
+
+      &:before
+        content counter(li)
+        counter-increment li 1
+
+      > ol
+        > li
+          &:before
+            content counter(li, lower-alpha)
+            counter-increment li
+
+          > ol
+            > li
+              &:before
+                content counter(li, lower-roman)
+                counter-increment li
+
+  &.post-content
+    h1, h2, h3, h4
+      display flex
+      align-items center
+      justify-content space-between
+      flex-direction row-reverse
+      transition all .2s ease-out 0s
+
+    h1
+      font-size 1.5rem
+      line-height 1.3
+
+    h2
+      font-size 1.3rem
+      line-height 1.3
+      border-top 1px dashed var(--efu-theme-op)
+      padding-top 1.5rem
+
+    h3
+      font-size 1.1rem
+      line-height 1.3
+
+    h4
+      font-size 1.1rem
+      line-height 1.3