hexo-theme-stellar 1.16.1 → 1.17.0

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.16.1'
+  version: '1.17.0'
   homepage: 'https://xaoxuu.com/wiki/stellar/'
   repo: 'https://github.com/xaoxuu/hexo-theme-stellar'
   cdn_css: # Use cdn links instead of /css/main.css
@@ -25,10 +25,10 @@ sidebar:
     # about: '[关于](/about/)'
   # Sidebar widgets
   widgets:
-    index: welcome, recent, timeline # for home/wiki/categories/tags/archives/404 pages
+    index: welcome, recent, search, timeline # for home/wiki/categories/tags/archives/404 pages
     page: welcome, toc # for pages using 'layout:page'
-    post: toc, ghrepo, ghissues # for pages using 'layout:post'
-    wiki: ghrepo, toc, ghissues, related # for pages using 'layout:wiki'
+    post: toc, ghrepo, search, ghissues # for pages using 'layout:post'
+    wiki: search, ghrepo, toc, ghissues, related # for pages using 'layout:wiki'
 
 ######## Index ########
 post-index: # 近期发布 分类 标签 归档 and ...
@@ -49,9 +49,9 @@ article:
   auto_excerpt: 200
   # 分类颜色
   category_color:
-    '新闻稿': '#DA0F47'
+    '探索号': '#f44336'
   # 文章许可协议
-  license: '本文采用[署名-非商业性使用-相同方式共享 4.0 国际](https://creativecommons.org/licenses/by-nc-sa/4.0/)许可协议，转载请注明出处。'
+  license: '本文采用 [署名-非商业性使用-相同方式共享 4.0 国际](https://creativecommons.org/licenses/by-nc-sa/4.0/) 许可协议，转载请注明出处。'
   # 分享
   share: # [wechat, weibo, email, link]
   # 相关文章，需要安装插件 (for layout: post)
@@ -61,6 +61,11 @@ article:
     max_count: 5
 
 
+search:
+  service: local_search # hexo, todo...
+  local_search: # npm i hexo-generator-search
+  
+
 ######## Comments ########
 comments:
   service: # beaudar, utterances, twikoo, waline
@@ -194,7 +199,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 +224,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/_data/widgets.yml

@@ -2,7 +2,10 @@
 # layout即组件布局，支持自定义的有：
 # - markdown: 渲染 md 文本
 #
-
+search:
+  layout: search
+  filter: auto # auto or 'path'
+  
 ghrepo:
   layout: ghrepo
 related:

package/languages/en.yml

@@ -41,6 +41,11 @@ page:
     why: The address may be entered incorrectly or the address has been deleted.
     action: Back to Home
 
+search:
+  search: Search
+  search_in: Search in %s
+  no_results: No Results!
+
 message:
   copied: Copied!
 

package/languages/zh-CN.yml

@@ -41,6 +41,11 @@ page:
     why: 可能是输入地址有误或该地址已被删除
     action: 返回主页
 
+search:
+  search: 站内搜索
+  search_in: 在 %s 中搜索
+  no_results: 没有找到内容！
+
 message:
   copied: 复制成功
 

package/languages/zh-TW.yml

@@ -41,6 +41,11 @@ page:
     why: 可能是網址有誤或已經刪除
     action: 返回首頁
 
+search:
+  search: 站內搜索
+  search_in: 在 %s 中搜索
+  no_results: 沒有找到內容！
+
 message:
   copied: 複製成功
 

package/layout/404.ejs

@@ -5,7 +5,7 @@ page.comment_title = '';
 page.header = 'auto';
 page.robots = 'none';
 %>
-<article class='md error-page'>
+<article class='md-text error-page'>
   <h1><img id='error' src='https://fastly.jsdelivr.net/gh/cdn-x/placeholder@1.0.1/404/1c830bfcd517d.svg' alt='404'></h1>
   <p class='what'>
     <strong>

package/layout/_partial/cover/wiki_cover.ejs

