hexo-theme-solitude 2.1.5 → 2.1.6

package/_config.yml

@@ -657,6 +657,9 @@ loading:
   # Full screen loading
   # 全屏加载
   fullpage: false
+  # Loading icon, default is siteicon
+  # 加载图标，不写默认siteicon
+  favicon: /img/favicon.png
   # Pace loading
   # Pace 加载
   pace: true

package/layout/includes/head/page_config.pug

@@ -1,10 +1,12 @@
+- var showToc = !!page.toc && (toc(page.content) !== '' || page.encrypt === true);
+
 script#config-diff.
     var PAGE_CONFIG = {
         is_post: !{is_post()},
         is_page: !{!is_post() && !is_home()},
         is_home: !{is_home()},
         page: '!{page.type}',
-        toc: !{!!page.toc},
+        toc: !{showToc},
         comment: !{!!page.comment},
         ai_text: !{is_post && page.ai_text ? "'"+ page.ai_text+"'" : false},
         color: !{page.color ? "'"+ page.color+"'" : false},

package/layout/includes/loading.pug

@@ -1,6 +1,6 @@
 div(id="loading-box" onclick="preloader.endLoading();" style="zoom:1")
     div.loading-bg
-        img.loading-img.nolazyload(src=url_for(theme.site.icon), alt="loading image")
+        img.loading-img.nolazyload(src=url_for(theme.loading.favicon || theme.site.icon), alt="loading image")
 
 script.
     const preloader = {

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

@@ -12,7 +12,7 @@
     each item in noSticky
         include ./asideSwitch.pug
     .sticky_layout
-        if page.toc
+        if showToc
             include ./asideToc.pug
         each item in Sticky
             include ./asideSwitch.pug

package/layout/includes/widgets/page/links/banner.pug

@@ -16,16 +16,19 @@
     .tags-group-wrapper
         - const data = site.data.links.links
         - for (let i = 0; i < 2; i++)
+            - var links = []
             each x in data
-                    - var pairs = []
-                    each y, index in x.link_list
-                        if (index % 2 === 0)
-                            - pairs.push([y])
-                        else
-                            - pairs[pairs.length - 1].push(y)
-                    each pair in pairs
-                        .tags-group-icon-pair
-                                each y in pair
-                                    a.tags-group-icon(href=url_for(y.link), title=y.name)
-                                        img(src=y.avatar + (site.data.links.banner_suffix || ''), title=y.name)
-                                        span.tags-group-title=y.name
+                each y in x.link_list
+                    - links.push(y)
+            - var pairs = []
+            each link, index in links
+                if (index % 2 === 0)
+                    - pairs.push([link])
+                else
+                    - pairs[pairs.length - 1].push(link)
+            each pair in pairs
+                .tags-group-icon-pair
+                    each y in pair
+                        a.tags-group-icon(href=url_for(y.link), title=y.name)
+                            img(src=y.avatar + (site.data.links.banner_suffix || ''), title=y.name)
+                            span.tags-group-title=y.name

package/layout/includes/widgets/rightside/show.pug

@@ -2,7 +2,7 @@
     if theme.rightside.hide.enable
         button.config(type='button' title=_p('rightside.show.gear') onclick='document.querySelector(".rs_hide").classList.toggle("show")')
             i.fas.fa-gear.fa-spin
-    if page.toc
+    if showToc
         button.mobile.toc(type='button' title=_p('rightside.show.toc') onclick="document.querySelector('#card-toc').classList.toggle('open')")
             i.fas.fa-list
     if page.comment

package/package.json

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

package/scripts/event/cdn.js

@@ -142,6 +142,6 @@ hexo.extend.filter.register('before_generate', () => {
     themeConfig.cdn = Object.assign(
         createCDNLink(internalSrc, CDN.internal, 'internal'),
         createCDNLink(thirdPartySrc, CDN.third_party),
-        deleteNullValue(CDN.option)
+        deleteNullValue(CDN.options)
     )
 })

package/scripts/tags/article.js

@@ -15,4 +15,4 @@ const article = ([path]) => {
   return `<div class="recent-post-item" onclick="pjax.loadUrl('${'/' + post.path}')">${postCover + recentPostInfo}</div>`;
 }
 
-hexo.extend.tag.register('article', article)
+hexo.extend.tag.register('article', article)

package/source/css/_highlight/index.styl

@@ -78,6 +78,15 @@ figure
         font-size 1.15em
         user-select none
 
+      .caption
+        position absolute
+        right 2.7rem
+        font-size 0.85em
+        color var(--efu-secondtext)
+
+        +maxWidth768()
+          display none
+
     .code-expand-btn
       background var(--efu-hltools-bg)
       transition .3s

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

@@ -1,4 +1,4 @@
-#article-container
+.post-content
   overflow-wrap break-word
   +maxWidth768()
     overflow hidden

package/source/js/main.js

@@ -524,9 +524,15 @@ const addHighlight = () => {
   const createEle = (lang, item, service) => {
     const fragment = document.createDocumentFragment()
     if ($isShowTool) {
+      const captionItem = item.querySelector('figcaption')
+      let caption = ''
+      if (captionItem) {
+        caption = `<div class="caption">${captionItem.innerHTML}</div>`
+        item.removeChild(captionItem)
+      }
       const hlTools = document.createElement('div')
       hlTools.className = `highlight-tools ${expandClass}`
-      hlTools.innerHTML = expandEle + lang + copyEle
+      hlTools.innerHTML = expandEle + lang + caption + copyEle
       utils.addEventListenerPjax(hlTools, 'click', ToolsFn)
       fragment.appendChild(hlTools)
     }