hexo-theme-stellar 1.11.0 → 1.12.0

package/scripts/events/lib/doc_tree.js

@@ -77,6 +77,9 @@ module.exports = hexo => {
     if (proj.title == undefined || proj.title.length === 0) {
       proj.title = id;
     }
+    if (proj.name == undefined || proj.name.length == 0) {
+      proj.name = id;
+    }
   }
   // 补充 order
   wiki_pages.forEach((p, i) => {

package/scripts/helpers/related_posts.js

@@ -25,58 +25,30 @@ hexo.extend.helper.register('popular_posts_wrapper', function(args){
 
   const posts = this.site.posts;
   const root = this.config.root;
-  function generateHTML(list){
 
+  function listItem(obj){
     var el = '';
-    el += '<a class="item" href="' + list.path + '" title="' + list.title + '">';
+    el += '<a class="item" href="' + obj.path + '" title="' + obj.title + '">';
     var p = posts.filter(function(p) {
-      return root + p.path == list.path;
+      return root + p.path == obj.path;
     });
     if (p && p.length > 0) {
       p = p.data[0];
     }
-    if (p) {
-      if (p.cover) {
-        if (p.cover.includes('/')) {
-          list.img = p.cover;
-        } else {
-          list.img = 'https://source.unsplash.com/1280x640/?' + p.cover;
-        }
-      } else if (cfg.auto_cover && p.tags && p.tags.length > 0) {
-        var params = '';
-        p.tags.reverse().forEach((tag, i) => {
-          if (i > 0) {
-            params += ',';
-          }
-          params += tag.name;
-        });
-        list.img = 'https://source.unsplash.com/1280x640/?' + params;
-      }
-    }
-    if (hexo.theme.config.default.cover) {
-      el += '<div class="img">'
-      if (list.img && list.img != "") {
-        el += '<img src="' + list.img + '" />';
-      } else {
-        el += '<img src="' + hexo.theme.config.default.cover + '" />';
-      }
-      el += '</div>';
+    el += '<span class="title">' + obj.title + '</span>';
+    if (obj.excerpt && obj.excerpt.length > 0) {
+      el += '<span class="excerpt">' + util.truncate(util.stripHTML(obj.excerpt), {length: 120}) + '</span>';
     }
-
-    el += '<span class="title">' + list.title + '</span>';
-
-    if (list.excerpt && list.excerpt.length > 0) {
-      el += '<span class="excerpt">' + util.truncate(util.stripHTML(list.excerpt), {length: 120}) + '</span>';
-    }
-
     el +=  '</a>';
     return el;
   }
 
-  for(var i = 0; i < json.length; i++) {
-    returnHTML += generateHTML(json[i]);
+  if (json.length > 0) {
+      for(var i = 0; i < json.length; i++) {
+        returnHTML += listItem(json[i]);
+      }
   }
-
+  
   if (returnHTML != "") returnHTML = "<div class=\"" + cls + "\">" + returnHTML + "</div>";
   div += returnHTML;
   div += '</section>';

package/scripts/tags/about.js

@@ -8,21 +8,24 @@
  */
 
 'use strict';
+const url_for = require('hexo-util').url_for.bind(hexo);
 
 hexo.extend.tag.register('about', function(args, content) {
-  args = hexo.args.map(args, ['avatar', 'height', 'border']);
+  args = hexo.args.map(args, ['avatar', 'height', 'border', 'back']);
   var rows = hexo.render.renderSync({text: content, engine: 'markdown'}).split('\n');
   var el = '';
   // wrapper
   el += '<div class="tag-plugin about">';
-  el += '<div class="about-header">';
+  if (args.back) {
+    el += '<a class="nav-back cap" href="' + url_for(hexo.config.root) + '">';
+    el += '<svg aria-hidden="true" viewBox="0 0 16 16" 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 += '</a>';
+  }
   // avatar
   var avatar_url = args.avatar;
-  if (args.avatar === undefined) {
-     avatar_url = hexo.config.avatar;
-  }
   if (avatar_url) {
-    el += '<div class="avatar">'
+    el += '<div class="about-header">';
+    el += '<div class="avatar">';
     el += '<img src="' + avatar_url + '"';
     if (args.border && args.border.length > 0) {
       el += ' style="border-radius:' + args.border + '"';
@@ -32,8 +35,8 @@ hexo.extend.tag.register('about', function(args, content) {
     }
     el += '/>';
     el += '</div>';
+    el += '</div>';
   }
-  el += '</div>';
 
   // content
   el += '<div class="about-body fs14">';

package/scripts/tags/{grid.js → border.js}

@@ -1,15 +1,15 @@
 /**
- * grid.js v1.0 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * border.js v1.0 | https://github.com/xaoxuu/hexo-theme-stellar/
  * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
  *
- * {% grid [color:color] [child:codeblock/tabs] title %}
+ * {% border [color:color] [child:codeblock/tabs] title %}
  * body
- * {% endgrid %}
+ * {% endborder %}
  */
 
 'use strict';
 
-hexo.extend.tag.register('grid', function(args, content) {
+hexo.extend.tag.register('border', function(args, content) {
   args = hexo.args.map(args, ['color', 'child'], ['title']);
   const color = args.color;
   const title = args.title;

package/scripts/tags/link.js

@@ -2,7 +2,7 @@
  * link.js v1.1 | https://github.com/xaoxuu/hexo-theme-stellar/
  * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
  *
- * {% link url title [description] [icon:src] %}
+ * {% link url [title] [desc:true/false] [icon:src] %}
  */
 
 'use strict';
@@ -11,11 +11,11 @@ var util = require('hexo-util');
 const full_url_for = require('hexo-util').full_url_for.bind(hexo);
 
 hexo.extend.tag.register('link', function(args) {
-  args = hexo.args.map(args, ['icon'], ['url', 'title', 'description']);
+  args = hexo.args.map(args, ['icon', 'desc'], ['url', 'title']);
 
   var el = '';
   el += '<div class="tag-plugin link dis-select">';
-  el += '<a class="link-card' + (args.description ? ' rich' : ' plain') + '" title="' + args.title + '" href="' + args.url + '"';
+  el += '<a class="link-card' + (args.desc ? ' rich' : ' plain') + '" title="' + args.title + '" href="' + args.url + '"';
   if (args.url.includes('://')) {
     el += ' target="_blank" rel="external nofollow noopener noreferrer"';
   }
@@ -31,17 +31,19 @@ hexo.extend.tag.register('link', function(args) {
     return el;
   }
   function loadTitle() {
-    return '<span class="title">' + args.title + '</span>';
+    return '<span class="title">' + (args.title || args.url) + '</span>';
   }
   function loadDesc() {
-    return '<span class="desc fs12">' + (args.description || full_url_for(args.url)) + '</span>';
+    return '<span class="cap desc fs12"></span>';
+  }
+  function loadLink() {
+    return '<span class="cap link fs12">' + full_url_for(args.url) + '</span>';
   }
 
-  if (args.description) {
+  if (args.desc) {
     // top
     el += '<div class="top">';
-    el += loadIcon();
-    el += '<span class="desc fs12">' + full_url_for(args.url) + '</span>';
+    el += loadIcon() + loadLink();
     el += '</div>';
     // bottom
     el += '<div class="bottom">';
@@ -50,7 +52,7 @@ hexo.extend.tag.register('link', function(args) {
   } else {
     // left
     el += '<div class="left">';
-    el += loadTitle() + loadDesc();
+    el += loadTitle() + loadLink();
     el += '</div>';
     // right
     el += '<div class="right">';

package/scripts/tags/navbar.js

@@ -49,7 +49,7 @@ hexo.extend.tag.register('navbar', function(args) {
     el += '</a>';
     return el;
   }
-  args.links.forEach((item, i) => {
+  (args.links || []).forEach((item, i) => {
     el += layoutItem(item, i);
   });
   el += '</nav></div>';

package/scripts/tags/sites.js

@@ -43,7 +43,7 @@ hexo.extend.tag.register('sites', function(args) {
     if (site.url && site.title) {
       var cell = '<div class="site-card">';
       cell += '<a class="card-link" target="_blank" rel="external nofollow noopener noreferrer" href="' + site.url + '">';
-      cell += '<img src="' + (site.screenshot || ('https://image.thum.io/get/width/1024/crop/768/' + site.url)) + '" onerror="javascript:this.removeAttribute(&quot;data-src&quot;);this.src=&quot;' + hexo.theme.config.default.cover + '&quot;;"/>';
+      cell += '<img src="' + (site.screenshot || ('https://screenshot-api.xaoxuu.com/api?url=' + site.url + '&width=1280&height=720')) + '" onerror="javascript:this.removeAttribute(&quot;data-src&quot;);this.src=&quot;' + hexo.theme.config.default.cover + '&quot;;"/>';
       cell += '<div class="info">';
       cell += '<img src="' + (site.avatar || hexo.theme.config.default.link) + '" onerror="javascript:this.removeAttribute(&quot;data-src&quot;);this.src=&quot;' + hexo.theme.config.default.link + '&quot;;"/>';
       cell += '<span class="title">' + site.title + '</span>';

package/scripts/tags/split.js

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

package/source/css/_common/base.styl

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

package/source/css/_common/blur.styl

@@ -5,6 +5,9 @@ if hexo-config('style.darkmode') == 'auto'
   @media (prefers-color-scheme: dark)
     :root
       --blur-bg: alpha(black, .5)
+if hexo-config('style.darkmode') == 'always'
+  :root
+    --blur-bg: alpha(black, .5)
 
 .blur
   background: var(--blur-bg)

package/source/css/_common/device.styl

@@ -24,6 +24,8 @@
   if hexo-config('style.darkmode') == 'auto'
     @media (prefers-color-scheme: dark)
       --blur-bg: alpha(#555, .6)
+  if hexo-config('style.darkmode') == 'always'
+    --blur-bg: alpha(#555, .6)
 
 .sidebar-toggle.mobile
   cursor: pointer

package/source/css/_common/highlight.styl

@@ -20,7 +20,7 @@ article.md .highlight, pre:not([class]):has(>code)
   font-family: $ff-code
   box-sizing: border-box
   @media screen and (min-width: $device-mobile)
-    min-width: 280px
+    min-width: 180px
 
 article.md .highlight
   position: relative

package/source/css/_common/loading.styl

@@ -15,6 +15,19 @@ svg.loading
       transform:rotate(360deg)
 
 .loading-wrap
-  min-height: 50px
-  margin: 2rem 0
-  text-align: center
+  margin: 0
+  text-align: center
+  background: var(--block)
+  border-radius: $border-card
+  position relative
+  padding: 2rem
+  svg  
+    margin: 4px
+  &:after 
+    content: hexo-config('style.loading.loading')
+    color: var(--text-p1)
+    display: block
+    font-size: 14px
+  &.error
+    &:after
+      content: hexo-config('style.loading.error')

package/source/css/_common/title.styl

@@ -25,19 +25,6 @@ h6
 .fs12
   font-size: $fs-12
 
-.post-list
-  .post-title
-    font-weight: 500
-    margin: .75rem 0 .5rem
-    line-height: 1.2
-    font-size: $fs-h3
-    border-bottom: none
-    color: var(--text-p0)
-    trans1 color
-  .wiki .post-title
-    margin-top: 0.5rem
-    font-weight: 700
-
 .widgets
   .post-title
     margin: 0.75rem 0

package/source/css/_custom.styl

@@ -69,14 +69,14 @@ $border-image = 6px
 
 // 可以动态变化的属性
 :root
-  --width-left: 256px
+  --width-left: 288px
   --width-main: 720px
   --gap-l: 16px
   --gap-p: .75rem // gap for paragraph
   // desktop 2k or larger
   @media screen and (min-width: $device-2k)
     --gap-l: 32px
-    --width-left: 320px
+    --width-left: 352px
     --width-main: 780px
   // desktop 4k or larger
   @media screen and (min-width: $device-4k)
@@ -84,10 +84,10 @@ $border-image = 6px
     --gap-l: 64px
   // iPad 竖屏
   @media screen and (max-width: $device-tablet)
-    --width-left: 220px
+    --width-left: 252px
   // iPad 竖屏
   @media screen and (max-width: $device-mobile-max)
-    --width-left: 256px
+    --width-left: 288px
 
 
 

package/source/css/_layout/list.styl

@@ -1,6 +1,25 @@
 // list
 .post-list
   margin: 1rem
+  .post-title
+    margin-top: 1.5rem
+  .post-title:first-child
+    margin-top: .5rem
+
+.post-list
+  .post-title
+    font-weight: 500
+    margin: .75rem 0
+    line-height: 1.2
+    font-size: $fs-h3
+    border-bottom: none
+    color: var(--text-p0)
+    trans1 color
+    @media screen and (max-width: $device-mobile)
+      font-size: $fs-h4
+      margin: 0.5rem 0
+  .wiki .post-title
+    margin-top: 0.5rem
 
 // card
 .post-list .post-card
@@ -14,14 +33,18 @@
   position: relative
   .excerpt
     margin: 1rem 0
+    @media screen and (max-width: $device-mobile)
+      margin: 0.5rem 0
     >p
       margin: 1rem 0
+      @media screen and (max-width: $device-mobile)
+        margin: 0.5rem 0
       line-height: 1.5
   .meta.cap
     display: flex
     flex-wrap: wrap
     align-items: center
-    margin: .5rem 0
+    margin: 0.25rem 0
     line-height: 1.5
     span+span
       margin-left: 0.5rem
@@ -37,10 +60,11 @@
 // common article
 .post-list article.md
   padding: 1rem
+  @media screen and (max-width: $device-mobile)
+    padding: 0.5rem 1rem
   p
     color: var(--text-p2)
-    @media screen and (min-width: $device-mobile)
-      font-size: $fs-14
+    font-size: $fs-14
 
 
 // posts
@@ -51,6 +75,7 @@
   margin-left: -1rem
   margin-top: -1rem
   margin-right: -1rem
+  background: var(--block)
   &:not(.lazy)
     trans1: transform 1s
   img
@@ -76,7 +101,7 @@
     img
       width: 100%
     .cover-info
-      padding: 1rem
+      padding: 1.5rem 1rem
       position: absolute
       line-height: 1.2
       width: 'calc(100% - %s * 2)' % 1rem
@@ -84,20 +109,26 @@
       color: white
       &[position=top]
         top: 0
-        background-image: linear-gradient(rgba(0,0,0,0.4),rgba(0,0,0,0.3),rgba(0,0,0,0))
+        background-image: linear-gradient(rgba(0,0,0,0.3),rgba(0,0,0,0.2),rgba(0,0,0,0))
       &[position=bottom]
         bottom: 0
-        background-image: linear-gradient(rgba(0,0,0,0),rgba(0,0,0,0.3),rgba(0,0,0,0.4))
+        background-image: linear-gradient(rgba(0,0,0,0),rgba(0,0,0,0.2),rgba(0,0,0,0.3))
       div+div
-        margin-top: 8px
-        @media screen and (max-width: $device-mobile)
-          margin-top: 4px
+        margin-top: 4px
       .cap
         color: white
         font-size: $fs-13
       .title
         font-weight: 500
         font-size: $fs-h3
+      @media screen and (max-width: $device-mobile)
+        padding: 1rem
+        div+div
+          margin-top: 2px
+        .title
+          font-size: $fs-h4
+        .cap
+          font-size: $fs-12
   h2
     margin: .25rem 0
     font-size: $fs-h4

package/source/css/_layout/md.styl

@@ -24,7 +24,7 @@ article.md.content
   &.indent
     >p:not([class])
       text-indent: 'calc(%s * 2)' % $fs-p
-      text-align: justify
+      text-align: convert(hexo-config('style.text-align'))
       a
         text-indent: 0
     h1,h2,h3,h4,h5,h6