hexo-theme-solitude 1.7.7 → 1.7.9

package/scripts/event/merge_config.js

@@ -4,11 +4,13 @@ hexo.extend.filter.register('before_generate', () => {
             name: {
                 class: 'text', custom: 'Solitude'
             }, siteIcon: '/img/pwa/favicon.ico', icon: 'icon'
-        }, nav: {
+        },
+        nav: {
             group: null, menu: null, right: {
                 random: false, console: false, custom: [],
             }
-        }, hometop: {
+        },
+        hometop: {
             enable: false, banner: {
                 title: 'Solitude', url: 'A simple theme for Hexo', icon: null,
             }, group: null, recommendList: {
@@ -18,14 +20,18 @@ hexo.extend.filter.register('before_generate', () => {
                 img: '/img/default.png',
                 color: 'none',
             }
-        }, aside: {
+        },
+        aside: {
             home: {
                 noSticky: 'about', Sticky: 'allInfo'
-            }, post: {
+            },
+            post: {
                 noSticky: 'about', Sticky: 'allInfo'
-            }, page: {
+            },
+            page: {
                 noSticky: 'about', Sticky: 'allInfo'
-            }, card: {
+            },
+            card: {
                 author: {
                     img: '/img/logo.png', sticker: '/img/happy-sticker.png',
                 },
@@ -41,14 +47,26 @@ hexo.extend.filter.register('before_generate', () => {
                 },
                 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: [],
+            },
+            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'
+                enable: true,
+                type: 'month'
             }, siteinfo: {
                 postcount: true,
                 wordcount: false,
@@ -58,20 +76,32 @@ 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: {
+        },
+        index_post_list: {
+            direction: 'column',
+            content: false,
+            length: 500,
+            cover: 'both'
+        },
+        page: {
+            error: true,
+            tags: true,
+            categories: true,
+            default: {
                 cover: ['/img/default.png'],
             }
-        }, post: {
+        },
+        post: {
             default: {
-                cover: ['/img/default.png'], locate: 'China, Changsha', copyright: {
+                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: {
+            },
+            meta: {
                 date: false,
                 updated: false,
                 locate: false,
@@ -80,16 +110,23 @@ hexo.extend.filter.register('before_generate', () => {
                 pv: false,
                 uv: false,
                 comment: false,
-            }, award: {
+            },
+            award: {
                 enable: false,
                 appreciators: '/',
                 title: '感谢您的赞赏。',
                 desc: '因为有你们的支持，我才体会到写文章的价值。',
                 list: [],
-            }, rss: null, covercolor: {
-                enable: false, mode: 'local', api: 'https://api.qjqq.cn/api/Imgcolor?img=', time: 43200000,
+            },
+            rss: null,
+            covercolor: {
+                enable: false,
+                mode: 'local',
+                api: 'https://api.qjqq.cn/api/Imgcolor?img=',
+                time: 43200000,
             }
-        }, theme_color: {
+        },
+        theme_color: {
             dark: "#ffc848",
             dark_op: "#f2b94b23",
             dark_op_deep: "#f2b94bdd",
@@ -98,25 +135,55 @@ hexo.extend.filter.register('before_generate', () => {
             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: {
+        },
+        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',
+                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
+            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,
+            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',
@@ -128,24 +195,49 @@ hexo.extend.filter.register('before_generate', () => {
             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: []
+        },
+        keyboard: {
+            enable: false,
+            list: []
         }
-        ,lazyload: {
-            enable: false, field: 'site', 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: {
+        , lazyload: {
+            enable: false,
+            field: 'site',
+            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,
+        OpenGraph: {
+            enable: false,
+            options: null
+        },
+        wordcount: false,
+        busuanzi: false,
+        search: {
+            enable: false,
+            type: 'local',
+            tags: [],
+            algolia: null,
+            local: {
                 preload: false, CDN: null,
             }
-        }, rightside: {
+        },
+        rightside: {
             enable: false
         },
         copy: {
@@ -154,17 +246,21 @@ hexo.extend.filter.register('before_generate', () => {
                 enable: false,
                 limit: 50
             }
-        }
-        , post_ai: {
+        },
+        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: {
+        },
+        katex: {
+            enable: false,
+            per_page: false,
+            copytex: false,
+        },
+        comment: {
             enable: false,
             type: '',
             commentBarrage: false,
@@ -172,10 +268,14 @@ hexo.extend.filter.register('before_generate', () => {
             randomInfoStart: [`baby's`, `little`, `my`,],
             randomInfoEnd: [`home`, `world`, `heart`,],
             twikoo: {
-                envId: 'your envId', lang: 'zh-CN', accessToken: null,
+                envId: 'your envId',
+                lang: 'zh-CN',
+                accessToken: null,
             },
             waline: {
-                envId: 'your envId', pageview: true, option: null,
+                envId: 'your envId',
+                pageview: true,
+                option: null,
             },
             verify_site: [],
             css_prefix: false,
@@ -186,7 +286,8 @@ hexo.extend.filter.register('before_generate', () => {
                 'code-font-family': 'monospace, monospace',
             },
             extends: {
-                head: [], body: [],
+                head: [],
+                body: [],
             },
             pwa: {
                 enable: false,
@@ -206,6 +307,16 @@ hexo.extend.filter.register('before_generate', () => {
                 client: '',
                 slot: '',
             },
+            right_menu: {
+                enable: false,
+                commentBarrage: false,
+                translate: {
+                    enable: false,
+                    defaultEncoding: 2,
+                    translateDelay: 0,
+                },
+                custom_list: []
+            },
             CDN: {
                 internal: 'local',
                 third_party: 'cdnjs',

package/scripts/tags/gallery.js

@@ -1,54 +1,37 @@
 'use strict';
 
-function galleryGroup(args, content) {
-    const title = args[0];
-    const description = args[1];
-    const link = args[2];
-    const image = args[3];
+const urlFor = require('hexo-util').url_for.bind(hexo)
 
-    return `<div class="gallery-item" onclick="pjax.loadUrl('/${link}/')">
-                <img class="cover" src="${image}" />
-                <span class="title">${title}</span>
-                <span class="desc">${description}</span>
-                </div>`;
+const galleryBox = args => {
+    const [name, descr, url, img] = args
+    const imgUrl = urlFor(img)
+    const urlLink = urlFor(url)
+
+    return `<figure class="gallery-group">
+  <img class="gallery-group-img no-lightbox" src='${imgUrl}' alt="Group Image Gallery">
+  <figcaption>
+  <div class="gallery-group-name">${name}</div>
+  <p>${descr}</p>
+  <a href='${urlLink}'></a>
+  </figcaption>
+  </figure>
+  `
 }
 
-const urlFor = require('hexo-util').url_for.bind(hexo)
-
 const gallery = (args, content) => {
-    args = args.join(' ').split(',')
-    let button = false
-    let type = 'data'
-    let dataStr = ''
-
-    if (args[0] === 'url') {
-        [type, dataStr, button] = args // url,[link],[lazyload]
-    } else {
-        [button] = args // [lazyload]
-        const regex = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
-        let m
-        const arr = []
-        while ((m = regex.exec(content)) !== null) {
-            if (m.index === regex.lastIndex) {
-                regex.lastIndex++
-            }
-            arr.push({
-                url: m[2],
-                alt: m[1],
-                title: m[3]
-            })
+    let html = ""
+    const regex = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
+    let m
+    while ((m = regex.exec(content)) !== null) {
+        if (m.index === regex.lastIndex) {
+            regex.lastIndex++
         }
-
-        dataStr = JSON.stringify(arr)
+        html += `<div class="gallery-item"><img class="nolazyload" src=${m[2]} alt="${m[1]}" /></div>`
     }
-
-    return `<div class="gallery-container" data-type="${type}" data-button="${button}">
-      <div class="gallery-data">${dataStr}</div>
-      <div class="gallery-items">
-      </div>
-    </div>`
+    return `<div class="gallery-container" id="waterfall">
+        ${html}
+      </div>`
 }
 
-hexo.extend.tag.register('gallery', gallery, {ends: true});
-
-hexo.extend.tag.register('galleryGroup',galleryGroup, {ends: false});
+hexo.extend.tag.register('gallery', gallery, {ends: true})
+hexo.extend.tag.register('galleryGroup', galleryBox)

package/scripts/tags/link.js

@@ -1,22 +1,49 @@
-'use strict'
-
+const urlFor = require("hexo-util").url_for.bind(hexo);
 function link(args) {
-    args = args.join(' ').split(',');
-    let urlNoProtocol = args[2].replace(/^https?\:\/\//i, "");
-    let imgUrl = "https://api.iowen.cn/favicon/" + urlNoProtocol + ".png";
-    return `<a class="tag-link" target="_blank" href="${args[2]}">
-    <div class="tag-link-tips">引用站外地址</div>
+    const themeConfig = hexo.theme.config;
+    args = args.join(" ").split(",");
+    let title = args[0];
+    let sitename = args[1];
+    let link = args[2];
+    let imgUrl = args[3] || "";
+    let favicon = themeConfig.site.siteIcon;
+
+    link = link.trim();
+    imgUrl = imgUrl.trim();
+    favicon = favicon.trim();
+
+    try {
+        new URL(link);
+        InsideStation = false;
+    } catch (err) {
+        InsideStation = true;
+    }
+
+    if ((imgUrl == "") && (InsideStation == false)) {
+        let domain = new URL(link).hostname
+        if (domain) {
+            imgUrl_online = "https://api.iowen.cn/favicon/" + domain + ".png";
+        }
+    }
+
+    return `<a class="tag-link" target="_blank" href="${urlFor(link)}">
+    <div class="tag-link-tips">${InsideStation ? "站内链接" : "引用站外链接"
+        }</div>
     <div class="tag-link-bottom">
-        <div class="tag-link-left" style="background-image: url(${imgUrl});">
-            <i class="solitude st-link-m-line"></i>
+        <div class="tag-link-left" style="${InsideStation
+            ? `background-image: url(${imgUrl ? imgUrl : favicon})`
+            : `background-image: url(${imgUrl ? imgUrl : imgUrl_online})`
+        }">
+            <i class="solitude st-link-m-line" style="${`(imgUrl) || (imgUrl_online)` ? "display: none" : ""
+        }"></i>
         </div>
         <div class="tag-link-right">
-            <div class="tag-link-title">${args[0]}</div>
-            <div class="tag-link-sitename">${args[1]}</div>
+            <div class="tag-link-title">${title}</div>
+            <div class="tag-link-sitename">${sitename}</div>
         </div>
         <i class="solitude st-arrow-right-bold"></i>
     </div>
-    </a>`
+    </a>`;
 }
 
-hexo.extend.tag.register('link',link, { ends: false })
+hexo.extend.tag.register("link", link, { ends: false });

package/source/css/_global/function.styl

@@ -84,4 +84,9 @@ minWidth1400()
 
 minWidth2000()
   @media screen and (min-width: 2000px)
-    {block}
+    {block}
+
+.limit-more-line
+  display: -webkit-box
+  overflow: hidden
+  -webkit-box-orient: vertical

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

@@ -6,7 +6,7 @@
       > code
         display block
         position relative
-        padding 8px 0 8px 38px
+        padding 8px 0 8px 58px
 
       .line-numbers-rows
         position absolute
@@ -14,6 +14,7 @@
         left 0
         color var(--efu-secondtext)
         border-right var(--style-border-always)
+        width 45px
         padding 8px 0
 
         & > span

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

@@ -10,10 +10,12 @@
   a
     color var(--efu-fontcolor)
     border-radius 4px 4px 0 0
-
     border-bottom 2px dotted var(--efu-lighttext)
     font-weight 700
 
+    &.fancybox
+      border-bottom none
+
     &:not(.fancybox)
       padding 0 4px
 

package/source/css/{_page/_home → _layout}/recent-post.styl

@@ -2,6 +2,11 @@
   if hexo-config('aside.position') == 0
       order 2
 
+  #category &,
+  #tag &
+    +maxWidth768()
+      padding 0
+
 if hexo-config('index_post_list.direction') == "column"
   #recent-posts
     position relative

package/source/css/_layout/rightmenu.styl

@@ -1,4 +1,4 @@
-if hexo-config('rightside.enable')
+if hexo-config('right_menu.enable')
   #rightMenu
     display none
     position fixed

package/source/css/_page/_about/reward.styl

@@ -30,7 +30,6 @@
             left auto
             bottom auto
             width fit-content
-            box-shadow var(--efu-shadow-border)
 
             .reward-all::before
               bottom auto
@@ -50,7 +49,6 @@
             width fit-content
             height fit-content
             line-height 2
-            user-select none
 
             +maxWidth768()
               display none

package/source/css/_page/_home/{banner.styl → carousel.styl}

@@ -28,13 +28,16 @@ div#swiper_container
 
   .swiper-button-prev, .swiper-button-next
     transition all .3s
+    border-radius 5px
     color var(--efu-main) !important
+    background var(--efu-maskbg)
+    opacity .5
 
     &:hover
+      opacity 1
       transition all .3s
-      border-radius 5px
-      color var(--efu-card-bg) !important
-      background var(--efu-maskbg)
+      color var(--efu-white) !important
+      background var(--efu-main)
 
   .swiper-button-next::after, .swiper-button-prev::after
     font-size 1.5rem

package/source/css/_page/_home/home-top.styl

@@ -322,10 +322,6 @@
   flex-wrap wrap
   height 120px
 
-.tags-group-icon-pair
-  margin-left 1rem
-  user-select none
-
 .banners-link-btn
   display flex
   flex-direction row

package/source/css/_page/_home/home.styl

@@ -11,11 +11,7 @@ if hexo-config('hometop.enable') || hexo-config('says.enable')
 if hexo-config('hometop.enable')
   @import "home-top.styl"
 
-if hexo-config('banner')
-  @import "banner.styl"
+if hexo-config('carousel')
+  @import "carousel.styl"
 
-@import "category-bar.styl"
-
-@import "recent-post.styl"
-
-@import "pagination.styl"
+@import "category-bar.styl"

package/source/css/_page/other.styl

@@ -81,7 +81,7 @@ div#banners
       line-height 4rem
       font-weight 700
 
-  .tags-group-all
+  /.tags-group-all
     display flex
 
     &.nowrapMove

package/source/css/_page/says.styl

@@ -80,7 +80,7 @@ if hexo-config('says.enable')
           margin-left 10px
 
           span.bber_nick
-            color #6dbdc3
+            color var(--efu-main)
             font-size .9rem
 
           time.bber_date

package/source/css/_tags/button.styl

@@ -37,4 +37,4 @@
 
       i
         transform all 0.3s ease-in-out
-        color var(--efu-white)
+        color var(--efu-white)