hexo-theme-stellar 1.15.0 → 1.16.0

package/scripts/events/lib/doc_tree.js

@@ -1,162 +1,163 @@
 /**
- * doc_tree.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * doc_tree.js v2 | https://github.com/xaoxuu/hexo-theme-stellar/
  */
 
 'use strict';
 
-function page(page) {
-  return {
-    title: page.title,
-    path: page.path,
-    wiki: page.wiki
-  };
+class WikiPage {
+  constructor(page) { 
+    this.id = page._id
+    this.title = page.title
+    this.path = page.path
+    this.layout = page.layout
+    this.seo_title = page.seo_title
+    this.wiki = page.wiki
+    this.order = page.order || 0
+    this.updated = page.updated
+  }
 }
 
-module.exports = hexo => {
-  const data = hexo.locals.get('data');
-  if (hexo.theme.config.wiki == undefined) {
-    hexo.theme.config.wiki = {};
-  }
-  if (hexo.theme.config.wiki.projects == undefined) {
-    hexo.theme.config.wiki.projects = {};
-  }
-  if (data.projects) {
-    for (let id of Object.keys(data.projects)) {
-      hexo.theme.config.wiki.projects[id] = data.projects[id];
-    }
+function createWikiObject(ctx) {
+  const wiki = { projects:{} }
+  const { projects } = ctx.locals.get('data')
+  if (projects) {
+    Object.assign(wiki.projects, projects)
   }
+  return wiki
+}
 
+module.exports = ctx => {
   // wiki 配置
-  var wiki = hexo.theme.config.wiki;
+  var wiki = createWikiObject(ctx)
+  const pages = ctx.locals.get('pages')
   // wiki 所有页面
-  const wiki_pages = hexo.locals.get('pages').filter(function (p) {
-    return (p.layout === 'wiki') && (p.wiki != undefined) && (p.wiki.length > 0);
-  });
+  const wiki_pages = pages.filter(p => (p.layout === 'wiki') && (p.wiki != undefined) && (p.wiki.length > 0)).map(p => new WikiPage(p))
 
   // 数据整合：项目标签
-  var tagNames = [];
+  var all_tag_name = []
   for (let id of Object.keys(wiki.projects)) {
-    let proj = wiki.projects[id];
-    let tags = proj.tags;
+    let proj = wiki.projects[id]
+    let tags = proj.tags
     if (tags) {
       if ((typeof tags == 'string') && tags.constructor == String) {
-        if (tagNames.includes(tags) === false) {
-          tagNames.push(tags);
+        if (all_tag_name.includes(tags) === false) {
+          all_tag_name.push(tags)
         }
         // 类型转换
-        tags = [tags];
+        tags = [tags]
       } else if ((typeof tags == 'object') && tags.constructor == Array) {
         tags.forEach((tag, i) => {
-          if (tagNames.includes(tag) === false) {
-            tagNames.push(tag);
+          if (all_tag_name.includes(tag) === false) {
+            all_tag_name.push(tag)
           }
-        });
+        })
       }
-      wiki.projects[id].tags = tags;
+      wiki.projects[id].tags = tags
     }
   }
   // 补充未分组的项目
-  const projs = Object.keys(wiki.projects);
+  const projs = Object.keys(wiki.projects)
   wiki_pages.forEach((p, i) => {
     if (projs.includes(p.wiki) == false) {
       if (wiki.projects[p.wiki] == undefined) {
-        wiki.projects[p.wiki] = {};
-        wiki.projects[p.wiki].pages = [];
+        wiki.projects[p.wiki] = {}
+        wiki.projects[p.wiki].pages = []
       }
-      var proj = wiki.projects[p.wiki];
+      var proj = wiki.projects[p.wiki]
       if (proj.description == undefined) {
-        proj.description = p.description;
+        proj.description = p.description
       }
-      wiki.projects[p.wiki].pages.push(p);
+      wiki.projects[p.wiki].pages.push(p)
     }
-  });
+  })
   // 补充项目名称和首页
   for (let id of Object.keys(wiki.projects)) {
-    let proj = wiki.projects[id];
-    proj.id = id;
+    let proj = wiki.projects[id]
+    proj.id = id
     if (proj.title == undefined || proj.title.length === 0) {
-      proj.title = id;
+      proj.title = id
     }
     if (proj.name == undefined || proj.name.length == 0) {
-      proj.name = id;
+      proj.name = id
     }
   }
   // 补充 order
   wiki_pages.forEach((p, i) => {
     if (p.order == undefined) {
-      p.order = 0;
+      p.order = 0
     }
-  });
+  })
 
   // 数据整合：每个项目的子页面
   for (let id of Object.keys(wiki.projects)) {
-    let proj = wiki.projects[id];
-    proj.pages = wiki_pages.filter(function (p) {
-      return p.wiki === id;
-    }).sort('order');
-    proj.pages.limit(1).forEach((p, i) => {
-      proj.homepage = p;
-    });
+    let proj = wiki.projects[id]
+    let proj_pages = wiki_pages.filter(p => p.wiki === id).sort((p1, p2) => p1.order < p2.order ? -1 : 1)
+    if (!proj_pages || proj_pages.length == 0) {
+      continue
+    }
+    proj.homepage = proj_pages[0]
+    proj.homepage.is_homepage = true
     // 内页按 section 分组
-    var sectionConfigs = [];
+    var section_configs = []
     if (proj.sections) {
       for (let t of Object.keys(proj.sections)) {
-        let range = proj.sections[t];
+        let range = proj.sections[t]
         if (range.length > 1) {
-          sectionConfigs.push({
+          section_configs.push({
             title: t,
             from: range[0],
             to: range[1]
-          });
+          })
         }
       }
     }
-    var sections = [];
-    sectionConfigs.forEach((sec, i) => {
-      const pages = proj.pages.filter(function (p) {
-        return p.order >= sec.from && p.order <= sec.to;
-      });
-      if (pages && pages.length > 0) {
+    var sections = []
+    section_configs.forEach((sec, i) => {
+      const sec_pages = proj_pages.filter( p => p.order >= sec.from && p.order <= sec.to )
+      if (sec_pages && sec_pages.length > 0) {
         sections.push({
           title: sec.title,
-          pages: pages
-        });
+          pages: sec_pages
+        })
       }
-    });
-    proj.sections = sections;
+    })
+    proj.sections = sections
+    proj.pages = proj_pages
   }
 
   // 全站所有的项目标签
