Merge branch 'master' into toc-max-depth

Author: jiangtj

_config.yml

@@ -331,7 +331,7 @@ reward:
   #comment: Donate comment here
   #wechatpay: /images/wechatpay.jpg
   #alipay: /images/alipay.jpg
-  #bitcoin: /images/bitcoin.png
+  #bitcoin: /images/bitcoin.jpg
 
 # Related popular posts
 # Dependencies: https://github.com/tea3/hexo-related-popular-posts
@@ -350,8 +350,8 @@ related_posts:
 # Dependencies: https://github.com/hexojs/hexo-deployer-git
 post_edit:
   enable: false
-  url: https://github.com/user-name/repo-name/tree/branch-name/subdirectory-name/ # Link for view source.
-  #url: https://github.com/user-name/repo-name/edit/branch-name/subdirectory-name/ # Link for fork & edit.
+  url: https://github.com/user-name/repo-name/tree/branch-name/subdirectory-name # Link for view source.
+  #url: https://github.com/user-name/repo-name/edit/branch-name/subdirectory-name # Link for fork & edit.
 
 
 # ---------------------------------------------------------------
@@ -708,10 +708,10 @@ busuanzi_count:
 
 
 # Tencent analytics ID
-# tencent_analytics:
+#tencent_analytics:
 
 # Tencent MTA ID
-# tencent_mta:
+#tencent_mta:
 
 
 # Enable baidu push so that the blog will push the url to baidu automatically which is very helpful for SEO
@@ -851,19 +851,9 @@ lazyload: false
 # Dependencies: https://github.com/theme-next/theme-next-pace
 pace: false
 # Themes list:
-#pace-theme-big-counter
-#pace-theme-bounce
-#pace-theme-barber-shop
-#pace-theme-center-atom
-#pace-theme-center-circle
-#pace-theme-center-radar
-#pace-theme-center-simple
-#pace-theme-corner-indicator
-#pace-theme-fill-left
-#pace-theme-flash
-#pace-theme-loading-bar
-#pace-theme-mac-osx
-#pace-theme-minimal
+# pace-theme-big-counter | pace-theme-bounce | pace-theme-barber-shop | pace-theme-center-atom
+# pace-theme-center-circle | pace-theme-center-radar | pace-theme-center-simple | pace-theme-corner-indicator
+# pace-theme-fill-left | pace-theme-flash | pace-theme-loading-bar | pace-theme-mac-osx | pace-theme-minimal
 # For example
 # pace_theme: pace-theme-center-simple
 pace_theme: pace-theme-minimal
@@ -1049,14 +1039,14 @@ vendors:
 
   # Internal version: 1.4.0
   # See: https://github.com/gitalk/gitalk
-  # Examples:
+  # Example:
   # gitalk_js: https://cdn.jsdelivr.net/npm/gitalk@1.4.0/dist/gitalk.min.js
   # gitalk_css: https://cdn.jsdelivr.net/npm/gitalk@1.4.0/dist/gitalk.css
   gitalk_js:
   gitalk_css:
 
   # Internal version: 0.7.3
-  # See: https://github.com/emn178/js-md5/
+  # See: https://github.com/emn178/js-md5
   # Example:
   # md5: https://cdn.jsdelivr.net/npm/js-md5@0.7.3/src/md5.min.js
   md5:

layout/_macro/post.swig

@@ -56,7 +56,7 @@
                   </span>
                 {% endif %}
                 {# Need to delete maybe? #}
-                {{ next_url(post.path, post.title | default(__('post.untitled')), {class: 'post-title-link', itemprop: url }) }}
+                {{ next_url(post.path, post.title | default(__('post.untitled')), {class: 'post-title-link', itemprop: 'url' }) }}
               {% else -%}
                 {{- post.title -}}
                 {% include '../_partials/post-edit.swig' %}

source/css/_common/components/pages/archive.styl

@@ -27,7 +27,7 @@
     }
   }
 
-  .fa {
+  .fa-external-link {
     font-size: 15px;
     margin-left: 5px;
   }

source/css/_common/components/post/post-reward.styl

@@ -21,7 +21,6 @@
     font-variant: normal;
     font-stretch: normal;
     font-size: 18px;
-    font-family: "Microsoft Yahei";
     background: #F44336;
 }
 #rewardButton span:hover{

source/css/_common/scaffolding/base.styl

@@ -30,11 +30,17 @@ h1, h2, h3, h4, h5, h6 { margin: 20px 0 15px; }
 for headline in (1..6) {
   h{headline} {
     font-size: $font-size-headings-base - $font-size-headings-step * headline;
+    code {
+      font-size: $font-size-headings-base - $font-size-headings-step * headline;
+    }
   }
 
   +mobile() {
     h{headline} {
       font-size: $font-size-headings-base - $font-size-headings-step * headline - 4px;
+      code {
+        font-size: $font-size-headings-base - $font-size-headings-step * headline - 4px;
+      }
     }
   }
 }

source/css/_schemes/Gemini/index.styl

@@ -143,13 +143,22 @@ use_seo = hexo-config('seo');
   h1 {
     font-size: 1.6em;
     border-bottom: 1px solid $body-bg-color;
+    code {
+      font-size: 1em;
+    }
   }
   h2 {
     font-size: 1.45em;
     border-bottom: 1px solid $body-bg-color;
+    code {
+      font-size: 1em;
+    }
   }
   h3 {
     font-size: 1.3em;
+    code {
+      font-size: 1em;
+    }
     if use_seo {
       border-bottom: 1px solid $body-bg-color;
     } else {
@@ -158,15 +167,24 @@ use_seo = hexo-config('seo');
   }
   h4 {
     font-size: 1.2em;
+    code {
+      font-size: 1em;
+    }
     if use_seo {
       border-bottom: 1px dotted $body-bg-color;
     }
   }
   h5 {
     font-size: 1.07em;
+    code {
+      font-size: 1em;
+    }
   }
   h6 {
     font-size: 1.03em;
+    code {
+      font-size: 1em;
+    }
   }
 }