hexo-theme-stellar 1.8.0 → 1.10.0

package/layout/post.ejs

@@ -3,7 +3,7 @@ if (page.menu_id == undefined) {
   page.menu_id = 'post';
 }
 if (page.header == undefined) {
-  page.header = false;
+  page.header = 'auto';
 }
 function layoutTitle() {
   const title = page.h1 || page.title;
@@ -19,6 +19,9 @@ if (theme.plugins.heti && theme.plugins.heti.enable) {
   heti = ' heti';
 }
 %>
+<% if (page.mathjax == true){ %>
+    <%- partial('mathjax') %>
+<% } %>
 <%- partial('_partial/main/navbar/breadcrumb') %>
 <article class='content<%- heti %> md <%- post.layout %><%- post.indent ? ' indent' : '' %><%- scrollreveal() %>'>
 <%- layoutTitle() %>

package/layout/wiki.ejs

@@ -26,7 +26,7 @@ function layoutTitle() {
 <% } else { %>
   <%
   if (page.header == undefined) {
-    page.header = false;
+    page.header = 'auto';
   }
   %>
   <%- partial('_partial/main/navbar/breadcrumb') %>

package/package.json

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

package/scripts/tags/about.js

@@ -10,30 +10,29 @@
 'use strict';
 
 hexo.extend.tag.register('about', function(args, content) {
-  args = hexo.args.map(args, ['avatar', 'height']);
+  args = hexo.args.map(args, ['avatar', 'height', 'border']);
   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">';
   // avatar
-  if (args.avatar) {
+  var avatar_url = args.avatar;
+  if (args.avatar === undefined) {
+     avatar_url = hexo.config.avatar;
+  }
+  if (avatar_url) {
     el += '<div class="avatar">'
-    el += '<img src="' + args.avatar + '"';
+    el += '<img src="' + avatar_url + '"';
+    if (args.border && args.border.length > 0) {
+      el += ' style="border-radius:' + args.border + '"';
+    }
     if (args.height && args.height.length > 0) {
-      el += ' height="' + args.height + '"/>';
-    } else {
-      el += '/>';
+      el += ' height="' + args.height + '"';
     }
+    el += '/>';
     el += '</div>';
   }
-  // title
-  if (rows.length > 0) {
-    // el += '<div class="title">';
-    el += rows.shift();
-    // el += '</div>';
-  }
-
   el += '</div>';
 
   // content

package/scripts/tags/friends.js

@@ -65,9 +65,8 @@ hexo.extend.tag.register('friends', function(args) {
           el += groupHeader(group);
         }
         if (group.repo) {
-          el += '<div class="friendsjs-wrap"';
-          el += ' id="friends-api"';
-          el += ' api="' + (group.api || 'https://issues-api.vercel.app') + '/v1/' + 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>';

package/scripts/tags/ghcard.js

@@ -24,10 +24,10 @@ hexo.extend.tag.register('ghcard', function(args) {
   if (path.includes('/')) {
     // is repo
     const ps = path.split('/');
-    url += 'https://github-readme-stats.vercel.app/api/pin/?username=' + ps[0] + '&repo=' + ps[1];
+    url += 'https://github-readme-stats.xaoxuu.com/api/pin/?username=' + ps[0] + '&repo=' + ps[1];
   } else {
     // is user
-    url += 'https://github-readme-stats.vercel.app/api/?username=' + path;
+    url += 'https://github-readme-stats.xaoxuu.com/api/?username=' + path;
   }
   url += '&' + hexo.args.joinURLParams(args, params);
   if (!url.includes('&show_owner=')) {

package/scripts/tags/index.js

@@ -6,3 +6,6 @@ const postTabs = require('./lib/tabs')(hexo);
 hexo.extend.tag.register('tabs', postTabs, true);
 hexo.extend.tag.register('subtabs', postTabs, true);
 hexo.extend.tag.register('subsubtabs', postTabs, true);
+
+const users = require('./lib/users')(hexo);
+hexo.extend.tag.register('users', users);

package/scripts/tags/lib/users.js

@@ -0,0 +1,22 @@
+/**
+ * users.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
+ *
+ * {% users api:https://api.github.com/repos/xaoxuu/hexo-theme-stellar/contributors %}
+ */
+
+'use strict';
+
+module.exports = ctx => function(args) {
+  args = ctx.args.map(args, ['api']);
+  var el = '<div class="tag-plugin users-wrap">';
+  
+  el += '<div class="stellar-friends-api"';
+  el += ' api="' + args.api + '"';
+  el += '>';
+  el += '<div class="group-body"></div>';
+  el += '</div>';
+
+  el += '</div>';
+  return el;
+};

package/scripts/tags/sites.js

@@ -69,9 +69,8 @@ hexo.extend.tag.register('sites', function(args) {
           el += groupHeader(group);
         }
         if (group.repo) {
-          el += '<div class="sitesjs-wrap"';
-          el += ' id="sites-api"';
-          el += ' api="' + (group.api || 'https://issues-api.vercel.app') + '/v1/' + group.repo + '"';
+          el += '<div class="stellar-sites-api"';
+          el += ' api="' + (group.api || 'https://issues-api.xaoxuu.com') + '/v1/' + group.repo + '"';
           el += '>';
           el += '<div class="group-body"></div>';
           el += '</div>';

package/scripts/tags/timeline.js

@@ -36,36 +36,41 @@ function layoutNodeContent(content) {
 
 
 function postTimeline(args, content) {
+  args = hexo.args.map(args, ['api']);
   var el = '';
+
+  if (args.api && args.api.length > 0) {
+    el += '<div class="tag-plugin timeline stellar-timeline-api" api="' + args.api + '">';
+  } else {
+    el += '<div class="tag-plugin timeline">';
+  }
+
   var arr = content.split(/<!--\s*(.*?)\s*-->/g).filter((item, i) => {
     return item.trim().length > 0;
   });
-  if (arr.length < 1) {
-    return el;
-  }
-  var nodes = [];
-  arr.forEach((item, i) => {
-    if (item.startsWith('node ')) {
-      nodes.push({
-        header: item
-      });
-    } else if (nodes.length > 0) {
-      var node = nodes[nodes.length-1];
-      if (node.body == undefined) {
-        node.body = item;
-      } else {
-        node.body += '\n' + item;
+  if (arr.length > 0) {
+    var nodes = [];
+    arr.forEach((item, i) => {
+      if (item.startsWith('node ')) {
+        nodes.push({
+          header: item
+        });
+      } else if (nodes.length > 0) {
+        var node = nodes[nodes.length-1];
+        if (node.body == undefined) {
+          node.body = item;
+        } else {
+          node.body += '\n' + item;
+        }
       }
-    }
-  });
-
-  el += '<div class="tag-plugin timeline">';
-  nodes.forEach((node, i) => {
-    el += '<div class="timenode" item="' + (i + 1) + '">';
-    el += layoutNodeTitle(node.header.substring(5));
-    el += layoutNodeContent(node.body);
-    el += '</div>';
-  });
+    });
+    nodes.forEach((node, i) => {
+      el += '<div class="timenode" index="' + (i) + '">';
+      el += layoutNodeTitle(node.header.substring(5));
+      el += layoutNodeContent(node.body);
+      el += '</div>';
+    });  
+  }
 
   el += '</div>';
   return el;

package/source/css/_common/base.styl

@@ -12,6 +12,8 @@ a
   &:hover
     color: $color-hover
 
+p:not([class]) 
+  text-align: justify
 
 hr
   color: var(--text-meta)

package/source/css/_common/button.styl

@@ -14,7 +14,7 @@ a.button
   font-size: $fs-15
   &.theme
     background: $color-theme
-    color: var(--site-bg)
+    color: var(--card)
     &:hover
       background: $color-hover
 

package/source/css/_common/cap.styl

@@ -1,6 +1,7 @@
 .cap
   font-weight: 500
   font-size: $fs-12
+  scrollbar-width: none
   color: var(--text-p3)
   &.blue
     color: darken($color-md-blue, 6)

package/source/css/_common/device.styl

@@ -1,10 +1,10 @@
 .mobile-only
   display: none
-  @media screen and (max-width: $device-tablet)
+  @media screen and (max-width: $device-mobile-max)
     display: block !important
 
 .mobile-hidden
-  @media screen and (max-width: $device-tablet)
+  @media screen and (max-width: $device-mobile-max)
     display: none !important
 
 .float-panel

package/source/css/_common/highlight.styl

@@ -3,13 +3,14 @@ code
   -moz-osx-font-smoothing: auto
   color: var(--text-code)
   font-family: $ff-code
-  word-break: break-all
+
+p>code:not([class]),li>code:not([class])
   font-size: 85%
   background: var(--block)
   padding: .2em .4em
   border-radius: 4px
 
-article.md .highlight
+article.md .highlight, pre:not([class]):has(>code)
   margin: var(--gap-p) 0
   border-radius: $border-block
   overflow: hidden
@@ -78,6 +79,17 @@ article.md .highlight
 table:not([class])
   border-collapse: collapse
 
+
+article.md pre
+  >.caption
+    color: var(--text-p3)
+  >.hljs
+    padding: 1rem
+    border-radius: $border-block
+    border: 1px solid var(--block-border)
+    line-height: 1.5
+    box-sizing: border-box
+
 article.md .highlight
   .code
     vertical-align: top
@@ -133,7 +145,7 @@ article.md .highlight
     content: "Python"
   &.php .code:before
     content: "PHP"
-  &.rust .code:before
+  &.rust .code:before,&.rs .code:before
     content: "Rust"
   &.sql .code:before
     content: "SQL"
@@ -143,8 +155,8 @@ article.md .highlight
     content: "Makefile"
   &.go .code:before
     content: "Go"
-  &.typescript .code:before
-    content: "TypeScript"
+  &.typescript .code:before,&.ts .code:before
+    content: "TS"
 
 
 
@@ -157,7 +169,7 @@ $hl-red = #EE2B29
 $hl-orange = #FB3F1B
 $hl-amber = #FD8607
 $hl-text = var(--text-p1)
-pre
+.code>pre
   .code:before
     display: none
   // 行

package/source/css/_common/html.styl

@@ -5,6 +5,8 @@ html
   font-size: $fs-root
   -webkit-text-size-adjust: 100%
   -ms-text-size-adjust: 100%
+  if hexo-config('style.smooth_scroll')
+    scroll-behavior: smooth
 body
   background: var(--site-bg)
   margin: 0

package/source/css/_common/loading.styl

@@ -13,3 +13,8 @@ svg.loading
       transform:rotate(0deg)
     to
       transform:rotate(360deg)
+
+.loading-wrap
+  min-height: 50px
+  margin: 2rem 0
+  text-align: center

package/source/css/_common/pre.styl

@@ -0,0 +1,6 @@
+pre:not([class]):has(>code)
+  display: block
+  padding: 1rem
+  overflow: scroll
+  code 
+    padding: 0

package/source/css/_custom.styl

@@ -38,9 +38,18 @@ $dark-site-bg-mobile = black
 
 $ff-body = system-ui, "Microsoft Yahei", "Segoe UI", -apple-system, Roboto, Ubuntu, "Helvetica Neue", Arial, "WenQuanYi Micro Hei", sans-serif
 $ff-code = Menlo, Monaco, Consolas, system-ui, "Courier New", monospace, sans-serif
-
 $ff-logo = $ff-body
 
+if hexo-config('style.font-family.body')
+  $ff-body = convert(hexo-config('style.font-family.body'))
+
+if hexo-config('style.font-family.code')
+  $ff-code = convert(hexo-config('style.font-family.code'))
+
+if hexo-config('style.font-family.logo')
+  $ff-logo = convert(hexo-config('style.font-family.logo'))
+
+
 // font size
 $fs-root = 16px
 $fs-15 = .9375rem
@@ -76,6 +85,13 @@ $border-image = 6px
   @media screen and (min-width: $device-4k)
     --width-main: 860px
     --gap-l: 64px
+  // iPad 竖屏
+  @media screen and (max-width: $device-tablet)
+    --width-left: 220px
+  // iPad 竖屏
+  @media screen and (max-width: $device-mobile-max)
+    --width-left: 256px
+
 
 
 // shadow

package/source/css/_defines/const.styl

@@ -2,6 +2,7 @@
 $device-mobile-375 = 375px
 $device-mobile-425 = 425px
 $device-mobile = 500px
+$device-mobile-max = 667px
 $device-tablet = 768px
 $device-laptop = 1024px
 $device-desktop = 1440px

package/source/css/_defines/theme.styl

@@ -30,7 +30,7 @@ set_darkmode()
     --card: $dark-card
     --theme-highlight: $color-theme
     --theme-bg: mix($color-theme, $dark-card, 10)
-    @media screen and (max-width: $device-tablet)
+    @media screen and (max-width: $device-mobile-max)
       --site-bg: $dark-site-bg-mobile
       --card: darken($dark-card, 6)
       --block: darken($dark-block, 4)

package/source/css/_layout/layout.styl

@@ -19,8 +19,8 @@
   max-width: var(--width-main)
 
 
-// iPad 竖屏
-@media screen and (max-width: $device-tablet)
+// 手机布局
+@media screen and (max-width: $device-mobile-max)
   .mobile-only
     display: block !important
   .l_body

package/source/css/_layout/main.styl

@@ -1,10 +1,10 @@
 .l_main
   position: relative
   padding-bottom: "calc(1 * %s)" % var(--gap-l)
-  @media screen and (min-width: 1280px)
+  @media screen and (min-width: 1400px)
     margin-left: "calc(2 * %s)" % var(--gap-l)
-    margin-right: "calc(2 * %s + %s)" % (var(--gap-l) var(--width-left))
-  @media screen and (min-width: $device-tablet)
+    margin-right: "calc(2 * %s + %s / 2)" % (var(--gap-l) var(--width-left))
+  @media screen and (min-width: $device-mobile-max)
     padding-top: "calc(2 * %s)" % var(--gap-l)
   header
     margin: 4rem 1rem 2rem

package/source/css/_layout/md.styl

@@ -25,6 +25,8 @@ article.md.content
     >p:not([class])
       text-indent: 'calc(%s * 2)' % $fs-p
       text-align: justify
+      a
+        text-indent: 0
     h1,h2,h3,h4,h5,h6
       text-align: center
     >h2:not([class])
@@ -32,7 +34,7 @@ article.md.content
       border-bottom-style: dashed
       border-bottom-color: $color-highlight
   >:first-child
-    margin-top: 1rem
+    margin-top: 0
   h1:not(:first-child)
     margin-top: 2em
   h2:first-child
@@ -91,21 +93,13 @@ article.md.content
   h1+h2
     margin-top: -0.5rem
   h2+h3
-    margin-top: -1rem
+    margin-top: -0.5rem
   h3+h4
-    margin-top: -1rem
+    margin-top: -0.5rem
   h4+h5
-    margin-top: -1rem
+    margin-top: -0.5rem
   h5+h6
-    margin-top: -1rem
-
-// a
-article.md
-  p, li:not([class])
-    >a:not([class])
-      font-weight: 500
-      &:hover
-        text-decoration: underline
+    margin-top: -0.5rem
 
 article.md p
   font-size: $fs-p
@@ -137,3 +131,35 @@ article.md img
   border-radius: $border-image
   margin: auto
   display: block
+
+article.md 
+  p:not([class]), li:not([class])
+    a:not([class])
+      position: relative
+      padding: 2px
+      text-decoration: none
+      display: inline-block
+      line-height: 1.2
+      &:after
+        content: ''
+        position: absolute
+        border-radius: 2px
+        bottom: 1px
+        left: 2px
+        right: 2px
+        height: 1px
+        opacity: 0.5
+        background: $color-link
+        trans1: all
+      &:hover
+        border-bottom: none
+        color: $color-link
+        // color: darken($color-hover, 10)
+        // background: alpha($color-hover, 0.08)
+        &:after
+          height: 100%
+          opacity: 0.2
+          bottom: 0
+          left: 0
+          right: 0
+          // background-color: alpha($color-hover, 0.08)

package/source/css/_layout/partial/article-footer.styl

@@ -23,8 +23,6 @@
     ul
       margin: 0
       overflow: hidden
-      a:hover
-        text-decoration: underline
     .post-title
       margin: 0.5rem 0
       line-height: 1.2

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

@@ -9,6 +9,7 @@
 .page-footer .sitemap
   margin: .5rem 0 2rem
   display: grid
+  scrollbar-width: none
   grid-gap: 1rem 1rem
   grid-auto-flow: column dense
   overflow: scroll
@@ -33,6 +34,7 @@
 .page-footer .text
   p
     margin: 4px 0
-    line-height: 1.2
-  a
+    line-height: 1.5
+  a:not([class])
     text-decoration: underline
+    font-weight: 500

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

@@ -54,6 +54,6 @@ nav.cap
   a+a
     margin-left: 4px
 
-@media screen and (max-width: $device-tablet)
+@media screen and (max-width: $device-mobile-max)
   .nav-wrap
     margin-top: 0

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

@@ -12,6 +12,10 @@
   &:hover
   .paginator
     text-align: center
+    &.next
+      border-left: 1px dashed var(--block-border)
+    &.prev
+      border-right: 1px dashed var(--block-border)
   .current
     font-family: $ff-code
     color: var(--text-p3)

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

@@ -42,6 +42,7 @@
       width: 40vw
       max-width: 460px
       border: 1px solid var(--block-hover)
+      z-index: 1
       .img
         min-width: 100%
         min-height: 140px
@@ -130,6 +131,8 @@
         text-decoration: underline
         &:hover
           color: $color-hover
+        &:after
+          display: none
   div.cmt-body
     min-height: 150px
     position: relative

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

@@ -0,0 +1,80 @@
+.widget-wrap#github-user
+  .widget-header+.widget-body
+    margin: 0.75rem 0
+.widget-wrap#github-user .widget-body
+  text-align: center
+  background: var(--card)
+  border-radius: $border-card
+  padding: 1rem
+
+.widget-wrap#github-user .widget-body .avatar
+  display: block
+  border-radius: 100%
+  margin: 1rem auto 1.25rem auto
+  max-width: 75%
+  overflow: hidden
+  img 
+    display: block
+  @media screen and (max-width: $device-tablet)
+    max-width: 50%
+
+.widget-wrap#github-user .widget-body .username
+  font-weight: 900
+  font-size: $fs-h2
+  color: var(--text-p0)
+  margin: 0.5rem 0
+
+.widget-wrap#github-user .widget-body .bio
+  font-size: $fs-13
+  margin: 0.5rem 0
+
+.widget-wrap#github-user .widget-body .follow 
+  font-weight: 500
+  border-radius: 64px
+  padding: 0.5rem 1rem
+  background: $color-theme
+  color: var(--card)
+  font-size: 1rem
+  align-self: stretch
+  text-align: center
+  line-height: 1.5
+  display: flex
+  align-items: center
+  justify-content: center
+  trans1: background
+  svg
+    margin-right: 6px
+  &:hover
+    background: $color-hover
+
+  
+
+.widget-wrap#github-user .widget-body .buttons
+  margin: 1rem 0
+  align-self: stretch
+  display: grid
+  grid-gap: 2px
+  grid-template-columns: repeat(auto-fill, "calc((100% - 2 * %s) / 3)" % 2px)
+
+.widget-wrap#github-user .widget-body .btn
+  display: flex 
+  flex-direction: column
+  align-items: center
+  color: inherit
+  border: 1px solid transparent
+  border-radius: 4px
+  padding: 0.25rem 0
+  trans1: background
+  &:hover
+    background: var(--block)
+
+
+.widget-wrap#github-user .widget-body .buttons .btn .title
+  font-size: 1rem
+  font-weight: 700
+
+
+.widget-wrap#github-user .widget-body .buttons .btn .desc
+  font-size: $fs-12
+  color: var(--text-p3)
+  font-weight: 500