From 2b87beef57a79e7ba4441988fd00d3777efc5fe3 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Mon, 22 Feb 2021 13:19:21 +0800
Subject: [PATCH] update

---
 _config.yml                                  |  6 +++---
 layout/_partial/head.ejs                     |  4 +++-
 layout/_partial/main/article/wiki_cover.ejs  |  2 +-
 layout/_partial/sidebar/widgets/toc.ejs      |  2 +-
 layout/archive.ejs                           |  2 +-
 layout/categories.ejs                        |  2 +-
 layout/index.ejs                             |  4 ++--
 layout/page.ejs                              | 18 ++++++++++++-----
 layout/post.ejs                              | 12 +++++++++--
 layout/tags.ejs                              |  2 +-
 layout/wiki.ejs                              | 13 ++++++++++--
 scripts/helpers/scrollreveal.js              |  9 +++++++++
 scripts/tags/image.js                        | 16 +++++++++------
 scripts/tags/inline-labels.js                | 21 ++++++++++++++++++++
 source/css/_layout/base.styl                 | 10 +++++-----
 source/css/_layout/pages/error.styl          |  4 ++++
 source/css/_layout/tag-plugins/checkbox.styl |  3 ++-
 17 files changed, 98 insertions(+), 32 deletions(-)
 create mode 100644 scripts/helpers/scrollreveal.js
 create mode 100644 scripts/tags/inline-labels.js

diff --git a/_config.yml b/_config.yml
index caa8899..6c0203c 100755
--- a/_config.yml
+++ b/_config.yml
@@ -148,7 +148,7 @@ plugins:
   scrollreveal:
     enable: true
     js: https://cdn.jsdelivr.net/npm/scrollreveal@4.0.7/dist/scrollreveal.min.js
