hexo-theme-stellar 1.24.0 → 1.25.0

package/scripts/events/lib/topic_tree.js

@@ -0,0 +1,45 @@
+/**
+ * topic.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * 用于专栏/专题文章，一个专栏类似于 wiki 模块中的一个项目文档
+ * 区别是：
+ * 1. 按发布日期排序，无需手动排序
+ * 
+ */
+
+'use strict';
+
+function getTopicTree(ctx) {
+  var tree = {}
+  const data = ctx.locals.get('data')
+  var list = []
+  for (let key of Object.keys(data)) {
+    if (key.startsWith('topic/') && key.length > 5) {
+      let newKey = key.replace('topic/', '')
+      let obj = data[key]
+      obj.id = newKey
+      if (obj.order_by == null) {
+        obj.order_by = '-date'
+      }
+      if (obj.path == null) {
+        obj.path = `/topic/${newKey}/`
+      }
+      obj.pages = []
+      list.push(obj)
+    }
+  }
+  for (let item of list) {
+    tree[item.id] = item
+  }
+  return tree
+}
+
+module.exports = ctx => {
+  var topic = ctx.locals.get('data').topic || {}
+  // 专栏结构树
+  topic.tree = getTopicTree(ctx)
+  // 索引页显示的专栏列表
+  if (topic.publish_list == null) {
+    topic.publish_list = Object.keys(topic.tree)
+  }
+  ctx.theme.config.topic = topic
+}

package/scripts/generators/404.js

@@ -3,8 +3,13 @@
  */
 
 hexo.extend.generator.register('404', function (locals) {
+  const { site_tree } = hexo.theme.config
   return {
-    path: '/404.html',
-    layout: ['404']
+    path: site_tree.error_page['404'],
+    layout: ['404'],
+    data: {
+      layout: '404',
+      menu_id: site_tree.error_page.menu_id
+    }
   }
-});
+})

package/scripts/generators/author.js

@@ -3,7 +3,7 @@
  */
 
 hexo.extend.generator.register('author', function (locals) {
-  const { authors } = hexo.theme.config
+  const { site_tree, authors } = hexo.theme.config
   var pages = []
   for (let key of Object.keys(authors)) {
     const author = authors[key]
@@ -14,7 +14,9 @@ hexo.extend.generator.register('author', function (locals) {
       path: author.path,
       layout: ['archive'],
       data: {
-        'author': author
+        author: author,
+        sidebar: site_tree.author.sidebar,
+        menu_id: site_tree.author.menu_id
       }
     })
   }

package/scripts/generators/categories.js

@@ -6,10 +6,10 @@ hexo.extend.generator.register('categories', function (locals) {
   if (locals.categories && locals.categories.length > 0) {
     return {
       path: hexo.config.category_dir + '/index.html',
-      data: locals.posts,
-      layout: ['categories']
+      layout: ['categories'],
+      data: locals.posts
     }
   } else {
-    return {};
+    return {}
   }
-});
+})

package/scripts/generators/tags.js

@@ -6,10 +6,10 @@ hexo.extend.generator.register('tags', function (locals) {
   if (locals.tags && locals.tags.length > 0) {
     return {
       path: hexo.config.tag_dir + '/index.html',
-      data: locals.posts,
-      layout: ['tags']
+      layout: ['tags'],
+      data: locals.posts
     }
   } else {
-    return {};
+    return {}
   }
-});
+})

package/scripts/generators/topic.js

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

package/scripts/generators/wiki.js

