hexo-theme-stellar 1.15.0 → 1.16.0

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.15.0'
+  version: '1.16.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
-    page: [welcome, toc] # for pages using 'layout:page'
-    post: [toc, ghrepo, ghissues] # for pages using 'layout:post'
-    wiki: [toc, ghrepo, ghissues, related] # for pages using 'layout:wiki'
+    index: welcome, recent, 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'
 
 ######## Index ########
 post-index: # 近期发布 分类 标签 归档 and ...
@@ -283,7 +283,7 @@ plugins:
   # 赫蹏 (Heti) - 专为中文网页内容设计的排版样式增强
   # https://github.com/sivan/heti
   heti:
-    enable: false
+    enable: false # 此插件会和代码块冲突，仅适用于纯中文博主。
     css: https://unpkg.com/heti/umd/heti.min.css
     js: https://unpkg.com/heti/umd/heti-addon.min.js
 
@@ -321,8 +321,8 @@ style:
       button: '#1BCDFC' # 按钮颜色
       hover: '#ff5722' # 按钮高亮颜色
     light:
-      background: '#f8f8f8' # 浅色背景颜色
-      block: '#f2f2f2' # 块背景颜色
+      background: '#F8F9FA' # 浅色背景颜色
+      block: '#F0F1F2' # 块背景颜色
       card: white # 卡片背景颜色
       title: '#000' # 标题文本颜色
       text: '#333' # 正文文本颜色

package/layout/_partial/head.ejs