-    distance: 16px
-    duration: 800 # ms
-    interval: 80 # ms
+    distance: 8px
+    duration: 500 # ms
+    interval: 50 # ms
     scale: 1 # 0.1~1
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
index d3b5a5e..2ee029f 100755
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@@ -1,6 +1,8 @@
 <%
 function generate_title() {
-  if (page.seo_title || page.title || page.wiki || page.layout) {
+  if (page.layout == 'wiki' && page.wiki && (page.title || page.seo_title)) {
+    return page.wiki + __('symbol.colon') + (page.seo_title || page.title) + ' - ' + config.title;
+  } else if (page.seo_title || page.title || page.wiki || page.layout) {
     return (page.seo_title || page.title || page.wiki || page.layout) + ' - ' + config.title;
   } else if (page.category) {
     return __('btn.category') + __('symbol.colon') + page.category + ' - ' + config.title;
diff --git a/layout/_partial/main/article/wiki_cover.ejs b/layout/_partial/main/article/wiki_cover.ejs
index b1fb595..52ac08d 100644
--- a/layout/_partial/main/article/wiki_cover.ejs
+++ b/layout/_partial/main/article/wiki_cover.ejs
@@ -11,7 +11,7 @@ function layoutWikiCover() {
     cover = ['logo', 'title', 'description'];
   }
   var el = '';
-  el += '<div class="l_cover reveal">';
+  el += '<div class="l_cover' + scrollreveal() + '">';
   el += '<article class="cover-wrap md">';
   if (page.logo && cover.includes('logo')) {
     el += '<div class="logo">';
diff --git a/layout/_partial/sidebar/widgets/toc.ejs b/layout/_partial/sidebar/widgets/toc.ejs
index d7c0dfe..4e20782 100644
--- a/layout/_partial/sidebar/widgets/toc.ejs
+++ b/layout/_partial/sidebar/widgets/toc.ejs
@@ -39,7 +39,7 @@ function layout_toc() {
         <%
         var wikis = [];
         wikis = site.pages.filter(function (p) {
-          if (p.layout == 'wiki' && p.wiki && p.wiki == page.wiki) {
+          if (p.layout == 'wiki' && p.wiki && p.wiki == page.wiki && (p.title || p.seo_title)) {
             if (p.order == undefined) {
               p.order = 0;
             }
diff --git a/layout/archive.ejs b/layout/archive.ejs
index ab2b021..de5202e 100755
--- a/layout/archive.ejs
+++ b/layout/archive.ejs
@@ -19,7 +19,7 @@ if (page.menu_id == undefined) {
   	<% }); %>
     <div class='list-title'><%- __('page.archives', years.length, site.posts.length) %></div>
   	<% years.forEach((year, i) => { %>
-  		<article class='post-card reveal' id='archive'>
+  		<article class='post-card<%- scrollreveal() %>' id='archive'>
   			<div class='card-title'><%= year %></div>
   			<% site.posts.sort('date', -1).filter(function (post) { %>
   				<% post.year = date(post.date, 'YYYY'); %>
diff --git a/layout/categories.ejs b/layout/categories.ejs
index 9874c58..828c080 100755
--- a/layout/categories.ejs
+++ b/layout/categories.ejs
@@ -10,7 +10,7 @@ if (page.menu_id == undefined) {
   <%- partial('_partial/main/navbar/list_post') %>
   <div class='post-list'>
     <div class='list-title'><%- __('page.categories', site.categories.length) %></div>
-    <article class='post-card reveal' id='cats'>
+    <article class='post-card<%- scrollreveal() %>' id='cats'>
       <% site.categories.sort('path').each(function(category){ %>
         <div>
           <a class="<%= category.parent ? 'cat child' : 'cat'%>" href="<%= url_for(category.path) %>">
diff --git a/layout/index.ejs b/layout/index.ejs
index 243d683..0949a09 100755
--- a/layout/index.ejs
+++ b/layout/index.ejs
@@ -15,7 +15,7 @@ if (page.title && page.wiki) {
   <% if (page.posts) { %>
     <div class='post-list post'>
       <% page.posts.each(function(post){ %>
-        <a class='post-card post reveal' href='<%- url_for(post.link || post.path) %>'>
+        <a class='post-card post<%- scrollreveal() %>' href='<%- url_for(post.link || post.path) %>'>
           <article class='excerpt md'>
             <%- partial('_partial/main/post_list/post_card', {post: post}) %>
           </article>
@@ -26,7 +26,7 @@ if (page.title && page.wiki) {
   <% } %>
 <% } else if (page.menu_id == 'wiki') { %>
   <% function outputExcerpt(post) { %>
-    <a class='post-card wiki reveal' href='<%- url_for(post.link || post.path) %>'>
+    <a class='post-card wiki<%- scrollreveal() %>' href='<%- url_for(post.link || post.path) %>'>
       <article class='excerpt md'>
         <%- partial('_partial/main/post_list/wiki_card', {post: post}) %>
       </article>
diff --git a/layout/page.ejs b/layout/page.ejs
index 4f43c38..a8c612f 100755
--- a/layout/page.ejs
+++ b/layout/page.ejs
@@ -1,9 +1,17 @@
-<% if ((page.h1 && page.h1.length > 0) || (page.content && page.content.length > 0)) { %>
+<%
+function layoutTitle() {
+  const title = page.h1 || page.title;
+  if (title && title.length > 0) {
+    return '<h1 class="article-title"><span>' + title + '</span></h1>';
+  } else {
+    return '';
+  }
+}
+%>
+<% if (page.h1 || page.title || (page.content && page.content.length > 0)) { %>
   <%- partial('_partial/main/navbar/breadcrumb') %>
-  <article class='content md <%- page.layout %> reveal'>
-  <% if (page.h1 && page.h1.length > 0) { %>
-    <h1 class='article-title'><span><%- page.h1 %></span></h1>
-  <% } %>
+  <article class='content md <%- page.layout %><%- scrollreveal() %>'>
+  <%- layoutTitle() %>
   <% if (page.content && page.content.length > 0) { %>
     <%- page.content %>
   <% } %>
diff --git a/layout/post.ejs b/layout/post.ejs
index 424d3ef..c68556d 100755
--- a/layout/post.ejs
+++ b/layout/post.ejs
@@ -5,11 +5,19 @@ if (page.menu_id == undefined) {
 if (page.header == undefined) {
   page.header = false;
 }
+function layoutTitle() {
+  const title = page.h1 || page.title;
+  if (title && title.length > 0) {
+    return '<h1 class="article-title"><span>' + title + '</span></h1>';
+  } else {
+    return '';
+  }
+}
 %>
 <% let post = page; %>
 <%- partial('_partial/main/navbar/breadcrumb') %>
-<article class='content md <%- post.layout %> reveal'>
-<h1 class='article-title'><span><%- post.h1 || post.title %></span></h1>
+<article class='content md <%- post.layout %><%- scrollreveal() %>'>
+<%- layoutTitle() %>
 <%- post.content %>
 </article>
 <%- partial('_partial/main/article/references') %>
diff --git a/layout/tags.ejs b/layout/tags.ejs
index 2c781e5..5681689 100755
--- a/layout/tags.ejs
+++ b/layout/tags.ejs
@@ -10,7 +10,7 @@ if (page.menu_id == undefined) {
   <%- partial('_partial/main/navbar/list_post') %>
   <div class='post-list'>
     <div class='list-title'><%- __('page.tags', site.tags.length) %></div>
-    <article class='post-card reveal' id='tags'>
+    <article class='post-card<%- scrollreveal() %>' id='tags'>
       <% site.tags.sort('length', -1).each(function(tag){ %>
         <a class='tag' href="<%= url_for(tag.path) %>">
           <span class='name'><%= tag.name %></span>
diff --git a/layout/wiki.ejs b/layout/wiki.ejs
index cad147c..eece976 100755
--- a/layout/wiki.ejs
+++ b/layout/wiki.ejs
@@ -8,6 +8,14 @@ if (page.layout == undefined) {
 if (page.title == undefined) {
   page.title = 'Wiki';
 }
+function layoutTitle() {
+  const title = page.h1 || page.title;
+  if (title && title.length > 0) {
+    return '<h1 class="article-title"><span>' + title + '</span></h1>';
+  } else {
+    return '';
+  }
+}
 %>
 <% if (page.layout == 'index') { %>
   <%- partial('index') %>
@@ -18,10 +26,11 @@ if (page.title == undefined) {
   }
   %>
   <%- partial('_partial/main/navbar/breadcrumb') %>
-  <article class='content md <%- page.layout %>'>
-  <h1 class='article-title'><span><%- page.h1 || page.title %></span></h1>
+  <article class='content md <%- page.layout %><%- scrollreveal() %>'>
+  <%- layoutTitle() %>
   <%- page.content %>
   </article>
+  <%- partial('_partial/main/article/references') %>
   <%- partial('_partial/main/article/read_next') %>
   <%- partial('_partial/plugins/comments/layout') %>
 <% } %>
diff --git a/scripts/helpers/scrollreveal.js b/scripts/helpers/scrollreveal.js
new file mode 100644
index 0000000..75afc39
--- /dev/null
+++ b/scripts/helpers/scrollreveal.js
@@ -0,0 +1,9 @@
+'use strict';
+
+hexo.extend.helper.register('scrollreveal', function(args){
+  const cfg = hexo.theme.config;
+  if (cfg.plugins.scrollreveal && cfg.plugins.scrollreveal.enable) {
+    return ' reveal';
+  }
+  return '';
+});
diff --git a/scripts/tags/image.js b/scripts/tags/image.js
index 4f21d1b..f0a2bc6 100644
--- a/scripts/tags/image.js
+++ b/scripts/tags/image.js
@@ -1,7 +1,7 @@
 /**
  * image.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
  * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
- * 
+ *
  * {% image src [alt] [width:400px] [bg:#eee] [download:true/false/url] %}
  */
 
@@ -18,9 +18,6 @@ hexo.extend.tag.register('image', function(args) {
   if (args.height) {
     style += 'height:' + args.height + ';';
   }
-  if (args.padding) {
-    style += 'padding:' + args.padding + ';';
-  }
   function img(src, alt, style) {
     let img = '';
     img += '<img class="img" src="' + src + '"';
@@ -39,8 +36,15 @@ hexo.extend.tag.register('image', function(args) {
   el += '<div class="tag-plugin img-wrap">';
   // bg
   el += '<div class="img-bg"';
-  if (args.bg && args.bg.length > 0) {
-    el += ' style="background:' + args.bg + '"';
+  if (args.bg || args.padding) {
+    el += ' style="';
+    if (args.bg && args.bg.length > 0) {
+      el += 'background:' + args.bg + ';';
+    }
+    if (args.padding) {
+      el += 'padding:' + args.padding + ';';
+    }
+    el += '"';
   }
   el += '>';
   el += img(args.src, args.alt, style);
diff --git a/scripts/tags/inline-labels.js b/scripts/tags/inline-labels.js
new file mode 100644
index 0000000..d3fbf9d
--- /dev/null
+++ b/scripts/tags/inline-labels.js
@@ -0,0 +1,21 @@
+'use strict';
+
+
+hexo.extend.tag.register('u', function(args) {
+  return `<u>${args.join(' ')}</u>`;
+});
+hexo.extend.tag.register('emp', function(args) {
+  return `<emp>${args.join(' ')}</emp>`;
+});
+hexo.extend.tag.register('wavy', function(args) {
+  return `<wavy>${args.join(' ')}</wavy>`;
+});
+hexo.extend.tag.register('del', function(args) {
+  return `<del>${args.join(' ')}</del>`;
+});
+hexo.extend.tag.register('kbd', function(args) {
+  return `<kbd>${args.join(' ')}</kbd>`;
+});
+hexo.extend.tag.register('psw', function(args) {
+  return `<psw>${args.join(' ')}</psw>`;
+});
diff --git a/source/css/_layout/base.styl b/source/css/_layout/base.styl
index a586290..caf0b20 100644
--- a/source/css/_layout/base.styl
+++ b/source/css/_layout/base.styl
@@ -117,15 +117,15 @@ table:not([class])
   max-width: 100%
   vertical-align: text-top
   th
-    background: var(--hover-block)
+    background: var(--block)
   td,th
-    padding: 8px 16px
-    border: 2px solid var(--hover-block)
+    padding: 0.5em 1em
+    border: 1px solid var(--hover-block)
     line-height: 1.5
     font-size: 90%
   tr
     word-break: keep-all
-    background: var(--block)
+    white-space:nowrap
     trans()
     &:hover
-      background: var(--hover-block)
+      background: var(--block)
diff --git a/source/css/_layout/pages/error.styl b/source/css/_layout/pages/error.styl
index fd48438..237b8f9 100644
--- a/source/css/_layout/pages/error.styl
+++ b/source/css/_layout/pages/error.styl
@@ -15,6 +15,10 @@ article.md.error-page
   a#back
     margin: 2rem 0
     display: inline-block
+    background: #FDB62F
+    color: black
+    border-radius: 4px
+    border: 2px solid black
 
 @media screen and (max-width: $device-tablet)
   article.md.error-page
diff --git a/source/css/_layout/tag-plugins/checkbox.styl b/source/css/_layout/tag-plugins/checkbox.styl
index ad1ad53..c95ac1f 100644
--- a/source/css/_layout/tag-plugins/checkbox.styl
+++ b/source/css/_layout/tag-plugins/checkbox.styl
@@ -1,8 +1,9 @@
 .md .checkbox
   display: flex
   align-items: center
-  margin: 0
+  margin: 0.25em 0
   font-size: $fs15
+  line-height: 1.2
   input
     -webkit-appearance: none
     -moz-appearance: none