@@ -3,34 +3,35 @@
  */
 
 hexo.extend.generator.register('wiki', function (locals) {
-  var hasWiki = false;
-  locals.pages.forEach((page, i) => {
-    if (page.layout == 'wiki') {
-      hasWiki = true;
+  const { site_tree, wiki } = hexo.theme.config
+  const wikiIdList = Object.keys(wiki.tree)
+  if (wikiIdList.length == 0) {
+    return {}
+  }
+  var ret = []
+  ret.push({
+    path: site_tree.wiki.base_dir + '/index.html',
+    layout: ['index_wiki'],
+    data: {
+      layout: 'index_wiki',
+      menu_id: site_tree.wiki.menu_id,
+      filter: false
     }
-  });
-  if (hasWiki) {
-    var ret = [];
-    ret.push({
-      path: (hexo.config.wiki_dir || 'wiki') + '/index.html',
-      data: {'filter': false},
-      layout: ['wiki']
-    });
-    if (hexo.theme.config.wiki && hexo.theme.config.wiki.all_tags) {
-      for (let id of Object.keys(hexo.theme.config.wiki.all_tags)) {
-        let tag = hexo.theme.config.wiki.all_tags[id];
-        ret.push({
-          path: tag.path,
-          data: {
-            'filter': true,
-            'tagName': tag.name
-          },
-          layout: ['wiki']
-        });
-      }
+  })
+  if (wiki.all_tags) {
+    for (let id of Object.keys(wiki.all_tags)) {
+      let tag = wiki.all_tags[id]
+      ret.push({
+        path: tag.path,
+        layout: ['index_wiki'],
+        data: {
+          layout: 'index_wiki',
+          menu_id: site_tree.wiki.menu_id,
+          filter: true,
+          tagName: tag.name
+        }
+      })
     }
-    return ret;
-  } else {
-    return {};
   }
-});
+  return ret
+})

package/scripts/helpers/parse_config.js

@@ -1,6 +1,6 @@
 /**
- * md_link(theme.sidebar.menu['home']) is '/'
- * md_text(theme.sidebar.menu['home']) is 'Home'
+ * md_link(theme.menu['home']) is '/'
+ * md_text(theme.menu['home']) is 'Home'
  */
 
 'use strict';

package/scripts/tags/lib/audio.js

@@ -9,14 +9,19 @@
 'use strict';
 
 module.exports = ctx => function(args) {
-  args = ctx.args.map(args, ['type'], ['src'])
-  if (args.type == null) {
-    args.type = 'audio/mp3'
+  args = ctx.args.map(args, ['type', 'netease', 'autoplay'], ['src'])
+  if (args.netease) {
+    return `
+    <div class="tag-plugin audio">
+    <iframe src="//music.163.com/outchain/player?type=${args.type || '2'}&id=${args.netease}&auto=${args.autoplay == 'true' ? '1' : '0'}&height=32" frameborder="no" border="0" marginwidth="0" marginheight="0" width=288px height=52>
+    </iframe>
+    </div>
+    `
   }
   return `
-  <div class="tag-plugin video">
+  <div class="tag-plugin audio">
   <audio controls preload>
-  <source src="${args.src}" type="${args.type}">Your browser does not support the audio tag.
+  <source src="${args.src}" type="${args.type || 'audio/mp3'}">Your browser does not support the audio tag.
   </audio>
   </div>
   `

package/scripts/tags/lib/navbar.js

@@ -25,7 +25,7 @@ module.exports = ctx => function(args) {
       let text = matches[1]
       let href = matches[2]
       if (href == args.active) {
-        el += `<a class="link blur active" href="${href}">${text}</a>`
+        el += `<a class="link active" href="${href}">${text}</a>`
       } else {
         el += `<a class="link" href="${href}">${text}</a>`
       }

package/scripts/tags/lib/video.js

@@ -9,14 +9,22 @@
 'use strict';
 
 module.exports = ctx => function(args) {
-  args = ctx.args.map(args, ['type'], ['src'])
-  if (args.type == null) {
-    args.type = 'video/mp4'
+  args = ctx.args.map(args, ['type', 'bilibili', 'ratio', 'width', 'autoplay'], ['src'])
+  if (args.width == null) {
+    args.width = '100%'
+  }
+  if (args.bilibili) {
+    return `
+    <div class="tag-plugin video" style="aspect-ratio:${args.ratio || 16/9};max-width:${args.width};">
+    <iframe src="https://player.bilibili.com/player.html?bvid=${args.bilibili}&autoplay=${args.autoplay || 'false'}" scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true">
+    </iframe>
+    </div>
+    `
   }
   return `
-  <div class="tag-plugin video">
+  <div class="tag-plugin video" style="max-width:${args.width};">
   <video controls preload>
-  <source src="${args.src}" type="${args.type}">Your browser does not support the video tag.
+  <source src="${args.src}" type="${args.type || 'video/mp4'}">Your browser does not support the video tag.
   </video>
   </div>
   `

package/source/css/_common/blur.styl

@@ -9,7 +9,7 @@ if hexo-config('style.darkmode') == 'always'
   :root
     --blur-bg: alpha(black, .5)
 
-.blur
+blur-effect()
   background: var(--blur-bg)
   @supports ((-webkit-backdrop-filter:blur(var(--blur-px))) or (backdrop-filter:blur(var(--blur-px))))
     background: var(--blur-bg) !important
@@ -17,3 +17,6 @@ if hexo-config('style.darkmode') == 'always'
     -webkit-backdrop-filter: saturate(200%) blur(var(--blur-px))
   &:hover
     background: var(--card)
+
+.blur
+  blur-effect()

package/source/css/_common/highlight.styl

@@ -75,6 +75,7 @@ p>code:not([class]),li>code:not([class])
     padding-left: 0.25em
 
 .md-text .gist 
+  --fgColor-default: var(--text-p1)
   .gist-file 
     border: 1px solid var(--block-border)
     border-radius: $border-block

package/source/css/_common/media.styl

@@ -1,9 +1,4 @@
 audio,video
-  border-radius: $border-block
   max-width: 100%
 video
-  z-index: 1
-  box-shadow: $boxshadow-card-float
-.video
-  line-height: 0
-  text-align: center
+  z-index: 1

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

@@ -28,10 +28,10 @@
     background-clip: content-box
     &.next
       border-left: 1px dashed var(--block-border)
-      background-image: url('https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/arrow/064b95430caf4.svg')
+      background-image: url('https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/arrow/064b95430caf4.svg')
     &.prev
       border-right: 1px dashed var(--block-border)
-      background-image: url('https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/arrow/f049bbd4e88ec.svg')
+      background-image: url('https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/arrow/f049bbd4e88ec.svg')
   .current
     font-family: $ff-code
     background: var(--block)

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

@@ -45,6 +45,9 @@ article.md-text.content+.related-wrap
       -webkit-box-orient: vertical
       overflow: hidden
       -webkit-line-clamp: 2
+    &.active
+      .title
+        border-bottom: 1px dashed $color-theme
     &:hover
       .title
         color: $color-hover

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

@@ -118,4 +118,7 @@
   margin: 0 1rem
   @media screen and (max-width: $device-mobile)
     margin: 0
-    border-radius: 0
+    border-radius: 0
+
+.tag-plugin.banner .navbar a.active
+  blur-effect()

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

@@ -27,7 +27,7 @@
       margin-top: 19px
       margin-bottom: 20px
     .frame
-      background-image: url(https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/frame/iphone11.svg);
+      background-image: url(https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/frame/iphone11.svg);
       width: 329px
       height: 658px
   &[focus='top']

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

@@ -0,0 +1,11 @@
+.tag-plugin.video
+  line-height: 0
+  text-align: center
+  video, iframe
+    border-radius: $border-card
+    box-shadow: $boxshadow-card-float
+    z-index 1
+    background: var(--block)
+    width: 100%
+    height: 100%
+    margin: 0

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

@@ -1,5 +1,4 @@
 .widgets .widget-wrapper.search
-  margin-top: 1rem
   margin-bottom: 0
 
 .search-wrapper
@@ -12,36 +11,22 @@
     align-items: center
     transition: 0.38s ease-out
     z-index: 0
-    &:after
-      content: ''
-      position absolute
-      left: 0
-      right: 0
-      bottom: 0
-      height: 2px
-      border-radius: 4px
-      background: convert(hexo-config('style.gradient.search'))
-      background-size: 200%
-      animation: glow 10s linear infinite
-      @keyframes glow {
-        from {
-          background-position: 0%
-        }
-        to {
-          background-position: 200%
-        }
-      }
   .search-input
     width: 100%
     padding: 0.5rem 0
-    line-height: 1
+    line-height: 1.5
     box-sizing: border-box
     font-family: $ff-body
+    font-size: $fs-13
     color: var(--text-p0)
+    
   
-  &.noresult
+  &.noresult[searching='true']
     .search-icon
-      color: $c-red
+      path[p-id="1562"]
+        color: $c-red
+    .search-form
+      border: 1px solid $c-red
 
   .search-no-result
     display: none
@@ -88,22 +73,29 @@
 
 
 
-.search-wrapper.noresult
+.search-wrapper.noresult[searching='true']
   .search-no-result
     display: block
 
 .widget-wrapper
   .search-form
     top: 0
-    background: var(--site-bg)
+    background: var(--card)
+    border: 1px solid var(--block-border)
+    border-radius: $border-bar
   .search-input
-    padding-left: 1.5rem
+    text-indent: 0.75rem
+    padding-right: 2rem
   .search-icon 
-    position: absolute
-    margin-left: 0.25rem
-    left: 0
+    margin: 2px
+    position absolute
+    right: 0
     pointer-events: none
     color: var(--text-p2)
+    padding: 0.5rem
+    border-radius: 'calc(%s - 2px)' % $border-bar
+    path[p-id="1562"]
+      color: $color-theme
     
   #search-result,.search-no-result
     margin-top: 1rem

package/source/js/main.js

@@ -362,7 +362,7 @@ if (stellar.search.service) {
           }
           path = stellar.config.root + path;
           const filter = $inputArea.attr('data-filter') || '';
-          searchFunc(path, filter, 'search-input', 'search-result');
+          searchFunc(path, filter, 'search-wrapper', 'search-input', 'search-result');
         });
         $inputArea.keydown(function(e) {
           if (e.which == 13) {

package/source/js/plugins/fcircle.js

@@ -86,7 +86,7 @@ $(function () {
     var cfg = new Object();
     cfg.el = el;
     cfg.api = api;
-    cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/avatar/round/3442075.svg';
+    cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/avatar/round/3442075.svg';
     FCircle.layoutDiv(cfg);
   }
 });

package/source/js/plugins/friends.js

@@ -78,7 +78,7 @@ $(function () {
     cfg.el = el;
     cfg.api = api;
     cfg.class = el.getAttribute('class');
-    cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/avatar/round/3442075.svg';
+    cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/avatar/round/3442075.svg';
     friendsjs.layout(cfg);
   }
 });

package/source/js/plugins/memos.js

@@ -126,7 +126,7 @@ $(function () {
     cfg.host = api.replace(/https:\/\/(.*?)\/(.*)/i, '$1');
     cfg.avatar = el.getAttribute('avatar');
     if (!cfg.avatar) {
-      cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/avatar/round/3442075.svg';
+      cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/avatar/round/3442075.svg';
     }
     MemosJS.layoutDiv(cfg);
   }

package/source/js/plugins/sites.js

@@ -80,8 +80,8 @@ $(function () {
     cfg.class = el.getAttribute('class');
     cfg.el = el;
     cfg.api = api;
-    cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/link/8f277b4ee0ecd.svg';
-    cfg.screenshot = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/cover/76b86c0226ffd.svg';
+    cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/link/8f277b4ee0ecd.svg';
+    cfg.screenshot = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/cover/76b86c0226ffd.svg';
     sitesjs.layout(cfg);
   }
 });

package/source/js/plugins/weibo.js

@@ -110,7 +110,7 @@ $(function () {
     var cfg = new Object();
     cfg.el = el;
     cfg.api = api;
-    cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/avatar/round/3442075.svg';
+    cfg.avatar = 'https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/avatar/round/3442075.svg';
     weibojs.layoutDiv(cfg);
   }
 });

package/source/js/search/local-search.js

@@ -22,7 +22,7 @@
 // Pieter Robberechts <http://github.com/probberechts>
 
 /*exported searchFunc*/
-var searchFunc = function(path, filter, searchId, contentId) {
+var searchFunc = function(path, filter, wrapperId, searchId, contentId) {
 
   function getAllCombinations(keywords) {
     var i, j, result = [];
@@ -43,6 +43,7 @@ var searchFunc = function(path, filter, searchId, contentId) {
       var $input = document.getElementById(searchId);
       if (!$input) { return; }
       var $resultContent = document.getElementById(contentId);
+      var $wrapper = document.getElementById(wrapperId);
 
       $input.addEventListener("input", function(){
         var resultList = [];
@@ -50,8 +51,10 @@ var searchFunc = function(path, filter, searchId, contentId) {
           .sort(function(a,b) { return b.split(" ").length - a.split(" ").length; });
         $resultContent.innerHTML = "";
         if (this.value.trim().length <= 0) {
+          $wrapper.setAttribute('searching', 'false');
           return;
         }
+        $wrapper.setAttribute('searching', 'true');
         // perform local searching
         datas.forEach(function(data) {
           if (!data.content?.trim().length) { return }