hexo-theme-stellar 1.11.0 → 1.13.0

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

@@ -26,7 +26,7 @@ function layoutDiv() {
   el += '<a class="repo" href="https://github.com/' + repo + '" target="_blank" rel="external nofollow noopener noreferrer">';
     el += '<div class="repo-name flex-row">';
       el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor" style="user-select:none;overflow:visible"><path fill-rule="evenodd" d="M2 2.5A2.5 2.5 0 014.5 0h8.75a.75.75 0 01.75.75v12.5a.75.75 0 01-.75.75h-2.5a.75.75 0 110-1.5h1.75v-2h-8a1 1 0 00-.714 1.7.75.75 0 01-1.072 1.05A2.495 2.495 0 012 11.5v-9zm10.5-1V9h-8c-.356 0-.694.074-1 .208V2.5a1 1 0 011-1h8zM5 12.25v3.25a.25.25 0 00.4.2l1.45-1.087a.25.25 0 01.3 0L8.6 15.7a.25.25 0 00.4-.2v-3.25a.25.25 0 00-.25-.25h-3.5a.25.25 0 00-.25.25z"></path></svg>';
-      el += '<span>' + repo + '</span>';
+      el += repo;
     el += '</div>';
     el += '<div class="repo-desc"><span type="text" id="description">&nbsp;</span></div>';
     el += '<div class="grid">';
@@ -38,9 +38,9 @@ function layoutDiv() {
         el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor" style="user-select:none;overflow:visible"><path fill-rule="evenodd" d="M5 3.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm0 2.122a2.25 2.25 0 10-1.5 0v.878A2.25 2.25 0 005.75 8.5h1.5v2.128a2.251 2.251 0 101.5 0V8.5h1.5a2.25 2.25 0 002.25-2.25v-.878a2.25 2.25 0 10-1.5 0v.878a.75.75 0 01-.75.75h-4.5A.75.75 0 015 6.25v-.878zm3.75 7.378a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm3-8.75a.75.75 0 100-1.5.75.75 0 000 1.5z"></path></svg>';
         el += '<span type="text" id="forks_count"></span>';
       el += '</div>';
-      el += '<div class="flex-row stellar-ghinfo-api" api="https://api.github.xaoxuu.com/repos/' + repo + '/releases/latest">';
+      el += '<div class="flex-row stellar-ghinfo-api" index="0" api="https://api.github.xaoxuu.com/repos/' + repo + '/tags">';
         el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor" style="user-select:none;overflow:visible"><path fill-rule="evenodd" d="M2.5 7.775V2.75a.25.25 0 01.25-.25h5.025a.25.25 0 01.177.073l6.25 6.25a.25.25 0 010 .354l-5.025 5.025a.25.25 0 01-.354 0l-6.25-6.25a.25.25 0 01-.073-.177zm-1.5 0V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 010 2.474l-5.026 5.026a1.75 1.75 0 01-2.474 0l-6.25-6.25A1.75 1.75 0 011 7.775zM6 5a1 1 0 100 2 1 1 0 000-2z"></path></svg>';
-        el += '<span type="text" id="tag_name"></span>';
+        el += '<span type="text" id="latest-tag-name">0</span>';
       el += '</div>';
     el += '</div>';
   el += '</a>';

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

@@ -45,6 +45,10 @@ function layoutDiv() {
     el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1rem" height="1rem" fill="currentColor" style="display:inline-block;user-select:none;vertical-align:text-bottom;overflow:visible"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path></svg>';
     el += 'Follow';
     el += '</a>';
+    // menu
+    if (item.menu) {
+      el += partial('../menu', {where: 'sidebar'});
+    }
   el += '</div>';
   el += '</div>';
   return el;

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

@@ -5,7 +5,7 @@ function layoutDiv() {
     return el;
   }
   el += '<div class="widget-wrap" id="markdown">';
-    el += '<div class="widget-header cap dis-select">';
+    el += '<div class="widget-header cap theme dis-select">';
       el += '<span class="name">' + item.title + '</span>';
     el += '</div>';
     el += '<div class="widget-body fs14">';

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

@@ -2,7 +2,7 @@
 function layoutDiv() {
   var el = '<div class="widget-wrap" id="recent">';
   // header
-  el += '<div class="widget-header cap dis-select">';
+  el += '<div class="widget-header cap theme dis-select">';
   el += '<span class="name">' + __("meta.recent_update") + '</span>';
   if (item.rss) {
     el += '<a class="cap-action" id="rss" title="Subscribe" href="' + item.rss + '">';
@@ -25,23 +25,20 @@ function layoutDiv() {
       return p.title && p.title.length > 0;
     });
   }
-  el += '<div class="widget-body fs14">';
+  el += '<div class="widget-body related-posts fs14">';
   arr.sort("updated", -1).limit(item.limit).each(function(post) {
-    el += '<div class="more-item">';
-    el += '<a class="title" href="' + url_for(post.link || post.path) + '">';
+    el += '<a class="item title" href="' + url_for(post.link || post.path) + '">';
+    el += '<span class="title">'
     if (post.layout == 'wiki') {
-      el += '<span>';
       let proj = theme.wiki.projects[post.wiki];
-      if (proj && proj.title) {
-        el += proj.title + __('symbol.colon');
+      if (proj && proj.name) {
+        el += proj.name + ' / ';
       } else if (post.wiki) {
-        el += post.wiki + __('symbol.colon');
+        el += post.wiki + ' / ';
       }
-      el += '</span>';
     }
-    el += post.title || post.seo_title || post.wiki;
+    el += (post.title || post.seo_title || post.wiki) + '</span>';
     el += '</a>';
-    el += '</div>';
     el += '';
   });
   el += '</div>';

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

@@ -16,21 +16,21 @@ function layoutDiv() {
   var el = '';
   if (related.length > 0) {
     el += '<div class="widget-wrap" id="related">';
-    el += '<div class="widget-header cap dis-select">';
+    el += '<div class="widget-header cap theme dis-select">';
     var title = __('btn.wiki');
     if (proj.tags && proj.tags[0]) {
       title = proj.tags[0];
     }
     el += '<span class="name">' + __('meta.more', title) + '</span>';
     el += '</div>';
-    el += '<div class="widget-body fs14">';
+    el += '<div class="widget-body related-posts">';
     related.forEach((p, i) => {
       // 同一个分组中的其它项目
-      el += '<a class="more-item wiki" href="' + url_for(p.homepage.path) + '">';
-      el += p.title;
-      el += '<div class="excerpt">';
-      el += p.description;
-      el += '</div>';
+      el += '<a class="item wiki" href="' + url_for(p.homepage.path) + '">';
+      el += '<span class="title">' + p.title + '</span>';
+      if (p.description && p.description.length > 0) {
+        el += '<span class="excerpt">' + p.description + '</span>';
+      }
       el += '</a>';
     });
     el += '</div>';

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

@@ -0,0 +1,24 @@
+<%
+function layoutDiv() {
+  var el = '';
+  if (site.tags == undefined || site.tags.length == 0) {
+    return el;
+  }
+  var opts = Object.assign({}, item);
+  delete opts['title'];
+  delete opts['layout'];
+  opts.class = 'tag ';
+  el += '<div class="widget-wrap" id="tagcloud">';
+    if (item.title) {
+      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 += tagcloud(site.tags, opts);
+    el += '</div>';
+  el += '</div>';
+  return el;
+}
+%>
+<%- layoutDiv() %>

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

@@ -0,0 +1,27 @@
+<%
+function layoutDiv() {
+  var el = '';
+  if (item.api == undefined) {
+    return el;
+  }
+  el += '<div class="widget-wrap" id="timeline">';
+    if (item.title) {
+      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 += '<div class="tag-plugin timeline stellar-timeline-api"';
+      ['api', 'user', 'hide'].forEach(key => {
+        if (item[key]) {
+          el += ' ' + key + '="' + item[key] + '"';
+        }
+      });
+      el += '>';
+      el += '</div>';
+    el += '</div>';
+  el += '</div>';
+  return el;
+}
+%>
+<%- layoutDiv() %>

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

@@ -15,11 +15,7 @@ function layoutToc() {
 function layoutTocHeader(title) {
   var el = '';
   el += '<div class="widget-header cap dis-select">';
-  if (title) {
-    el += '<span class="name">' + title + '</span>';
-  } else {
-    el += '<span class="name">' + __("meta.toc") + '</span>';
-  }
+  el += '<span class="name">' + (title || page.title || __("meta.toc")) + '</span>';
   el += '</div>';
   return el;
 }

package/layout/index.ejs

@@ -13,7 +13,7 @@ if (page.title && page.wiki) {
 function layout_post_card(layout, post, content) {
   var el = '';
   var layout = layout;
-  if (layout == 'post' && post.cover != undefined && post.cover_info != undefined) {
+  if (layout == 'post' && post['cover'] != undefined && post['cover-title'] != undefined) {
     layout += ' photo';
   }
   el += '<a class="post-card ' + layout + ' ' + scrollreveal() + '" href="' + url_for(post.link || post.path) + '">';

package/layout/page.ejs

@@ -7,14 +7,23 @@ function layoutTitle() {
     return '';
   }
 }
+function layoutDiv() {
+  var el = '';
+  if (page.post_list) {
+    el += partial('_partial/main/navbar/list_post');
+  }
+  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 += layoutTitle();
+  if (page.content && page.content.length > 0) {
+    el += page.content;
+  }
+  el += '</article>';
+  el += partial('_partial/plugins/comments/layout');
+  return el;
+}
 %>
-<% if (page.h1 || page.title || (page.content && page.content.length > 0)) { %>
-  <%- partial('_partial/main/navbar/breadcrumb') %>
-  <article class='content md <%- page.layout %><%- page.indent ? ' indent' : '' %><%- scrollreveal() %>'>
-  <%- layoutTitle() %>
-  <% if (page.content && page.content.length > 0) { %>
-    <%- page.content %>
-  <% } %>
-  </article>
-<% } %>
-<%- partial('_partial/plugins/comments/layout') %>
+
+<%- layoutDiv() %>

package/package.json

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

package/scripts/events/lib/config.js

@@ -25,7 +25,7 @@ module.exports = hexo => {
     warning('caching', '`relative_link` option in Hexo `_config.yml`');
     hexo.config.relative_link = false;
   }
-  hexo.config.meta_generator = false;
+  // hexo.config.meta_generator = false;
 
   // merge data
   const data = hexo.locals.get('data');

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/friends.js

@@ -1,92 +1,53 @@
 /**
- * friends.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * friends.js v2 | https://github.com/xaoxuu/hexo-theme-stellar/
  * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
  *
- * {% friends [only:group1] [not:group2] %}
+ * {% friends [group] [repo:owner/repo] [api:http] %}
  */
 
 'use strict';
 
 hexo.extend.tag.register('friends', function(args) {
-  args = hexo.args.map(args, ['only', 'not', 'repo', 'api']);
-  if (args.only) {
-    args.only = args.only.split(',');
+  args = hexo.args.map(args, ['repo', 'api'], ['group']);
+  var links = hexo.locals.get('data').links;
+  if (links == undefined) {
+    links = {};
   }
-  if (args.not) {
-    args.not = args.not.split(',');
-  }
-  var friends = hexo.locals.get('data').friends;
-  if (friends == undefined) {
-    friends = {};
-  }
-  if (args.repo) {
-    friends = {
-      group: {
-        api: args.api,
-        repo: args.repo
-      }
-    }
+  var api;
+  if (args.api) {
+    api = args.api;
+  } else if (args.repo) {
+    api = 'https://raw.github.xaoxuu.com/' + args.repo + '/output/v2/data.json';
   }
+  
   var el = '<div class="tag-plugin users-wrap">';
-  function groupHeader(group) {
-    var header = '<div class="group-header">';
-    if (group.title) {
-      header += hexo.render.renderSync({text: group.title, engine: 'markdown'}).split('\n').join('');
-    }
-    if (group.description) {
-      header += hexo.render.renderSync({text: group.description, engine: 'markdown'}).split('\n').join('');
-    }
-    header += '</div>';
-    return header;
-  }
-  function cell(friend) {
-    if (friend.url && friend.title) {
-      var cell = '<div class="user-card">';
-      cell += '<a class="card-link" target="_blank" rel="external nofollow noopener noreferrer" href="' + friend.url + '">';
-      cell += '<img src="' + (friend.avatar || hexo.theme.config.default.avatar) + '" onerror="javascript:this.removeAttribute(&quot;data-src&quot;);this.src=&quot;' + hexo.theme.config.default.avatar + '&quot;;"/>';
-      cell += '<div class="name"><span>' + friend.title + '</span></div>';
-      cell += '</a></div>'
-      return cell;
-    } else {
-      return '';
-    }
-  }
-  for (let groupId of Object.keys(friends)) {
-    function f() {
-      if (args.not && args.not.includes(groupId)) {
-        return;
-      }
-      if (groupId in friends) {
-        let group = friends[groupId];
-        if ((typeof group == 'object') && group.constructor == Array) {
-          group = {items: group};
-        }
-        if (group.title || group.description) {
-          el += groupHeader(group);
-        }
-        if (group.repo) {
-          el += '<div class="stellar-friends-api"';
-          el += ' api="' + (group.api || 'https://issues-api.xaoxuu.com') + '/v1/' + group.repo + '"';
-          el += '>';
-          el += '<div class="group-body"></div>';
-          el += '</div>';
-        } else if (group.items) {
-          el += '<div class="group-body">';
-          group.items.forEach((friend, i) => {
-            el += cell(friend);
-          });
-          el += '</div>';
-        }
-      }
-    }
-    if (args.only) {
-      if (args.only.includes(groupId)) {
-        f();
+  if (api) {
+    el += '<div class="stellar-friends-api"';
+    el += ' api="' + api + '"';
+    el += '>';
+    el += '<div class="group-body"></div>';
+    el += '</div>';
+  } else if (args.group) {
+    function cell(item) {
+      if (item.url && item.title) {
+        var cell = '<div class="user-card">';
+        cell += '<a class="card-link" target="_blank" rel="external nofollow noopener noreferrer" href="' + item.url + '">';
+        cell += '<img src="' + (item.avatar || hexo.theme.config.default.avatar) + '" onerror="javascript:this.removeAttribute(&quot;data-src&quot;);this.src=&quot;' + hexo.theme.config.default.avatar + '&quot;;"/>';
+        cell += '<div class="name"><span>' + item.title + '</span></div>';
+        cell += '</a></div>'
+        return cell;
+      } else {
+        return '';
       }
-    } else {
-      f();
     }
+    el += '<div class="group-body">';
+    const items = links[args.group] || [];
+    items.forEach((item, i) => {
+      el += cell(item);
+    });
+    el += '</div>';
   }
+  
   el += '</div>';
   return el;
 });

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>';