hexo-theme-stellar 1.16.0 → 1.16.2

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.16.0'
+  version: '1.16.2'
   homepage: 'https://xaoxuu.com/wiki/stellar/'
   repo: 'https://github.com/xaoxuu/hexo-theme-stellar'
   cdn_css: # Use cdn links instead of /css/main.css
@@ -49,7 +49,7 @@ article:
   auto_excerpt: 200
   # 分类颜色
   category_color:
-    '新闻稿': '#DA0F47'
+    '探索号': '#f44336'
   # 文章许可协议
   license: '本文采用[署名-非商业性使用-相同方式共享 4.0 国际](https://creativecommons.org/licenses/by-nc-sa/4.0/)许可协议，转载请注明出处。'
   # 分享
@@ -194,7 +194,7 @@ footer:
 tag_plugins:
   # {% note text %}
   note:
-    default_color: '' # light, dark, red, orange, yellow, green, cyan, blue, purple
+    default_color: '' # light, dark, red, orange, yellow, green, cyan, blue, purple, warning, error
   # {% checkbox %}
   checkbox:
     interactive: false # enable interactive for user
@@ -219,6 +219,9 @@ tag_plugins:
   # {% timeline %}
   timeline:
     max-height: 80vh
+  # {% mark %}
+  mark:
+    default_color: dark # light, dark, red, orange, yellow, green, cyan, blue, purple, warning, error
 
 
 ######## JS Plugins ########

package/layout/_partial/sidebar/index.ejs