-  var all_tags = {};
-  tagNames.forEach((tagName, i) => {
-    var projs = [];
+  var all_tags = {}
+  all_tag_name.forEach((tag_name, i) => {
+    var projs = []
     for (let id of Object.keys(wiki.projects)) {
-      let proj = wiki.projects[id];
-      if (proj.tags && proj.tags.includes(tagName) === true && projs.includes(tagName) === false) {
-        projs.push(proj.id);
+      let proj = wiki.projects[id]
+      if (proj.tags && proj.tags.includes(tag_name) === true && projs.includes(tag_name) === false) {
+        projs.push(proj.id)
       }
     }
-    all_tags[tagName] = {
-      name: tagName,
-      path: (hexo.config.wiki_dir || 'wiki') + '/tags/' + tagName + '/index.html',
+    all_tags[tag_name] = {
+      name: tag_name,
+      path: (ctx.config.wiki_dir || 'wiki') + '/tags/' + tag_name + '/index.html',
       items: projs
-    };
-  });
+    }
+  })
 
-  // 整合相似项目
+  // 关联相似项目
   for (let id of Object.keys(wiki.projects)) {
-    let proj = wiki.projects[id];
+    let proj = wiki.projects[id]
     if (proj.tags) {
-      var related = [];
-      proj.tags.forEach((tagName, i) => {
-        let tagObj = all_tags[tagName];
-        related = related.concat(tagObj.items);
-        related = [...new Set(related)];
-      });
-      proj.related = related;
+      var related = []
+      proj.tags.forEach((tag_name, i) => {
+        let tagObj = all_tags[tag_name]
+        related = related.concat(tagObj.items)
+        related = [...new Set(related)]
+      })
+      proj.related = related
     }
   }
 
-  wiki.all_tags = all_tags;
-  wiki.all_pages = wiki_pages;
-};
+  wiki.all_tags = all_tags
+  wiki.all_pages = wiki_pages
+  ctx.theme.config.wiki = wiki
+
+}

package/scripts/helpers/related_posts.js

