hexo-theme-stellar 1.18.2 → 1.18.3

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.18.2'
+  version: '1.18.3'
   homepage: 'https://xaoxuu.com/wiki/stellar/'
   repo: 'https://github.com/xaoxuu/hexo-theme-stellar'
   cdn_css: # Use cdn links instead of /css/main.css
@@ -79,7 +79,6 @@ search:
     field: all # post, page, all
     path: /search.json # 搜索文件存放位置
     content: true # 是否搜索内容
-    codeblock: true # 是否搜索代码块（需要content: true)
   
 
 ######## Comments ########

package/layout/wiki.ejs

@@ -30,7 +30,7 @@ function layoutTitle() {
   }
   %>
   <%- partial('_partial/main/navbar/breadcrumb') %>
-  <article class='md-text content <%- page.layout %><%- scrollreveal() %>'>
+  <article class='md-text content <%- page.layout %><%- page.indent ? ' indent' : '' %><%- scrollreveal() %>'>
   <%- layoutTitle() %>
   <%- page.content %>
   <%- partial('_partial/main/article/article_footer') %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/generators/search.js

@@ -1,6 +1,7 @@
 /**
  * https://github.com/wzpan/hexo-generator-search
  */
+const { stripHTML } = require('hexo-util')
 
 hexo.extend.generator.register('search_json_generator', function (locals) {
   if (this.theme.config.search.service != 'local_search') { return {} }
@@ -29,46 +30,17 @@ hexo.extend.generator.register('search_json_generator', function (locals) {
     if (post.path) {
       temp_post.path = root + post.path
     }
-    if (cfg.content != false && post._content) {
-      var content = post._content.trim()
-      // 过滤掉标签和注释
-      if (content.includes('{%')) {
-        // 需要保留内容的的标签
-        content = content.replace(/{%\s*mark\s*(.*?)\s*%}/g, '$1')
-        content = content.replace(/{%\s*folding\s*(.*?)\s*%}/g, '$1')
-        content = content.replace(/{%\s*copy\s*(.*?)\s*%}/g, '$1')
-        content = content.replace(/{%\s*note\s*(.*?)\s*%}/g, '$1')
-        content = content.replace(/{%\s*kbd\s*(.*?)\s*%}/g, '$1')
-        content = content.replace(/{%\s*emp\s*(.*?)\s*%}/g, '$1')
-        content = content.replace(/{%\s*wavy\s*(.*?)\s*%}/g, '$1')
-        content = content.replace(/{%\s*sub\s*(.*?)\s*%}/g, '$1')
-        content = content.replace(/{%\s*sup\s*(.*?)\s*%}/g, '$1')
-        content = content.replace(/<!--\s*folder(.*?)\s*-->/g, '$1')
-        content = content.replace(/<!--\s*tab(.*?)\s*-->/g, '$1')
-        content = content.replace(/<!--\s*node(.*?)\s*-->/g, '$1')
-        // 不保留内容的标签
-        content = content.replace(/{%\s*(.*?)\s*%}/g, '')
-        // 注释
-        content = content.replace(/<!--\s*(.*?)\s*-->/g, '')
-        // ## 标题
-        content = content.replace(/[#]{2,} /g, '')
-        // 部分HTML标签
-        content = content.replace(/<iframe[\s|\S]+iframe>/g, '')
-        content = content.replace(/<hr>/g, '')
-        content = content.replace(/<br>/g, '')
-        // 图片
-        content = content.replace(/\!\[(.*?)\]\((.*?)\)/g, '')
-        // 链接
-        content = content.replace(/\[(.*?)\]\((.*?)\)/g, '$1')
-        // 过滤代码块
-        if (cfg.codeblock == false) {
-          content = content.replace(/```([^`]+)```/g, '')
-        }
-        // 多个连续空格换成单个空格
-        content = content.replace(/[\s]{2,} /g, ' ')
-        // 特殊字符
-        content = content.replace(/[\r|\n]+/g, '')
-      }
+    if (cfg.content != false && post.content) {
+      var content = stripHTML(post.content).trim()
+      // 部分HTML标签
+      content = content.replace(/<iframe[\s|\S]+iframe>/g, '')
+      content = content.replace(/<hr>/g, '')
+      content = content.replace(/<br>/g, '')
+      // 换行符换成空格
+      content = content.replace(/\\n/g, ' ')
+      content = content.replace(/\n/g, ' ')
+      // 多个连续空格换成单个空格
+      content = content.replace(/[\s]{2,}/g, ' ')
       temp_post.content = content.trim()
     }
     if (post.tags && post.tags.length > 0) {

package/source/css/_layout/tag-plugins/common.styl

@@ -70,7 +70,7 @@ set_darkmode_tags()
   set_dynamic_color($theme)
     --theme: $theme
     --theme-bg1: hsl(hue($theme), 50, 16)
-    --theme-bg2: hsl(hue($theme), 32, 16)
+    --theme-bg2: hsl(hue($theme), 16, 16)
     --theme-border: hsl(hue($theme), 50, 24)
     --text-p0: hsl(hue($theme), 100, 85)
     --text-p1: hsl(hue($theme), 50, 75)

package/source/css/_layout/tag-plugins/folders.styl

@@ -1,35 +1,30 @@
 .tag-plugin.folders
-  display: block
-  margin: 1rem 0
-  border-radius: $border-bar
+  margin: var(--gap-p) 0
   font-size: $fs-14
-  border: 1px solid var(--theme-border)
+  border-top: 1px solid var(--block-border)
   overflow: hidden
   .folder
-    display: block
-    font-size: $fs-14
-    background: var(--block)
-    &:last-child summary
-      border-bottom: none
+    border-bottom: 1px solid var(--block-border)
+    padding: 1rem
   summary
-    display: block
     cursor: pointer
     color: var(--text-p2)
     font-weight: 500
     position: relative
     line-height: 1.2
     outline: none
-    padding: 0.75rem 1rem
-    border-bottom: 1px solid var(--theme-border)
+    padding: 1rem
+    margin: -1rem
     &:last-child
       border-bottom: none
     >
+      span 
+        margin-left: 0.25em
       p,h1,h2,h3,h4,h5,h6
         display: inline
         border-bottom: none !important
     &:hover
       color: var(--text-p0)
-      background: var(--block-hover)
     &:after
       position: absolute
       content: '+'
@@ -40,23 +35,15 @@
 
 
 .tag-plugin.folders details[open]
-  background: none
-  &:last-child 
-    summary
-      border-bottom: 1px solid var(--theme-border)
-    .body
-      border-bottom: none
   >summary
     color: var(--text-p1)
-    background: var(--block-hover)
+    font-weight: 700
     &:after
       content: '-'
       
   >div.body
-    padding: 1rem
-    border-bottom: 1px solid var(--theme-border)
     font-size: $fs-15
     >:first-child
-      margin-top: 0
+      margin-top: 1rem
     >:last-child
-      margin-bottom: 0
+      margin-bottom: 0

package/source/css/_layout/tag-plugins/folding.styl

@@ -2,21 +2,22 @@ details.folding
   display: block
   padding: 1rem
   margin: 1rem 0
-  border-radius: $border-bar
-  font-size: $fs-14
+  border-radius: $border-block
   background: var(--theme-bg2)
   border: 1px solid var(--theme-border)
   summary
     cursor: pointer
-    padding: .75rem 1rem
-    margin: 0 - 1rem
-    border-radius: $border-bar
+    padding: 1rem
+    margin: -1rem
     color: var(--text-p2)
     font-weight: 500
+    font-size: $fs-14
     position: relative
-    line-height: normal
+    line-height: 1.2
     outline: none
     >
+      span 
+        margin-left: 0.25em
       p,h1,h2,h3,h4,h5,h6
         display: inline
         border-bottom: none !important
@@ -34,25 +35,17 @@ details.folding
 
 details.folding[open]
   >summary
-    border-bottom: 1px solid var(--theme-border)
-    border-bottom-left-radius: 0
-    border-bottom-right-radius: 0
     color: var(--text-p1)
-    margin-bottom: 0
+    font-weight: 700
+    z-index 1
     &:after
       content: '-'
   >div.body
-    display: flex;
-    flex-direction: column;
-    padding: 1rem
-    margin: 0 - 1rem
-    margin-top: 0
-    background: var(--card)
-    border-bottom-left-radius: 'calc(%s - 1px)' % $border-bar
-    border-bottom-right-radius: 'calc(%s - 1px)' % $border-bar
-    font-size: $fs-15
+    padding: 0 1rem 1rem
+    margin: 0 -1rem -1rem
+    color: var(--text-p1)
     >:first-child
-      margin-top: 0
+      margin-top: 1rem
     >:last-child
       margin-bottom: 0
 
@@ -65,5 +58,17 @@ details.folding[child=codeblock]>div.body
     border-radius: 0
     background: transparent
     margin: 0
+    figcaption
+      display: none
     .code:before
       content: none
+
+details.folding[child=iframe]
+  overflow: hidden
+  background: none
+  >summary
+    background: none
+  >div.body
+    padding: 0
+    background: none
+    overflow: hidden

package/source/css/_layout/tag-plugins/note.styl

@@ -53,5 +53,6 @@
     iframe
       margin: 0
 
+
 .md-text .tag-plugin .tag-plugin.note
   --gap-p: 1rem

package/source/css/_layout/tag-plugins/override.styl

@@ -0,0 +1,13 @@
+.tag-plugin.note, .tag-plugin.folding
+  blockquote
+    border-top-left-radius: 0
+    border-bottom-left-radius: 0
+    background: none 
+    padding-top: 0
+    padding-bottom: 0
+  table:not([class])
+    th
+      background: var(--block-hover)
+    td,th
+      border-color: var(--block-border)
+

package/source/css/_layout/tag-plugins/quot.styl

@@ -17,7 +17,7 @@
     line-height: 1.2
 
 .md-text .tag-plugin.quot .content
-  max-width 400px
+  max-width 500px
   position: relative
 // override
 .md-text.content .tag-plugin.quot

package/source/css/_layout/tag-plugins/timeline.styl

@@ -1,6 +1,3 @@
-.md-text .tag-plugin.folding .body:has(.timeline)
-  background: var(--site-bg)
-  
 .md-text .tag-plugin.timeline
   position: relative
   margin-top: 0

package/source/js/main.js

@@ -127,7 +127,7 @@ const init = {
               const e0 = document.querySelector('.widgets')
               const e1 = document.querySelector('#data-toc a.toc-link[href="' + encodeURI(link) + '"]')
               const offsetBottom = e1.getBoundingClientRect().bottom - e0.getBoundingClientRect().bottom + 100
-              const offsetTop = e1.getBoundingClientRect().top - e0.getBoundingClientRect().top - 80
+              const offsetTop = e1.getBoundingClientRect().top - e0.getBoundingClientRect().top - 64
               if (offsetTop < 0) {
                 e0.scrollBy(0, offsetTop)
               } else if (offsetBottom > 0) {

package/source/js/search/local-search.js

@@ -54,13 +54,10 @@ var searchFunc = function(path, filter, searchId, contentId) {
         }
         // perform local searching
         datas.forEach(function(data) {
-          if (!data.title?.trim().length) { return }
           if (!data.content?.trim().length) { return }
           var matches = 0;
-          if (filter && !data.path.includes(filter)) {
-            return;
-          }
-          var dataTitle = data.title.trim();
+          if (filter && !data.path.includes(filter)) { return }
+          var dataTitle = data.title?.trim() || 'Untitled';
           var dataTitleLowerCase = dataTitle.toLowerCase();
           var dataContent = data.content;
           var dataContentLowerCase = dataContent.toLowerCase();