hexo-theme-stellar 1.25.0 → 1.26.0

package/layout/page.ejs

@@ -1,28 +1,75 @@
 <%
+const { layout } = page
+// 是否使用 Heti 布局插件
+const isUsingHeti = theme.plugins.heti && theme.plugins.heti.enable
+// 是否使用 TianliGPT 插件
+const isUsingTianliGPT = theme.plugins.tianli_gpt.enable && ['all', page.layout].includes(theme.plugins.tianli_gpt.field)
+
+// 默认的 menu_id
+if (page.menu_id == null) {
+  if (page.wiki?.length > 0) {
+    page.menu_id = theme.site_tree.wiki.menu_id
+  } else if (page.topic?.length > 0) {
+    page.menu_id = theme.site_tree.topic.menu_id
+  } else {
+    page.menu_id = theme.site_tree.post.menu_id
+  }
+}
+// 默认的 title
+if (page.title == null) {
+  if (page.wiki) {
+    page.title = __('btn.wiki')
+  }
+}
+
 function layoutTitle() {
-  const title = page.h1 != null ? page.h1 : page.title;
+  const title = page.h1 != null ? page.h1 : page.title
   if (title && title.length > 0) {
-    return '<h1 class="article-title"><span>' + title + '</span></h1>';
+    return `<h1 class="article-title"><span>${title}</span></h1>`
   } else {
-    return '';
+    return ''
+  }
+}
+
+function articleClass() {
+  var str = `md-text content${scrollreveal(' ')}`
+  if (isUsingHeti) {
+    str += ' heti'
   }
+  if (isUsingTianliGPT) {
+    str += ' '
+  }
+  return str
 }
+
 function layoutDiv() {
-  var el = '';
+  var el = ''
   if (page.nav_tabs) {
-    el += partial('_partial/main/navbar/nav_tabs_blog');
+    el += partial('_partial/main/navbar/nav_tabs_blog')
   }
   if (page.h1 || page.title || (page.content && page.content.length > 0)) {
-    el += partial('_partial/main/navbar/breadcrumb');
+    el += partial('_partial/main/navbar/article_top_area')
   }
-  el += '<article class="md-text content ' + page.layout + (page.indent ? ' indent' : '') + scrollreveal() + '">';
-  el += layoutTitle();
+  el += `<article class="${articleClass()}">`
+  el += layoutTitle()
   if (page.content && page.content.length > 0) {
-    el += page.content;
+    el += page.content
+  }
+  if (layout === 'post') {
+    el += partial('_partial/main/article/article_footer')
+  }
+  el += `</article>`
+  if (layout === 'post' || page.wiki) {
+    el += partial('_partial/main/article/read_next')
+  }
+  if (isUsingTianliGPT) {
+    el += partial('_partial/plugins/ai/tianli_gpt')
+  }
+  if (layout === 'post') {
+    el += partial('_partial/main/article/related_posts')
   }
-  el += '</article>';
-  el += partial('_partial/plugins/comments/layout');
-  return el;
+  el += partial('_partial/plugins/comments/layout')
+  return el
 }
 %>
 

package/layout/tags.ejs