@@ -19,7 +19,7 @@ function layoutWikiCover() {
     cover = ['logo', 'title', 'description'];
   }
   el += '<div class="l_cover wiki' + scrollreveal() + '">';
-  el += '<article class="cover-wrap md">';
+  el += '<article class="cover-wrap md-text">';
 
   if (logo && logo.src && cover.includes('logo')) {
     el += '<div class="preview">';

package/layout/_partial/main/post_list/paginator.ejs

@@ -1,13 +1,9 @@
 <% if (is_home() && page.total > 1) { %>
   <div class='paginator-wrap dis-select'>
-    <a class='paginator prev<%- page.prev != 0 ? "" : " disable" %>' href='<%- url_for(page.prev_link) %>'>
-      <img src='https://fastly.jsdelivr.net/gh/cdn-x/placeholder@1.0.1/arrow/f049bbd4e88ec.svg'/>
-    </a>
-    <div class='paginator current'>
-      <%- page.current %><span class='sep'></span><%- page.total %>
-    </div>
-    <a class='paginator next<%- page.next != 0 ? "" : " disable" %>' href='<%- url_for(page.next_link) %>'>
-      <img src='https://fastly.jsdelivr.net/gh/cdn-x/placeholder@1.0.1/arrow/064b95430caf4.svg'/>
-    </a>
+  <%- paginator({
+    prev_text: '',
+    next_text: '',
+    force_prev_next:true
+  }) %>
   </div>
 <% } %>

package/layout/_partial/main/post_list/post_card.ejs

@@ -11,7 +11,7 @@ if (poster) {
 }
 function div_default() {
   var el = '';
-  el += '<article class="md">';
+  el += '<article class="md-text">';
 
   // 封面
   if (obj.image || theme.article.auto_cover) {

package/layout/_partial/main/post_list/wiki_card.ejs

@@ -1,7 +1,7 @@
 <%
 function layoutDiv() {
   var el = '';
-  el += '<article class="md">';
+  el += '<article class="md-text">';
   if (proj.logo && proj.logo.src) {
     el += '<div class="preview">';
     el += '<img src="' + proj.logo.src + '" alt="logo"';

package/layout/_partial/plugins/comments/layout.ejs

@@ -31,7 +31,7 @@ if (cmt.service && page[cmt.service]) {
 page.cmt = cmt;
 %>
 <% if (loadComment) { %>
-  <div class='related-wrap md reveal' id="comments">
+  <div class='related-wrap md-text reveal' id="comments">
     <div class='cmt-title cap theme'>
       <%- page.comment_title != undefined ? markdown(page.comment_title) : __('meta.comment_title') %>
     </div>

package/layout/_partial/scripts/index.ejs

@@ -107,6 +107,15 @@
     jQuery: '<%- url_for(theme.plugins.jquery || "https://fastly.jsdelivr.net/npm/jquery@latest/dist/jquery.min.js") %>'
   };
 
+  if ('<%- theme.search.service %>') {
+    stellar.search = {};
+    stellar.search.service = '<%- theme.search.service %>';
+    if (stellar.search.service == 'local_search') {
+      let service_obj = Object.assign({}, <%- JSON.stringify(config.search) %>);
+      stellar.search[stellar.search.service] = service_obj;
+    }
+  }
+
   // stellar js
   stellar.plugins.stellar = Object.assign(<%- JSON.stringify(theme.plugins.stellar) %>);
 

package/layout/_partial/sidebar/index.ejs

@@ -47,7 +47,7 @@ function layoutWidgets() {
   var el = '';
   el += '<div class="widgets">';
   if (page.layout == 'wiki' && proj && page.menu_id == 'wiki') {
-    el += '<div class="widget-wrap logo-wrap wiki"><div class="widget-body">';
+    el += '<widget class="widget-wrapper logo-wrap wiki"><div class="widget-body">';
     // all products
     el += '<a style="filter: grayscale(100%)" class="wiki-home cap" href="' + url_for(config.wiki_dir) + '">';
     el += '<svg aria-hidden="true" viewBox="0 0 16 16" width="1rem" height="1rem" fill="currentColor"><path fill-rule="evenodd" d="M7.78 12.53a.75.75 0 01-1.06 0L2.47 8.28a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 1.06L4.81 7h7.44a.75.75 0 010 1.5H4.81l2.97 2.97a.75.75 0 010 1.06z"></path></svg>';
@@ -69,15 +69,25 @@ function layoutWidgets() {
       let sub = proj.subtitle;
       el += layoutTitle(main, url, sub);
     }
-    el += '</div></div>';
+    el += '</div></widget>';
   }
   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 → 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;
@@ -22,7 +21,7 @@ function layoutDiv() {
   if (item.labels) {
     item.api += '&labels=' + item.labels;
   }
-  el += '<div class="widget-wrap" id="timeline">';
+  el += '<widget class="widget-wrapper timeline">';
     if (item.title) {
       el += '<div class="widget-header cap theme dis-select">';
       el += '<span class="name">' + item.title + '</span>';
@@ -38,7 +37,7 @@ function layoutDiv() {
       el += '>';
       el += '</div>';
     el += '</div>';
-  el += '</div>';
+  el += '</widget>';
   return el;
 }
 %>

package/layout/_partial/{sidebar/widgets → 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,15 +13,12 @@ function layoutDiv() {
         branch = proj.branch;
       }
     }
-  } else {
-    // 其它的如果有设置 repo 也可以
-    repo = page.repo;
   }
   if (repo == undefined) {
     return el;
   }
   // 布局
-  el += '<div class="widget-wrap" id="repo-info">';
+  el += '<widget class="widget-wrapper ghrepo">';
   // body
   el += '<div class="widget-body">';
   el += '<div class="items stellar-ghinfo-api" api="' + theme.api_host.ghapi + '/repos/' + repo + '">';
@@ -46,7 +45,7 @@ function layoutDiv() {
   el += '</a>';
   el += '</div>';
   el += '</div>';
-  el += '</div>';
+  el += '</widget>';
   return el;
 }
 %>

package/layout/_partial/{sidebar/widgets → widgets}/ghuser.ejs

@@ -22,9 +22,9 @@ function layoutDiv() {
     return el;
   }
 
-  el += '<div class="widget-wrap" id="github-user">';
+  el += '<widget class="widget-wrapper ghuser">';
   // 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>';
     }
@@ -47,10 +47,10 @@ function layoutDiv() {
     el += '</a>';
     // menu
     if (item.menu) {
-      el += partial('../menu', {where: 'sidebar'});
+      el += partial('../sidebar/menu', {where: 'sidebar'});
     }
   el += '</div>';
-  el += '</div>';
+  el += '</widget>';
   return el;
 }
 %>

package/layout/_partial/widgets/markdown.ejs

@@ -0,0 +1,18 @@
+<%
+function layoutDiv() {
+  if (!item.content?.length) return ''
+  var el = '';
+  el += '<widget class="widget-wrapper 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 += '</div>';
+  el += '</widget>';
+  return el;
+}
+%>
+<%- layoutDiv() %>

package/layout/_partial/{sidebar/widgets → widgets}/recent.ejs

@@ -1,6 +1,6 @@
 <%
 function layoutDiv() {
-  var el = '<div class="widget-wrap" id="recent">';
+  var el = '<widget class="widget-wrapper recent">';
   // header
   el += '<div class="widget-header cap theme dis-select">';
   el += '<span class="name">' + __("meta.recent_update") + '</span>';
@@ -28,14 +28,14 @@ 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') {
       let proj = theme.wiki.projects[post.wiki];
-      if (proj && proj.name) {
-        el += proj.name + ' / ';
-      } else if (post.wiki) {
-        el += post.wiki + ' / ';
+      let name = proj?.name || post?.wiki;
+      if (name) {
+        el += '<strong>' + name + '</strong>' + '<span class="dot"></span>';
       }
     }
     el += (post.title || post.seo_title || post.wiki) + '</span>';
@@ -43,7 +43,7 @@ function layoutDiv() {
     el += '';
   });
   el += '</div>';
-  el += '</div>';
+  el += '</widget>';
   return el;
 }
 %>

package/layout/_partial/{sidebar/widgets → widgets}/related.ejs

@@ -15,7 +15,7 @@ function layoutDiv() {
   }
   var el = '';
   if (related.length > 0) {
-    el += '<div class="widget-wrap" id="related">';
+    el += '<widget class="widget-wrapper related">';
     el += '<div class="widget-header cap theme dis-select">';
     var title = __('btn.wiki');
     if (proj.tags && proj.tags[0]) {
@@ -34,7 +34,7 @@ function layoutDiv() {
       el += '</a>';
     });
     el += '</div>';
-    el += '</div>';
+    el += '</widget>';
   }
   return el;
 }

package/layout/_partial/widgets/search.ejs

@@ -0,0 +1,31 @@
+<%
+function layoutDiv() {
+  var el = '<widget class="widget-wrapper search">'
+  el += '<div class="widget-body">'
+  el += '<div class="search-wrapper" id="search">'
+  el += '<form class="search-form">'
+  var filter = ''
+  if (item.filter == 'auto' && page.layout == 'wiki') {
+    let matches = page.path.match(/(.*?)\/(.*?)\//i)
+    if (matches?.length > 0) {
+      filter = matches[0]
+    }
+  }
+  el += '<input type="text" class="search-input" id="search-input"'
+  if (filter.length > 0) {
+    filter = '/' + filter
+    el += ' data-filter="' + filter + '"'
+    el += ' placeholder="' + (item.placeholder || __('search.search_in', filter)) + '">'
+  } else {
+    el += ' placeholder="' + (item.placeholder || __('search.search')) + '">'
+  }
+  el += '</form>'
+  el += '<div id="search-result"></div>'
+  el += '<div class="search-no-result">' + __('search.no_results') + '</div>'
+  el += '</div>'
+  el += '</div>'
+  el += '</widget>'
+  return el
+}
+%>
+<%- layoutDiv() %>

package/layout/_partial/{sidebar/widgets → widgets}/tagcloud.ejs

@@ -8,7 +8,7 @@ function layoutDiv() {
   delete opts['title'];
   delete opts['layout'];
   opts.class = 'tag ';
-  el += '<div class="widget-wrap" id="tagcloud">';
+  el += '<widget class="widget-wrapper tagcloud">';
     if (item.title) {
       el += '<div class="widget-header cap theme dis-select">';
       el += '<span class="name">' + item.title + '</span>';
@@ -17,7 +17,7 @@ function layoutDiv() {
     el += '<div class="widget-body fs14">';
       el += tagcloud(site.tags, opts);
     el += '</div>';
-  el += '</div>';
+  el += '</widget>';
   return el;
 }
 %>

package/layout/_partial/{sidebar/widgets → widgets}/timeline.ejs

@@ -4,7 +4,7 @@ function layoutDiv() {
   if (item.api == undefined) {
     return el;
   }
-  el += '<div class="widget-wrap" id="timeline">';
+  el += '<widget class="widget-wrapper timeline">';
     if (item.title) {
       el += '<div class="widget-header cap theme dis-select">';
       el += '<span class="name">' + item.title + '</span>';
@@ -20,7 +20,7 @@ function layoutDiv() {
       el += '>';
       el += '</div>';
     el += '</div>';
-  el += '</div>';
+  el += '</widget>';
   return el;
 }
 %>

package/layout/_partial/{sidebar/widgets → widgets}/toc.ejs

@@ -63,7 +63,7 @@ function layoutDiv(fallback) {
 
   var el = '';
   if (type.length > 0) {
-    el += '<div class="widget-wrap ' + type + '" id="toc">';
+    el += '<widget class="widget-wrapper toc ' + type + '" id="toc">';
     if (page.layout !== 'wiki') {
       // post 布局
       el += layoutTocHeader(page.toc_title);
@@ -90,7 +90,7 @@ function layoutDiv(fallback) {
         el += '</div>';
       }
     }
-    el += '</div>';
+    el += '</widget>';
   } else if (item.fallback) {
     el += partial(item.fallback, {item: theme.data.widgets[item.fallback]});
   }

package/layout/page.ejs

@@ -15,7 +15,7 @@ function layoutDiv() {
   if (page.h1 || page.title || (page.content && page.content.length > 0)) {
     el += partial('_partial/main/navbar/breadcrumb');
   }
-  el += '<article class="content md ' + page.layout + (page.indent ? ' indent' : '') + scrollreveal() + '">';
+  el += '<article class="md-text content ' + page.layout + (page.indent ? ' indent' : '') + scrollreveal() + '">';
   el += layoutTitle();
   if (page.content && page.content.length > 0) {
     el += page.content;

package/layout/post.ejs

@@ -23,7 +23,7 @@ if (theme.plugins.heti && theme.plugins.heti.enable) {
     <%- partial('mathjax') %>
 <% } %>
 <%- partial('_partial/main/navbar/breadcrumb') %>
-<article class='content<%- heti %> md <%- post.layout %><%- post.indent ? ' indent' : '' %><%- scrollreveal() %>'>
+<article class='md-text content<%- heti %> <%- post.layout %><%- post.indent ? ' indent' : '' %><%- scrollreveal() %>'>
 <%- layoutTitle() %>
 <%- post.content %>
 <%- partial('_partial/main/article/article_footer') %>

package/layout/wiki.ejs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.16.1",
+  "version": "1.17.0",
   "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/_common/base.styl

@@ -12,7 +12,7 @@ a
   &:hover
     color: $color-hover
 
-.md p:not([class]) 
+.md-text p:not([class]) 
   text-align: convert(hexo-config('style.text-align'))
 
 hr

package/source/css/_common/highlight.styl

@@ -10,7 +10,7 @@ p>code:not([class]),li>code:not([class])
   border-radius: 4px
   color: var(--text-code)
 
-article.md .highlight, pre:not([class]):has(>code)
+.md-text .highlight, pre:not([class]):has(>code)
   margin: var(--gap-p) 0
   border-radius: $border-block
   overflow: hidden
@@ -22,7 +22,7 @@ article.md .highlight, pre:not([class]):has(>code)
   @media screen and (min-width: $device-mobile)
     min-width: 180px
 
-article.md .highlight
+.md-text .highlight
   position: relative
   overflow: auto
   display: block
@@ -75,7 +75,7 @@ article.md .highlight
   .gutter+.code pre
     padding-left: 0.25em
 
-article.md .gist 
+.md-text .gist 
   .gist-file 
     border: 1px solid var(--block-border)
     border-radius: $border-block
@@ -96,7 +96,7 @@ table:not([class])
   border-collapse: collapse
 
 
-article.md pre
+.md-text pre
   >.caption
     color: var(--text-p3)
   >.hljs
@@ -106,7 +106,7 @@ article.md pre
     line-height: 1.5
     box-sizing: border-box
 
-article.md .highlight
+.md-text .highlight
   .code
     vertical-align: top
     &:before

package/source/css/_common/span.styl

@@ -3,6 +3,7 @@ span.dot,span.sep
   margin: 0 .25em
 span.dot:before
   content: '·'
+  font-weight: 900
 span.sep:before
   content: '/'
   padding-left: 2px

package/source/css/_layout/index.styl

@@ -1,4 +1,5 @@
 @import 'partial/*'
 @import 'tag-plugins/*'
 @import 'sidebar/*'
+@import 'widgets/*'
 @import 'pages/*'

package/source/css/_layout/list.styl

@@ -62,7 +62,7 @@
 
 
 // common article
-.post-list article.md
+.post-list .md-text
   padding: 1rem
   @media screen and (max-width: $device-mobile)
     padding: 0.5rem 1rem