@@ -12,17 +12,20 @@ function generate_title() {
       return wiki + ' - ' + config.title;
     }
   } else {
-    if (page.category) {
+    if (page.title) {
+      return page.title + ' - ' + config.title;
+    } else if (page.category) {
       return __('btn.category') + __('symbol.colon') + page.category + ' - ' + config.title;
     } else if (page.tag) {
       return __('btn.tag') + __('symbol.colon') + page.tag + ' - ' + config.title;
-    } else {
-      return config.title;
     }
   }
-  return '';
+  return config.title;
 }
 function generate_description() {
+  if (theme.open_graph && theme.open_graph.enable) {
+    return '';
+  }
   if (page.layout == 'wiki' && page.wiki) {
     let proj = theme.wiki.projects[page.wiki];
     if (proj && proj.description) {

package/layout/_partial/main/navbar/list_wiki.ejs

@@ -13,9 +13,7 @@ function layoutDiv() {
   // 项目分类
   for (let id of Object.keys(theme.wiki.all_tags)) {
     let tag = theme.wiki.all_tags[id];
-    let projects = tag.items.filter(function(item){
-      return item.index !== false;
-    })
+    let projects = tag.items.filter(item => item.index !== false)
     if (projects && projects.length > 0) {
       el += '<a';
       if (tag.name && tag.name.length > 0 && page.tagName === tag.name) {

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

@@ -1,37 +1,18 @@
 <%
 function layoutDiv() {
-  const cmt = 'beaudar';
-  // 合并配置参数
-  var config = Object.assign({}, theme.comments[cmt]);
-  if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
-    if (proj[cmt] != undefined) {
-      Object.assign(config, proj[cmt]);
-    }
-  }
-  Object.assign(config, page[cmt]);
-  // 合并评论数据
-  if (config['issue-number'] !== null) {
-    config['issue-term'] = null;
-  } else {
-    if (page.comment_id != undefined) {
-      config['issue-term'] = page.comment_id;
-    } else if (page.layout === 'wiki' && page.wiki) {
-      let proj = theme.wiki.projects[page.wiki];
-      if (proj.comment_id != undefined) {
-        config['issue-term'] = proj.comment_id;
-      }
-    }
-  }
-  // 布局
   var el = '';
-  el += '<div id="' + cmt + '"';
-  for (let key of Object.keys(config)) {
-    if (config[key] !== null) {
-      el += ' ' + key + '="' + config[key] + '"';
+  const cmt = page.cmt;
+  if (cmt && cmt.service && (cmt.service.length > 0)) {
+    const name = cmt.service;
+    const body = cmt[name];
+    el += '<div id="' + name + '"';
+    for (let key of Object.keys(body)) {
+      if (body[key] !== null) {
+        el += ' ' + key + '="' + body[key] + '"';
+      }
     }
+    el += '></div>';
   }
-  el += '></div>';
   return el;
 }
 %>

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

@@ -1,35 +1,18 @@
 <%
 function layoutDiv() {
-  const cmt = 'giscus';
-  // 合并配置参数
-  var config = Object.assign({}, theme.comments[cmt]);
-  if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
-    if (proj[cmt] != undefined) {
-      Object.assign(config, proj[cmt]);
-    }
-  }
-  Object.assign(config, page[cmt]);
-  // 合并评论数据
-  if (page.comment_id != undefined) {
-    config['data-mapping'] = 'specific';
-    config['data-term'] = page.comment_id;
-  } else if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
-    if (proj.comment_id != undefined) {
-      config['data-mapping'] = 'specific';
-      config['data-term'] = proj.comment_id;
-    }
-  }
-  // 布局
   var el = '';
-  el += '<div id="' + cmt + '"';
-  for (let key of Object.keys(config)) {
-    if (config[key] !== null) {
-      el += ' ' + key + '="' + config[key] + '"';
+  const cmt = page.cmt;
+  if (cmt && cmt.service && (cmt.service.length > 0)) {
+    const name = cmt.service;
+    const body = cmt[name];
+    el += '<div id="' + name + '"';
+    for (let key of Object.keys(body)) {
+      if (body[key] !== null) {
+        el += ' ' + key + '="' + body[key] + '"';
+      }
     }
+    el += '></div>';
   }
-  el += '></div>';
   return el;
 }
 %>

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

@@ -1,4 +1,10 @@
 <%
+var cmt = {
+  service: theme.comments.service
+};
+if (cmt.service) {
+  cmt[cmt.service] = Object.assign({}, theme.comments[cmt.service]);
+}
 var loadComment = false;
 if (theme.comments.service && theme.comments.service.length > 0) {
   if (page.comments == undefined || page.comments != false) {
@@ -13,15 +19,24 @@ if (loadComment && page.layout == 'wiki' && page.wiki) {
       page.comment_title = proj.comment_title;
     }
   }
+  if (proj.comments && proj.comments.service) {
+    cmt = proj.comments;
+    let s = proj.comments.service;
+    cmt[s] = Object.assign({}, theme.comments[s], proj.comments[s]);
+  }
+}
+if (cmt.service && page[cmt.service]) {
+  Object.assign(cmt[cmt.service], page[cmt.service]);
 }
+page.cmt = cmt;
 %>
 <% if (loadComment) { %>
   <div class='related-wrap md reveal' id="comments">
     <div class='cmt-title cap theme'>
       <%- page.comment_title != undefined ? markdown(page.comment_title) : __('meta.comment_title') %>
     </div>
-    <div class='cmt-body <%- theme.comments.service %>'>
-      <%- partial(theme.comments.service + '/layout') %>
+    <div class='cmt-body <%- cmt.service %>'>
+      <%- partial(cmt.service + '/layout') %>
     </div>
   </div>
 <% } %>

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

@@ -1,3 +1,3 @@
-<% if (theme.comments.service && theme.comments.service.length > 0) { %>
-  <%- partial(theme.comments.service + '/script') %>
+<% if (page.cmt && page.cmt.service && page.cmt.service.length > 0) { %>
+  <%- partial(page.cmt.service + '/script') %>
 <% } %>

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

@@ -1,37 +1,18 @@
 <%
 function layoutDiv() {
-  const cmt = 'utterances';
-  // 合并配置参数
-  var config = Object.assign({}, theme.comments[cmt]);
-  if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
-    if (proj[cmt] != undefined) {
-      Object.assign(config, proj[cmt]);
-    }
-  }
-  Object.assign(config, page[cmt]);
-  // 合并评论数据
-  if (config['issue-number'] !== null) {
-    config['issue-term'] = null;
-  } else {
-    if (page.comment_id != undefined) {
-      config['issue-term'] = page.comment_id;
-    } else if (page.layout === 'wiki' && page.wiki) {
-      let proj = theme.wiki.projects[page.wiki];
-      if (proj.comment_id != undefined) {
-        config['issue-term'] = proj.comment_id;
-      }
-    }
-  }
-  // 布局
   var el = '';
-  el += '<div id="' + cmt + '"';
-  for (let key of Object.keys(config)) {
-    if (config[key] !== null) {
-      el += ' ' + key + '="' + config[key] + '"';
+  const cmt = page.cmt;
+  if (cmt && cmt.service && (cmt.service.length > 0)) {
+    const name = cmt.service;
+    const body = cmt[name];
+    el += '<div id="' + name + '"';
+    for (let key of Object.keys(body)) {
+      if (body[key] !== null) {
+        el += ' ' + key + '="' + body[key] + '"';
+      }
     }
+    el += '></div>';
   }
-  el += '></div>';
   return el;
 }
 %>

package/layout/_partial/sidebar/header.ejs

@@ -1,20 +1,55 @@
 <%
+var proj;
+if (page.layout === 'wiki' && page.wiki) {
+  proj = theme.wiki.projects[page.wiki];
+}
+function layoutTitle(main, url, sub) {
+  var el = '';
+  el += '<a class="title" href="' + url_for(url || "/") + '">';
+  el += '<div class="main" ff="title">' + main + '</div>';
+  if (sub) {
+    let arr = sub.split('|');
+    if (arr.length > 1) {
+      el += '<div class="sub normal cap">' + arr[0].trim() + '</div>';
+      el += '<div class="sub hover cap" style="opacity:0">' + arr[1].trim() + '</div>';
+    } else if (arr.length > 0) {
+      el += '<div class="sub cap">' + arr[0] + '</div>';
+    }
+  }
+  el += '</a>';
+  return el;
+}
+
 function layoutDiv() {
   var el = '';
+  if (page.layout == 'wiki' && page.menu_id == 'wiki') {
+    return el;
+  }
   el += '<header class="header';
   if (where == 'main') {
     el += ' mobile-only';
   }
   el += '">';
-  el += partial('logo');
-  if (where != 'main') {
-    if (page.layout === 'wiki' && page.wiki) {
-      if (page.menu_id !== 'wiki') {
-        el += partial('menu', {where: where});
-      }
-    } else {
-      el += partial('menu', {where: where});
+
+  el += '<div class="logo-wrap">';
+  if (md_text(theme.sidebar.logo.avatar)) {
+    el += '<a class="avatar" href="' + url_for(md_link(theme.sidebar.logo.avatar) || "/") + '">';
+    if (theme.style.animated_avatar.animate) {
+      el += '<div class="bg" style="opacity:0;background-image:url(' + theme.style.animated_avatar.background + ');"></div>';
     }
+    el += '<img no-lazy class="avatar" src="' + md_text(theme.sidebar.logo.avatar) + '">';
+    el += '</a>';
+  }
+  let main = md_text(theme.sidebar.logo.title);
+  if (main) {
+    let url = md_link(theme.sidebar.logo.title);
+    let sub = config.subtitle;
+    el += layoutTitle(main, url, sub);
+  }
+  el += '</div>';
+
+  if (where != 'main') {
+    el += partial('menu', {where: where});
   }
   el += '</header>';
   return el;

package/layout/_partial/sidebar/index.ejs

@@ -1,4 +1,8 @@
 <%
+var proj;
+if (page.layout === 'wiki' && page.wiki) {
+  proj = theme.wiki.projects[page.wiki];
+}
 // 默认组件
 if (page.sidebar == undefined) {
   if (page.layout == 'post' && page.content) {
@@ -18,9 +22,55 @@ if (page.sidebar == undefined) {
     page.sidebar = [];
   }
 }
+
+// parse array string
+if (typeof page.sidebar == 'string') {
+  page.sidebar = page.sidebar.replace(/ /g, '').split(',');
+}
+function layoutTitle(main, url, sub) {
+  var el = '';
+  el += '<a class="title" href="' + url_for(url || "/") + '">';
+  el += '<div class="main" ff="title">' + main + '</div>';
+  if (sub) {
+    let arr = sub.split('|');
+    if (arr.length > 1) {
+      el += '<div class="sub normal cap">' + arr[0].trim() + '</div>';
+      el += '<div class="sub hover cap" style="opacity:0">' + arr[1].trim() + '</div>';
+    } else if (arr.length > 0) {
+      el += '<div class="sub cap">' + arr[0] + '</div>';
+    }
+  }
+  el += '</a>';
+  return el;
+}
 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">';
+    // 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>';
+    el += __('btn.all_wiki');
+    el += '</a>';
+    // this product
+    if (proj == undefined) {
+      // 如果没有项目名，则使用menu中显示的名字
+      if (page.menu_id && theme.sidebar.menu[page.menu_id] && md_link(theme.sidebar.menu[page.menu_id])) {
+        proj = {
+          path: md_link(theme.sidebar.menu[page.menu_id]),
+          wiki: __(md_text(theme.sidebar.menu[page.menu_id]))
+        };
+      }
+    }
+    if (proj != undefined) {
+      let main = proj.name || proj.title || page.wiki || page.title;
+      let url = proj.homepage.path;
+      let sub = proj.subtitle;
+      el += layoutTitle(main, url, sub);
+    }
+    el += '</div></div>';
+  }
   if (page.sidebar) {
     page.sidebar.forEach((w, i) => {
       if (w in theme.data.widgets) {

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

@@ -13,20 +13,21 @@ function layoutDiv() {
   // body
   var arr = [];
   if (page.menu_id == 'wiki') {
-    arr = theme.wiki.all_pages.filter(function(p){
+    arr = theme.wiki.all_pages.filter( p => {
       if (p.wiki) {
         let proj = theme.wiki.projects[p.wiki];
         return proj.index != false;
       }
-      return false;
-    });
+      return false
+    })
+    arr = arr.sort((p1, p2) => p1.updated > p2.updated ? -1 : 1)
   } else {
-    arr = site.posts.filter(function(p){
-      return p.title && p.title.length > 0;
-    });
+    arr = site.posts.filter( p => p.title && p.title.length > 0)
+    arr = arr.sort("updated", -1)
   }
   el += '<div class="widget-body related-posts fs14">';
-  arr.sort("updated", -1).limit(item.limit).each(function(post) {
+  arr.length = item.limit
+  arr.forEach(post => {
     el += '<a class="item title" href="' + url_for(post.link || post.path) + '">';
     el += '<span class="title">'
     if (post.layout == 'wiki') {

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

@@ -29,7 +29,11 @@ function layoutDocTree(pages) {
     }
     el += '<div class="doc-tree' + isActive + '">';
     if (proj.pages.length > 1) {
-      el += '<a class="doc-tree-link' + isActive + '" href="' + url_for(p.path) + '">';
+      let href = url_for(p.path);
+      if (p.is_homepage) {
+        href += '#start'
+      }
+      el += '<a class="doc-tree-link' + isActive + '" href="' + href + '">';
       el += '<span class="toc-text">' + (p.title || p.seo_title) + '</span>';
       el += '</a>';
     }

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'); %>
+  <% page.title = __('btn.archives') + ' - ' + config.title; %>
   <%- 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'); %>
+  <% page.title = __('btn.categories') + ' - ' + config.title; %>
   <% page.layout = 'categories'; %>
   <%- partial('_partial/main/navbar/list_post') %>
   <div class='post-list'>

package/layout/index.ejs

@@ -28,9 +28,7 @@ function layout_posts(partial) {
   if (is_home()) {
     // pinned posts
     if (page.current == 1) {
-      var pinned = site.posts.filter(function(post){
-        return post.pin != undefined;
-      }).sort((config.index_generator && config.index_generator.order_by) || '-date');
+      var pinned = site.posts.filter(post => post.pin != undefined).sort((config.index_generator && config.index_generator.order_by) || '-date');
       pinned.forEach((post, i) => {
         el += layout_post_card('post', post, partial(post));
       });

package/layout/tags.ejs

@@ -5,7 +5,7 @@ if (page.menu_id == undefined) {
 }
 %>
 <% if (site.tags.length) { %>
-  <% page.title = __('btn.tags'); %>
+  <% page.title = __('btn.tags') + ' - ' + config.title; %>
   <% 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;
+    page.title = page.tagName + ' - ' + config.title;
   } else {
-    page.title = __('btn.wiki');
+    page.title = __('btn.wiki') + ' - ' + config.title;
   }
 }
 function layoutTitle() {

package/package.json

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