@@ -9,7 +9,7 @@ if (page.menu_id == undefined) {
   <% page.layout = 'tags'; %>
   <%- partial('_partial/main/navbar/nav_tabs_blog') %>
   <div class='post-list'>
-    <article class='<%- scrollreveal() %>' id='tags'>
+    <article class='<%- scrollreveal("") %>' id='tags'>
       <% site.tags.sort('length', -1).each(function(tag){ %>
         <a class='tag' href="<%= url_for(tag.path) %>">
           <span class='name'><%= tag.name %></span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "hexo-renderer-ejs": "^2.0.0",
-    "hexo-renderer-stylus": "^2.1.0"
+    "hexo-renderer-stylus": "^3.0.1"
   },
   "homepage": "https://xaoxuu.com/wiki/stellar/",
   "devDependencies": {

package/scripts/events/lib/config.js

@@ -7,57 +7,61 @@
 
 'use strict';
 
-const path = require('path');
+const path = require('path')
 
-module.exports = hexo => {
+module.exports = ctx => {
 
-  const { cache, language_switcher } = hexo.theme.config;
+  const { cache, language_switcher } = ctx.theme.config
   const warning = function(...args) {
-    hexo.log.warn(`Since ${args[0]} is turned on, the ${args[1]} is disabled to avoid potential hazards.`);
-  };
+    ctx.log.warn(`Since ${args[0]} is turned on, the ${args[1]} is disabled to avoid potential hazards.`)
+  }
 
   if (cache && cache.enable && language_switcher) {
-    warning('language_switcher', 'caching');
-    cache.enable = false;
+    warning('language_switcher', 'caching')
+    cache.enable = false
   }
 
-  if (cache && cache.enable && hexo.config.relative_link) {
-    warning('caching', '`relative_link` option in Hexo `_config.yml`');
-    hexo.config.relative_link = false;
+  if (cache && cache.enable && ctx.config.relative_link) {
+    warning('caching', '`relative_link` option in Hexo `_config.yml`')
+    ctx.config.relative_link = false
   }
-  // hexo.config.meta_generator = false;
+  // ctx.config.meta_generator = false;
 
   // merge data
-  const data = hexo.locals.get('data');
-  // merge widgets
-  var widgets = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '_data/widgets.yml'), engine: 'yaml' });
+  const data = ctx.locals.get('data')
+  // merge widgets: 可覆盖删除的合并
+  var widgets = ctx.render.renderSync({ path: path.join(ctx.theme_dir, '_data/widgets.yml'), engine: 'yaml' })
   if (data.widgets) {
     for (let i of Object.keys(data.widgets)) {
-      let widget = data.widgets[i];
+      let widget = data.widgets[i]
       if (widget == null || widget.length == 0) {
         // delete
-        delete widgets[i];
+        delete widgets[i]
       } else {
         // create
         if (widgets[i] == null) {
-          widgets[i] = widget;
+          widgets[i] = widget
         } else {
           // merge
           for (let j of Object.keys(widget)) {
-            widgets[i][j] = widget[j];
+            widgets[i][j] = widget[j]
           }
         }
       }
     }
   }
-  if (hexo.theme.config.data == undefined) {
-    hexo.theme.config.data = {};
+  ctx.theme.config.widgets = widgets
+
+  // merge icons: 简单覆盖合并
+  var icons = ctx.render.renderSync({ path: path.join(ctx.theme_dir, '_data/icons.yml'), engine: 'yaml' })
+  if (data.icons) {
+    icons = Object.assign({}, icons, data.icons)
   }
-  hexo.theme.config.data['widgets'] = widgets;
+  ctx.theme.config.icons = icons
 
   // default menu
-  if (hexo.theme.config.menu == undefined) {
-    hexo.theme.config.menu = {};
+  if (ctx.theme.config.menubar == undefined) {
+    ctx.theme.config.menubar = {}
   }
 
-};
+}

package/scripts/events/lib/doc_tree.js

@@ -9,7 +9,6 @@ class WikiPage {
     this.id = page._id
     this.wiki = page.wiki
     this.title = page.title
-    this.seo_title = page.seo_title
     this.path = page.path
     this.path_key = page.path.replace('.html', '')
     this.layout = page.layout
@@ -35,11 +34,15 @@ function getWikiObject(ctx) {
       if (obj.sort == null) {
         obj.sort = 0
       }
-      if (obj.path?.startsWith('/')) {
-        obj.path = obj.path.substring(1)
-      }
-      if (obj.path?.endsWith('/') == false) {
-        obj.path = obj.path + '/'
+      if (obj.base_dir) {
+        if (obj.base_dir.startsWith('/')) {
+          obj.base_dir = obj.base_dir.substring(1)
+        }
+        if (obj.base_dir.length > 1 && obj.base_dir.endsWith('/') == false) {
+          obj.base_dir = obj.base_dir + '/'
+        }
+      } else {
+        obj.base_dir = ''
       }
       list.push(obj)
     }
@@ -56,7 +59,7 @@ module.exports = ctx => {
   var wiki = getWikiObject(ctx)
   const pages = ctx.locals.get('pages')
   // wiki 所有页面
-  const wiki_pages = pages.filter(p => (p.layout === 'wiki')).map(p => new WikiPage(p))
+  const wiki_pages = pages.filter(p => (p.wiki != null)).map(p => new WikiPage(p))
   const wiki_list = Object.keys(wiki.tree)
   // 上架的项目列表
   wiki.shelf = ctx.locals.get('data').wiki || []
@@ -101,25 +104,30 @@ module.exports = ctx => {
 
     // 首页
     // 未特别指定首页时，获取TOC第一页作为首页
-    if (item.homepage == null && item.toc != null) {
+    var homepage = item.homepage
+    if (homepage == null && item.toc != null) {
       for (let id of Object.keys(item.toc)) {
         const sec = item.toc[id]
         for (let key of sec) {
-          let hs = sub_pages.filter(p => p.path_key == item.path + key)
+          let hs = sub_pages.filter(p => p.path_key == item.base_dir + key)
           if (hs.length > 0) {
-            item.homepage = hs[0]
+            homepage = hs[0]
             break
           }
         }
-        if (item.homepage != null) {
+        if (homepage != null) {
           break
         }
       }
     }
-    if (item.homepage == null) {
-      item.homepage = sub_pages[0]
+    if (homepage == null) {
+      homepage = sub_pages[0]
+    }
+    if (typeof homepage == 'string') {
+      homepage = {path: homepage}
     }
-    item.homepage.is_homepage = true
+    homepage.is_homepage = true
+    item.homepage = homepage
     // 内页分组
     var sections = []
     var others = sub_pages
@@ -128,21 +136,21 @@ module.exports = ctx => {
       for (let title of Object.keys(item.toc)) {
         var sec = { title: title, pages: []}
         for (let key of item.toc[title]) {
-          sec.pages = sec.pages.concat(sub_pages.filter(p => p.path_key == item.path + key))
-          others = others.filter(p => p.path_key != item.path + key)
+          sec.pages = sec.pages.concat(sub_pages.filter(p => p.path_key == item.base_dir + key))
+          others = others.filter(p => p.path_key != item.base_dir + key)
         }
         sections.push(sec)
       }
       if (others.length > 0 && others.filter(p => p.title?.length > 0).length > 0) {
         sections.push({
           title: '...',
-          pages: others.sort((p1, p2) => p1.path - p2.path)
+          pages: others.sort((p1, p2) => p1.title - p2.title)
         })
       }
     } else {
       // 自动设置顺序
       sections.push({
-        pages: sub_pages.sort((p1, p2) => p1.path - p2.path)
+        pages: sub_pages.sort((p1, p2) => p1.title - p2.title)
       })
     }
     
@@ -177,7 +185,7 @@ module.exports = ctx => {
     }
     all_tags[tag_name] = {
       name: tag_name,
-      path: (ctx.theme.config.site_tree.wiki.base_dir) + '/tags/' + tag_name + '/index.html',
+      path: (ctx.theme.config.site_tree.index_wiki.base_dir) + '/tags/' + tag_name + '/index.html',
       items: items
     }
   })

package/scripts/events/lib/merge_posts.js

@@ -11,7 +11,6 @@ class RelatedPage {
     this.wiki = page.wiki
     this.topic = page.topic
     this.title = page.title
-    this.seo_title = page.seo_title
     this.path = page.path
     this.path_key = page.path.replace('.html', '')
     this.layout = page.layout

package/scripts/generators/topic.js

@@ -2,7 +2,7 @@
  * topic v1 | https://github.com/xaoxuu/hexo-theme-stellar/
  */
 
-hexo.extend.generator.register('topic', function (locals) {
+hexo.extend.generator.register('index_topic', function (locals) {
   const { site_tree, topic } = hexo.theme.config
   const topicIdList = Object.keys(topic.tree)
   if (topicIdList.length == 0) {
@@ -10,11 +10,11 @@ hexo.extend.generator.register('topic', function (locals) {
   }
   var ret = []
   ret.push({
-    path: site_tree.topic.base_dir + '/index.html',
+    path: site_tree.index_topic.base_dir + '/index.html',
     layout: ['index_topic'],
     data: {
       layout: 'index_topic',
-      menu_id: site_tree.topic.menu_id
+      menu_id: site_tree.index_topic.menu_id
     }
   })
   return ret

package/scripts/generators/wiki.js

@@ -10,11 +10,11 @@ hexo.extend.generator.register('wiki', function (locals) {
   }
   var ret = []
   ret.push({
-    path: site_tree.wiki.base_dir + '/index.html',
+    path: site_tree.index_wiki.base_dir + '/index.html',
     layout: ['index_wiki'],
     data: {
       layout: 'index_wiki',
-      menu_id: site_tree.wiki.menu_id,
+      menu_id: site_tree.index_wiki.menu_id,
       filter: false
     }
   })
@@ -26,9 +26,10 @@ hexo.extend.generator.register('wiki', function (locals) {
         layout: ['index_wiki'],
         data: {
           layout: 'index_wiki',
-          menu_id: site_tree.wiki.menu_id,
+          menu_id: site_tree.index_wiki.menu_id,
           filter: true,
-          tagName: tag.name
+          tagName: tag.name,
+          title: tag.name
         }
       })
     }

package/scripts/helpers/category_color.js

@@ -16,7 +16,7 @@ hexo.extend.helper.register('category_color', function(cat){
     } else if (textColor.length == (1+6)) { // #ffffff
       bgColor += '20'
     }
-    return ` style="--text-p3:${textColor};--theme-block:${bgColor}"`;
+    return ` style="--text-p2:${textColor};--theme-block:${bgColor}"`;
   }
   return ''
 })

package/scripts/helpers/icon.js

@@ -0,0 +1,16 @@
+'use strict';
+
+hexo.extend.helper.register('icon', function(key) {
+  const { icons } = hexo.theme.config
+  var result = ''
+  if (icons[key]) {
+    result = icons[key]
+  } else {
+    result = key
+  }
+  if (result.startsWith('/') || result.startsWith('https://') || result.startsWith('http://')) {
+    return `<img src="${result}" />`
+  } else {
+    return result
+  }
+})

package/scripts/helpers/parse_config.js

@@ -7,33 +7,35 @@
 
 hexo.extend.helper.register('md_text', function(args) {
   if (args == undefined) {
-    return '';
+    return ''
   }
-  let tmp = args.split('](');
+  let tmp = args.split('](')
   if (tmp.length > 1) {
-    tmp = tmp[0];
+    tmp = tmp[0]
     if (tmp.length > 1) {
-      tmp = tmp.substring(1, tmp.length);
+      tmp = tmp.substring(1, tmp.length)
     }
   }
-  if (tmp == 'config.title') {
-    tmp = hexo.config.title;
-  } else if (tmp == 'config.avatar') {
-    tmp = hexo.config.avatar;
+  if (tmp == 'config.title' || tmp == '${config.title}') {
+    tmp = hexo.config.title
+  } else if (tmp == 'config.avatar' || tmp == '${config.avatar}') {
+    tmp = hexo.config.avatar
   }
-  return tmp;
-});
+  return tmp
+})
 
 hexo.extend.helper.register('md_link', function(args) {
   if (args == undefined) {
-    return '';
+    return ''
   }
-  let tmp = args.split('](');
+  let tmp = args.split('](')
   if (tmp.length > 1) {
-    tmp = tmp[1];
+    tmp = tmp[1]
     if (tmp.length > 1) {
-      tmp = tmp.substring(0, tmp.length-1);
+      tmp = tmp.substring(0, tmp.length-1)
     }
+  } else {
+    return ''
   }
-  return tmp;
-});
+  return tmp
+})

package/scripts/helpers/scrollreveal.js

@@ -1,9 +1,9 @@
 'use strict';
 
-hexo.extend.helper.register('scrollreveal', function(args){
-  const cfg = hexo.theme.config;
-  if (cfg.plugins.scrollreveal && cfg.plugins.scrollreveal.enable) {
-    return ' reveal';
+hexo.extend.helper.register('scrollreveal', function(args) {
+  if (hexo.theme.config.plugins.scrollreveal?.enable) {
+    return `${args ? args : ''}slide-up`
+  } else {
+    return ''
   }
-  return '';
-});
+})

package/scripts/tags/lib/toc.js

@@ -14,7 +14,7 @@ function layoutDocTree(ctx, pages) {
   pages.forEach((p, i) => {
     el += '<li>'
     el += '<a class="list-link" href="' + url_for(p.path) + '">'
-    el += '<span>' + (p.title || p.seo_title) + '</span>'
+    el += '<span>' + p.title + '</span>'
     el += '</a>'
     el += '</li>'
   })

package/source/css/_common/blur.styl

@@ -1,13 +1,6 @@
 :root
   --blur-px: 12px
-  --blur-bg: alpha(white, .5)
-if hexo-config('style.darkmode') == 'auto'
-  @media (prefers-color-scheme: dark)
-    :root
-      --blur-bg: alpha(black, .5)
-if hexo-config('style.darkmode') == 'always'
-  :root
-    --blur-bg: alpha(black, .5)
+  --blur-bg: var(--alpha50)
 
 blur-effect()
   background: var(--blur-bg)

package/source/css/_common/cap.styl

@@ -2,7 +2,7 @@
   font-weight: 500
   font-size: $fs-12
   scrollbar-width: none
-  color: var(--text-p3)
+  color: var(--text-p2)
   &.blue
     color: darken($color-md-blue, 6)
   &.cyan

package/source/css/_common/device.styl

@@ -30,9 +30,9 @@
   cursor: pointer
   color: var(--text-p0)
   background: none
-  padding: 0.5rem
+  padding: 8px
   line-height: 0
-  font-size: 20px
+  font-size: 24px
   margin: 0
 
 

package/source/css/_common/highlight.styl

@@ -34,8 +34,8 @@ p>code:not([class]),li>code:not([class])
     span
       padding: 4px 0.5rem
       display: block
-      border-bottom-left-radius: $border-bar
-      border-bottom-right-radius: $border-bar
+      border-bottom-left-radius: $border-button
+      border-bottom-right-radius: $border-button
       background: var(--block-hover)
   >table
     overflow: auto

package/source/css/_common/layout.styl

@@ -0,0 +1,6 @@
+.flex
+  display: flex
+  align-items: center
+
+.flex.column
+  flex-direction: column

package/source/css/_common/svg.styl

@@ -4,3 +4,6 @@ svg.icon
   vertical-align: middle
   fill: currentColor
   overflow: hidden
+
+svg.active-icon
+  color: $c-green

package/source/css/_custom.styl

@@ -50,7 +50,7 @@ $fs-h3   = 1.375rem  // 22px
 $fs-h4   = 1.125rem  // 18px
 $fs-h5   = $fs-15
 $fs-h6   = $fs-12
-$fs-p    = convert(hexo-config('style.font-size.body'))
+$fs-body = convert(hexo-config('style.font-size.body'))
 $fs-code = convert(hexo-config('style.font-size.code'))
 $fs-codeblock = convert(hexo-config('style.font-size.codeblock'))
 
@@ -65,6 +65,7 @@ $border-button = 4px
 :root
   --width-left: 288px
   --width-main: 720px
+  --fs-p: $fs-body
   --gap-l: 16px
   --gap-p: 1rem // gap for paragraph
   --gap-p-compact: 0.75rem
@@ -84,7 +85,13 @@ $border-button = 4px
   @media screen and (max-width: $device-mobile-max)
     --width-left: 288px
 
-
+// 文章布局风格
+.l_body.story
+  --fs-p: 'calc(%s + 2px)' % $fs-body
+  --gap-p: 1.5rem
+  .tag-plugin,p>img
+    margin-top: 2.4rem
+    margin-bottom: 2.4rem
 
 // shadow
 $boxshadow-card = 0 1px 2px 0px rgba(0, 0, 0, 0.1)

package/source/css/_defines/theme.styl

@@ -35,6 +35,11 @@ set_text_light()
 :root
   --site-bg: hsl($color-background-h, $color-background-s, $color-background-l)
   --card: hsl($color-block-h, $color-block-s, 100)
+  --alpha20: rgba(white, 0.2)
+  --alpha50: rgba(white, 0.5)
+  --alpha60: rgba(white, 0.6)
+  --alpha100: white
+  --sidebar-bg: rgba(white, 0.5)
   --block: hsl($color-block-h, $color-block-s, 95)
   --block-border: hsl($color-block-h, $color-block-s, 90)
   --block-hover: hsl($color-block-h, $color-block-s, 92)
@@ -48,6 +53,11 @@ set_darkmode()
     --block: hsl($color-block-h, $color-block-s, 16)
     --block-border: hsl($color-block-h, $color-block-s, 24)
     --block-hover: hsl($color-block-h, $color-block-s, 20)
+    --alpha20: rgba(black, 0.2)
+    --alpha50: rgba(black, 0.5)
+    --alpha60: rgba(black, 0.6)
+    --alpha100: black
+    --sidebar-bg: rgba(black, 0.64)
     set_text_light()
     @media screen and (max-width: $device-mobile-max)
       --site-bg: black

package/source/css/_layout/layout.styl

@@ -10,7 +10,7 @@
   flex-shrink: 0
   position: sticky
   position: -webkit-sticky
-  top: 0
+  top: 8px
 
 .l_body .l_main
   flex-shrink: 1
@@ -20,6 +20,17 @@
 
 
 // 手机布局
+.main-mask
+  position: fixed
+  pointer-events: none
+  top: 0
+  left: 0
+  width: 100%
+  height: 100%
+  background: rgba(black, 0.5)
+  z-index: 9
+  opacity 0
+  trans1 opacity
 @media screen and (max-width: $device-mobile-max)
   .mobile-only
     display: block !important
@@ -29,10 +40,9 @@
       position: fixed
       transform: translateX(-320px)
       margin: 0
-      left: 0
-      background: var(--site-bg)
+      left: 8px
       box-shadow: $boxshadow-card-float
-      z-index: 9
+      z-index: 10
     .l_main
       max-width: 100%
   .l_body.mobile
@@ -41,3 +51,6 @@
   .l_body.mobile.sidebar
     .l_left
       transform: translateX(0px)
+    .main-mask
+      opacity 1
+      pointer-events: inherit

package/source/css/_layout/list.styl

@@ -1,10 +1,10 @@
 // list
-.post-list
+.l_main .post-list
   margin: 1rem
   .post-title:first-child
     margin-top: .5rem
 
-.post-list
+.l_main .post-list
   .post-title
     font-weight: 500
     margin: 1.25rem 0 .75rem 0
@@ -52,6 +52,9 @@
       img
         object-fit: contain
         height: 1.5em
+      svg
+        height: 1.5rem
+        color: $c-red
 
 .post-list .post-card:hover
   img