@@ -29,9 +29,7 @@ hexo.extend.helper.register('popular_posts_wrapper', function(args){
   function listItem(obj){
     var el = '';
     el += '<a class="item" href="' + obj.path + '" title="' + obj.title + '">';
-    var p = posts.filter(function(p) {
-      return root + p.path == obj.path;
-    });
+    var p = posts.filter(p => root + p.path == obj.path)
     if (p && p.length > 0) {
       p = p.data[0];
     }

package/scripts/helpers/utils.js

@@ -0,0 +1,20 @@
+/**
+ * utils v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ */
+
+'use strict';
+
+hexo.extend.helper.register('get_page', function(id) {
+  const pages = hexo.locals.get('pages');
+  let page = pages.data.find(element => element._id == id)
+  if (page && page._id == id) {
+    return page
+  } else {
+    const posts = hexo.locals.get('posts');
+    let post = posts.data.find(element => element._id == id)
+    if (post && post._id == id) {
+      return post
+    }
+  }
+  return null
+});

package/scripts/tags/folders.js

@@ -19,15 +19,13 @@ hexo.extend.tag.register('folders', function(args, content) {
   el += ' ' + hexo.args.joinTags(args, ['color']).join(' ');
   el += '>';
   
-  var arr = content.split(/<!--\s*(.*?)\s*-->/g).filter((item, i) => {
-    return item.trim().length > 0;
-  });
+  var arr = content.split(/<!--\s*folder (.*?)\s*-->/g).filter(item => item.trim().length > 0)
   if (arr.length > 0) {
     var nodes = [];
     arr.forEach((item, i) => {
-      if (item.startsWith('folder ')) {
+      if (i % 2 == 0) {
         nodes.push({
-          header: item.substring(7)
+          header: item
         });
       } else if (nodes.length > 0) {
         var node = nodes[nodes.length-1];
@@ -44,7 +42,7 @@ hexo.extend.tag.register('folders', function(args, content) {
       el += '<summary><span>' + (node.header || '') + '</span></summary>';
       // content
       el += '<div class="body">';
-      el += hexo.render.renderSync({text: node.body, engine: 'markdown'}).split('\n').join('');
+      el += hexo.render.renderSync({text: (node.body || ''), engine: 'markdown'}).split('\n').join('');
       el += '</div></details>';
     });  
   }

package/scripts/tags/lib/tabs.js

@@ -6,17 +6,15 @@
 
 var tab_index = 0;
 
-module.exports = ctx => function(args, content) {
+module.exports = ctx => function(args, content = '') {
   var el = '';
-  var arr = content.split(/<!--\s*(.*?)\s*-->/g).filter((item, i) => {
-    return item.trim().length > 0;
-  });
+  var arr = content.split(/<!--\s*tab (.*?)\s*-->/g).filter(item => item.trim().length > 0)
   if (arr.length < 1) {
     return el;
   }
   var tabs = [];
   arr.forEach((item, i) => {
-    if (item.startsWith('tab ')) {
+    if (i % 2 == 0) {
       tabs.push({
         header: item
       });
@@ -37,14 +35,12 @@ module.exports = ctx => function(args, content) {
   let tabId = 0;
   let tabNav = '';
   let tabContent = '';
-
   tabs.forEach((tab, i) => {
-    let caption = tab.header.substring(4);
-    let content = ctx.render.renderSync({ text: tab.body, engine: 'markdown' }).trim();
+    let content = ctx.render.renderSync({ text: (tab.body || ''), engine: 'markdown' }).trim();
     const abbr = tabName + ' ' + ++tabId;
     const href = abbr.toLowerCase().split(' ').join('-');
     const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : '';
-    tabNav += `<li class="tab${isActive}"><a href="#${href}">${caption || abbr}</a></li>`;
+    tabNav += `<li class="tab${isActive}"><a href="#${href}">${tab.header || abbr}</a></li>`;
     tabContent += `<div class="tab-pane${isActive}" id="${href}">${content}</div>`;
   });
 

package/scripts/tags/split.js

@@ -3,9 +3,9 @@
  * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
  *
  * {% split [style:block/card] %}
- * <!-- cell -->
+ * <!-- cell left -->
  * left body
- * <!-- cell -->
+ * <!-- cell right -->
  * right body
  * {% endsplit %}
  */
@@ -19,15 +19,13 @@ hexo.extend.tag.register('split', function(args, content) {
   el += ' ' + hexo.args.joinTags(args, ['bg']).join(' ');
   el += '>';
   
-  var arr = content.split(/<!--\s*(.*?)\s*-->/g).filter((item, i) => {
-    return item.trim().length > 0;
-  });
+  var arr = content.split(/<!--\s*cell (.*?)\s*-->/g).filter(item => item.trim().length > 0)
   if (arr.length > 0) {
     var nodes = [];
     arr.forEach((item, i) => {
-      if (item == 'cell') {
+      if (i % 2 == 0) {
         nodes.push({
-          header: ''
+          header: item
         });
       } else if (nodes.length > 0) {
         var node = nodes[nodes.length-1];
@@ -40,7 +38,7 @@ hexo.extend.tag.register('split', function(args, content) {
     });
     nodes.forEach((node, i) => {
       el += '<div class="cell" index="' + (i) + '">';
-      el += hexo.render.renderSync({text: node.body, engine: 'markdown'}).split('\n').join('');
+      el += hexo.render.renderSync({text: (node.body || ''), engine: 'markdown'}).split('\n').join('');
       el += '</div>';
     });  
   }

package/scripts/tags/timeline.js

@@ -49,13 +49,11 @@ function postTimeline(args, content) {
     el += '<div class="tag-plugin timeline">';
   }
 
-  var arr = content.split(/<!--\s*(.*?)\s*-->/g).filter((item, i) => {
-    return item.trim().length > 0;
-  });
+  var arr = content.split(/<!--\s*node (.*?)\s*-->/g).filter(item => item.trim().length > 0)
   if (arr.length > 0) {
     var nodes = [];
     arr.forEach((item, i) => {
-      if (item.startsWith('node ')) {
+      if (i % 2 == 0) {
         nodes.push({
           header: item
         });
@@ -70,7 +68,7 @@ function postTimeline(args, content) {
     });
     nodes.forEach((node, i) => {
       el += '<div class="timenode" index="' + (i) + '">';
-      el += layoutNodeTitle(node.header.substring(5));
+      el += layoutNodeTitle(node.header);
       el += layoutNodeContent(node.body);
       el += '</div>';
     });  

package/source/css/_common/blockquote.styl

@@ -0,0 +1,10 @@
+blockquote
+  display: block
+  margin-left: 0
+  margin-right: 0
+  padding: 0.5rem 0.75rem
+  background: var(--block)
+  $bd-left = 4px
+  border-left: $bd-left solid var(--text-meta)
+  border-radius: $bd-left $border-block $border-block $bd-left
+  color: var(--text-p2)

package/source/css/_common/device.styl

@@ -14,23 +14,21 @@
   float: right
   z-index: 10
   display: flex
-  border-radius: $border-block 0 0 $border-block
-  padding-right: 1rem
-  border: 1px solid var(--block-border)
-  border-right: 0
+  border-radius: 2rem
+  margin-right: 1rem
   overflow: hidden
-  --blur-px: 24px
-  --blur-bg: alpha(#eaeaea, .6)
+  --blur-px: 16px
+  --blur-bg: alpha(#fff, .4)
+  trans1: all
   if hexo-config('style.darkmode') == 'auto'
     @media (prefers-color-scheme: dark)
-      --blur-bg: alpha(#555, .6)
+      --blur-bg: alpha(#000, .4)
   if hexo-config('style.darkmode') == 'always'
-    --blur-bg: alpha(#555, .6)
+    --blur-bg: alpha(#000, .4)
 
 .sidebar-toggle.mobile
   cursor: pointer
-  color: var(--text-p2)
-  border-right: 1px solid transparent
+  color: var(--text-p0)
   background: none
   padding: 0.5rem
   line-height: 0
@@ -39,6 +37,9 @@
 
 
 .l_body.mobile.sidebar
+  .float-panel
+    box-shadow: $boxshadow-float
+    transform: translateY(-2px)
   .sidebar-toggle.mobile
     background: var(--card)
     color: $color-hover

package/source/css/_layout/list.styl

@@ -25,7 +25,7 @@
   margin: 1rem 0
   border-radius: $border-card
   box-shadow: 0 2px 8px 0px rgba(0, 0, 0, 0.02)
-  trans1 box-shadow
+  trans1 all
   overflow: hidden
   z-index: 0
   background: var(--card)
@@ -55,6 +55,7 @@
 
 .post-list .post-card:hover
   box-shadow: 0 1px 4px 0px rgba(0, 0, 0, 0.1), 0 4px 16px 0px rgba(0, 0, 0, 0.1)
+  transform: translateY(-1px)
   img 
     transform: scale(1.02)
     filter: brightness(80%)

package/source/css/_layout/main.styl

@@ -5,8 +5,10 @@
     margin-left: "calc(2 * %s)" % var(--gap-l)
     margin-right: "calc(2 * %s + %s / 2)" % (var(--gap-l) var(--width-left))
   @media screen and (min-width: $device-mobile-max)
-    padding-top: "calc(1 * %s)" % var(--gap-l)
+    padding-top: "calc(2 * %s)" % var(--gap-l)
+  @media screen and (max-width: $device-mobile-max)
+    padding-top: 1rem
   header
-    margin: 4rem 1rem 2rem
+    margin: 2rem 1rem 1rem
     .logo-wrap
       margin: 0

package/source/css/_layout/md.styl

@@ -1,6 +1,9 @@
 article.md
   max-width: 100%
-  padding: 1rem
+  padding: 0 1rem
+  margin-top: 1rem
+  &:first-child
+    margin-top: 0
   color: var(--text-p1)
   line-height: 1.7
   word-break: break-word
@@ -33,7 +36,7 @@ article.md.content
       align-self: center
       border-bottom-style: dashed
       border-bottom-color: $color-accent
-  >:first-child
+  >:first-child:not(h1)
     margin-top: 0
   h1:not(:first-child)
     margin-top: 2em
@@ -50,7 +53,7 @@ article.md.content
 
 
 
-.md
+article.md
   ul:not(:last-child),
   ol:not(:last-child)
     padding-bottom: .5rem
@@ -112,16 +115,6 @@ article.md
 // div
 article.md>div
   margin: var(--gap-p) 0
-// blockquote
-article.md blockquote
-  margin-left: 0
-  margin-right: 0
-  padding: 1rem
-  background: var(--card)
-  border-left: 6px solid $color-theme
-  border-radius: $border-block
-  color: var(--text-p2)
-  box-shadow: $boxshadow-card
 
 
 article.md img

package/source/css/_layout/partial/bread-nav.styl

@@ -1,6 +1,6 @@
 // 面包屑导航
 .bread-nav
-  padding: 1rem 1rem 0
+  padding: 0.25rem 1rem 0
   color: var(--text-p3)
   font-weight: 500
   div#breadcrumb

package/source/css/_layout/partial/navbar.styl

@@ -1,7 +1,7 @@
 .nav-wrap
   position: sticky
   position: -webkit-sticky
-  margin-top: .75rem
+  margin-top: -0.5rem
   top: -2px
   background: var(--site-bg)
   padding: 0 1rem
@@ -57,3 +57,10 @@ nav.cap
 @media screen and (max-width: $device-mobile-max)
   .nav-wrap
     margin-top: 0
+    padding-left: 0
+    padding-right: 0
+    nav
+      a:first-child
+        margin-left: 1rem
+      a:last-child
+        margin-right: 1rem

package/source/css/_layout/partial/related.styl

@@ -14,14 +14,13 @@
 
   a.more
     padding: 0.25rem 0.5rem
-
     border-radius: $border-block
     color: var(--text-p1)
 
 
 
 .related-posts
-  width: 100%
+  max-width: 100%
   margin: 1rem 0
   .item
     line-height: 1.2

package/source/css/_layout/sidebar/sidebar.styl

@@ -6,6 +6,7 @@
   height: "calc(100vh - 1 * %s)" % var(--gap-l)
   .header
     margin: var(--gap-l) var(--gap-l) 0
+    margin-top: "calc(2 * %s)" % var(--gap-l)
   @media screen and (min-width: $device-mobile-max)
     >.widgets:first-child>.widget-wrap:first-child
       margin-top: "calc(2 * %s)" % var(--gap-l)
@@ -23,7 +24,6 @@
 
 
 .logo-wrap
-  margin: 1rem 0
   display: flex
   align-items: center
   overflow: hidden
@@ -100,12 +100,12 @@
         opacity: 1 !important
 
 
-.logo-wrap.wiki
-  margin: 1rem 0 1.5rem 0
+.l_left .widgets .widget-wrap.logo-wrap.wiki
+  margin-bottom: 1.5rem
   flex-direction: column
   align-items: flex-start
   a.wiki-home
-    margin-bottom: 1rem
+    margin-bottom: 0.5rem
     color: var(--text-p1)
     svg
       margin-right: 2px

package/source/css/_layout/sidebar/toc_wiki.styl

@@ -1,5 +1,5 @@
 .widget-wrap#toc
-  .widget-body+.widget-header
+  .widget-header
     margin-top: 1rem
 
 .widget-wrap.multi#toc .widget-header

package/source/css/_layout/sidebar/widgets.styl

@@ -9,8 +9,10 @@
   z-index: 1
   line-height: 1.2
   .widget-wrap
-    margin: 1rem var(--gap-l) 3rem var(--gap-l)
+    margin: 1rem 0 2rem
     .widget-header
+      padding-left: var(--gap-l)
+      padding-right: var(--gap-l)
       display: flex
       justify-content: space-between
       align-items: center
@@ -40,7 +42,7 @@
             fill: $color-hover
 
     .widget-body
-      margin: 0.5rem 0
+      margin: 0.5rem var(--gap-l)
       color: var(--text-p1)
       p
         margin-top: .5em
@@ -48,7 +50,8 @@
         line-height: 1.5
     .widget-header+.widget-body
       margin-top: 0
-
+  .widget-wrap+.widget-wrap .widget-header
+    margin-top: 3rem
 
 
 .l_left .widgets