@@ -73,11 +73,21 @@ function layoutWidgets() {
   }
   if (page.sidebar) {
     page.sidebar.forEach((w, i) => {
-      if (w in theme.data.widgets) {
-        let widget = theme.data.widgets[w];
-        if (widget && widget.layout) {
-          el += partial('widgets/' + widget.layout, {item: widget});
-        }
+      let name = ''
+      let widget = {}
+      if (typeof w == 'string') {
+        name = w
+      } else if (typeof w == 'object' && w.override) {
+        name = w.override
+      }
+      if (name in theme.data.widgets) {
+        Object.assign(widget, theme.data.widgets[name])
+      }
+      if (typeof w == 'object' && w.override) {
+        Object.assign(widget, w)
+      }
+      if (widget && widget.layout) {
+        el += partial('widgets/' + widget.layout, {item: widget})
       }
     });
   }

package/layout/_partial/sidebar/widgets/ghissues.ejs

@@ -3,7 +3,9 @@ function layoutDiv() {
   var el = '';
   var repo;
   var branch = 'main';
-  if (page.layout === 'wiki' && page.wiki) {
+  if (page.repo) {
+    repo = page.repo
+  } else if (page.layout === 'wiki' && page.wiki) {
     let proj = theme.wiki.projects[page.wiki];
     if (proj && proj.repo) {
       repo = proj.repo;
@@ -11,9 +13,6 @@ function layoutDiv() {
         branch = proj.branch;
       }
     }
-  } else {
-    // 其它的如果有设置 repo 也可以
-    repo = page.repo;
   }
   if (repo == undefined) {
     return el;

package/layout/_partial/sidebar/widgets/ghrepo.ejs

@@ -3,7 +3,9 @@ function layoutDiv() {
   var el = '';
   var repo;
   var branch = 'main';
-  if (page.layout === 'wiki' && page.wiki) {
+  if (page.repo) {
+    repo = page.repo
+  } else if (page.layout === 'wiki' && page.wiki) {
     let proj = theme.wiki.projects[page.wiki];
     if (proj && proj.repo) {
       repo = proj.repo;
@@ -11,9 +13,6 @@ function layoutDiv() {
         branch = proj.branch;
       }
     }
-  } else {
-    // 其它的如果有设置 repo 也可以
-    repo = page.repo;
   }
   if (repo == undefined) {
     return el;

package/layout/_partial/sidebar/widgets/ghuser.ejs

@@ -24,7 +24,7 @@ function layoutDiv() {
 
   el += '<div class="widget-wrap" id="github-user">';
   // body
-  el += '<div class="widget-body stellar-ghinfo-api" api="' + item.api + '/users/' + item.username + '">';
+  el += '<div class="widget-body stellar-ghinfo-api" api="' + theme.api_host.ghapi + '/users/' + item.username + '">';
     if (item.avatar) {
       el += '<div class="avatar" ><img no-lazy type="img" id="avatar_url" src="' + config.avatar + '"></div>';
     }

package/layout/_partial/sidebar/widgets/markdown.ejs

@@ -1,16 +1,16 @@
 <%
 function layoutDiv() {
+  if (!item.content?.length) return ''
   var el = '';
-  if (item.content == undefined || item.content.length == 0) {
-    return el;
-  }
   el += '<div class="widget-wrap" id="markdown">';
+  if (item.title?.length > 0) {
     el += '<div class="widget-header cap theme dis-select">';
-      el += '<span class="name">' + item.title + '</span>';
-    el += '</div>';
-    el += '<div class="widget-body fs14">';
-      el += markdown(item.content);
+    el += '<span class="name">' + item.title + '</span>';
     el += '</div>';
+  }
+  el += '<div class="widget-body fs14">';
+  el += markdown(item.content);
+  el += '</div>';
   el += '</div>';
   return el;
 }

package/layout/_partial/sidebar/widgets/recent.ejs

@@ -28,6 +28,7 @@ function layoutDiv() {
   el += '<div class="widget-body related-posts fs14">';
   arr.length = item.limit
   arr.forEach(post => {
+    if (!post) { return }
     el += '<a class="item title" href="' + url_for(post.link || post.path) + '">';
     el += '<span class="title">'
     if (post.layout == 'wiki') {

package/layout/archive.ejs

@@ -7,7 +7,7 @@ if (page.menu_id == undefined) {
 <% if (page.posts && (is_category() || is_tag())) { %>
   <%- partial('index') %>
 <% } else { %>
-  <% page.title = __('btn.archives') + ' - ' + config.title; %>
+  <% page.title = __('btn.archives'); %>
   <%- partial('_partial/main/navbar/list_post') %>
   <div class='post-list'>
   	<% var years = []; %>

package/layout/categories.ejs

@@ -5,7 +5,7 @@ if (page.menu_id == undefined) {
 }
 %>
 <% if (site.categories.length) { %>
-  <% page.title = __('btn.categories') + ' - ' + config.title; %>
+  <% page.title = __('btn.categories'); %>
   <% page.layout = 'categories'; %>
   <%- partial('_partial/main/navbar/list_post') %>
   <div class='post-list'>

package/layout/tags.ejs

@@ -5,7 +5,7 @@ if (page.menu_id == undefined) {
 }
 %>
 <% if (site.tags.length) { %>
-  <% page.title = __('btn.tags') + ' - ' + config.title; %>
+  <% page.title = __('btn.tags'); %>
   <% page.layout = 'tags'; %>
   <%- partial('_partial/main/navbar/list_post') %>
   <div class='post-list'>

package/layout/wiki.ejs

@@ -7,9 +7,9 @@ if (page.layout == undefined) {
 }
 if (page.title == undefined) {
   if (page.tagName) {
-    page.title = page.tagName + ' - ' + config.title;
+    page.title = page.tagName;
   } else {
-    page.title = __('btn.wiki') + ' - ' + config.title;
+    page.title = __('btn.wiki');
   }
 }
 function layoutTitle() {

package/package.json

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

package/scripts/tags/mark.js

@@ -10,6 +10,9 @@
 
 hexo.extend.tag.register('mark', function(args) {
   args = hexo.args.map(args, ['color'], ['text']);
+  if (args.color == null) {
+    args.color = hexo.theme.config.tag_plugins.mark.default_color
+  }
   var el = '';
   el += '<mark class="tag-plugin mark"';
   el += ' ' + hexo.args.joinTags(args, ['color']).join(' ');

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

@@ -66,13 +66,13 @@ set_text_black()
   --theme-bg: #333
   set_text_white()
 
-.tag-plugin.note[color='warning']
+.tag-plugin[color='warning']
   --theme: $c-yellow
   --theme-border: #ffe659
   --theme-bg: #ffe659
   --theme-link: #ff453a
 
-.tag-plugin.note[color='error']
+.tag-plugin[color='error']
   --theme: $c-yellow
   --theme-border: #ff453a
   --theme-bg: #ff453a

package/source/js/plugins/timeline.js

@@ -95,7 +95,7 @@ const StellarTimeline = {
           cell += '</p>';
         }
         
-        cell += marked.parse(item.body);
+        cell += marked.parse(item.body || '');
         if (!hide.includes('footer')) {
           cell += '<div class="footer">';
           cell += '<div class="flex left">';