Merge branch 'dev' into master

🐛 適配hexo 5.0.0 修復toc點擊不會跳轉的bugs
🍻 文件整理
🍻 UI微調

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,21 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 <!--
 IMPORTANT: Please follow the template to create a new issue.
 重要：請依照該模板來提交。
 
 If you upgrade from the old version, and an error occurs when running, please copy the new content in the config to the butterfly.yml
-如果你是由舊版本升級到新版，運行時出現報錯，請首先把config裏新的內容複製到舊的butterfly設置去
+如果你是由舊版本升級到新版，執行時出現報錯，請首先把config裡新的內容複製到舊的butterfly設定去（如有）
 
 If you are a problem when visit the website, please open your browser 'developer tools (shortcut F12)' and check the console if there is an error, include your website address in the feedback
 如果你是線上訪問出現問題，請檢查瀏覽器‘開發人員工具（快捷鍵F12）’的console是否有報錯，反饋時附上你的網站
 -->
 
 
-## I want to create a new issue <!-- 我想要建立一個新的issue --> 
+## I want to create a Bug report <!-- 我想要建立一個 Bug report --> 
 
 <!-- Check all with "x" especially FAQ & Documentation!! (使用 "x" 選擇) -->
-<!-- 請確認是否都已經翻閱過如下的資料, 尤其是安裝文檔！！ -->
+<!-- 請確認是否都已經翻閲過如下的資料, 尤其是安裝文件！！ -->
 - [] Yes, I have read [Hexo Docs page](https://hexo.io/docs/), especially [Templates](https://hexo.io/docs/templates.html), [Variables](https://hexo.io/docs/variables.html), [Helpers](https://hexo.io/docs/helpers.html) and [Troubleshooting](https://hexo.io/docs/troubleshooting.html).
-- [] Yes, I have read [Hexo-theme-butterfly Documentation](https://jerryc.me/posts/21cfbf15/).
+- [] Yes, I have read [Butterfly Documentation](https://demo.jerryc.me/posts/21cfbf15/).
 - [] And yes, I already searched for current [issues](https://github.com/jerryc127/hexo-theme-butterfly/issues?utf8=%E2%9C%93&q=is%3Aissue) and this did not help me.
 
 ## Butterfly Information
@@ -34,19 +43,17 @@ If you are a problem when visit the website, please open your browser 'developer
 
 ## Actual behavior <!-- (實際行為) -->
 
-<!-- Please give me the screenshots to locate the issue -->
-<!-- 請儘量提供截圖來定位問題 -->
-
 ## Steps to reproduce the behavior <!-- (重現步驟) -->
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
 
-## Feature Request
+<!-- If applicable, add screenshots to help explain your problem -->
+<!-- 請儘量提供截圖來定位問題 -->
+## Screenshots <!-- (截圖) -->
 
-<!-- If you have any ideas of theme-butterfly, please write down here and we can have a discussion. -->
-<!-- 如果你有任何關於Butterfly的功能方面的想法，可以在這個部分裡寫下來我們一起討論 -->
+<!-- Provide your website to find the issues -->
+## Website
 
----
-
-<!--
-Love hexo-theme-butterfly? Please consider starring the repo to support it!
-喜歡 hexo-theme-butterfly嗎？ 考慮一下給它點個star來支援它吧！
--->
+## Describe the bug

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

LICENSE

@@ -1,8 +1,202 @@
-MIT License
-Copyright (c) <year> <copyright holders>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,50 +1,54 @@
 # hexo-theme-butterfly
 
-<a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.3.5-blue"/></a>
-<a href="https://jerryc.me"><img alt="Author" src="https://img.shields.io/badge/author-JerryC-blur"/></a>
-<a href="https://hexo.io"><img alt="Hexo" src="https://img.shields.io/badge/hexo-4.0+-0e83c"/></a>
-<a href="https://nodejs.org/"><img alt="node.js" src="https://img.shields.io/badge/node.js-8.0+-blur"/></a>
+![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly)
+![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
+![hexo version](https://img.shields.io/badge/hexo-4.0+-0e83c)
+![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
+![nodejs version](https://img.shields.io/badge/node.js-8.0+-yellow)
+![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-Demo:  👍 [Butterfly](https://demo.jerryc.me/)  ||   🤞 [JerryC](https://jerryc.me/)
+Demo: 👍 [Butterfly](https://demo.jerryc.me/)  ||   🤞 [JerryC](https://jerryc.me/)
+
+Docs: 📖 [Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/)
 
 Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
 
 ## Installation
 
+### GIT
+
 Stable branch [recommend]:
 
 ```
-git clone -b master https://github.com/jerryc127/hexo-theme-butterfly.git themes/Butterfly
+git clone -b master https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
 
 Dev branch:
 
 ```
-git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/Butterfly
+git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
+```
+
+### NPM
+
+> It supports Hexo 5.0.0 or later
+
+In Hexo site root directory 
+
+```powershell
+npm i hexo-theme-butterfly
 ```
 
 ## Configuration
 
  Set theme in the hexo work folder's root config file `_config.yml`: 
 
-> theme: Butterfly
+> theme: butterfly
 
  If you don't have pug & stylus renderer, try this: 
 
 > npm install hexo-renderer-pug hexo-renderer-stylus
 
-## Documentation
-
-Find in [hexo-theme-butterfly docs](https://docs.jerryc.me) and [JerryC](https://jerryc.me/posts/21cfbf15). it supports `zh-TW` and `zh-CN`
-
-You can also join the Chat Group.
-
-[  💬 Join QQ Group [recommend]](https://jq.qq.com/?_wv=1027&k=5KI3Jqb)
-
-[  💬 Join Telegram Group](https://t.me/hexo_butterfly)
-
-
-
 ## Screenshots
 
 ![image](https://user-images.githubusercontent.com/16351105/58887365-1272f780-8718-11e9-9329-3292c6ba20d4.png)

README_CN.md

@@ -1,46 +1,53 @@
 # hexo-theme-butterfly
 
-<a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.3.5-blue"/></a>
-<a href="https://jerryc.me"><img alt="Author" src="https://img.shields.io/badge/author-JerryC-blur"/></a>
-<a href="https://hexo.io"><img alt="Hexo" src="https://img.shields.io/badge/hexo-4.0+-0e83c"/></a>
-<a href="https://nodejs.org/"><img alt="node.js" src="https://img.shields.io/badge/node.js-8.0+-blur"/></a>
+![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly)
+![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
+![hexo version](https://img.shields.io/badge/hexo-4.0+-0e83c)
+![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
+![nodejs version](https://img.shields.io/badge/node.js-8.0+-yellow)
+![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-Demo:  👍 [Butterfly](https://demo.jerryc.me/)  ||   🤞 [JerryC](https://jerryc.me/)
+
+預覽: 👍 [Butterfly](https://demo.jerryc.me/)  ||  🤞 [JerryC](https://jerryc.me/)
+
+文檔: 📖 [Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/)
 
 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
 
 ## 安裝
 
-在你的博客根目錄裡安裝穩定版【推薦】
+### Git 安裝
 
-```
-git clone -b master https://github.com/jerryc127/hexo-theme-butterfly.git themes/Butterfly
+在博客根目錄裡安裝穩定版【推薦】
+
+```powershell
+git clone -b master https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
 
 如果想要安裝比較新的dev分支，可以
 
+```powershell
+git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/butterfly
 ```
-git clone -b dev https://github.com/jerryc127/hexo-theme-butterfly.git themes/Butterfly
+
+### npm 安裝
+
+> 此方法只支持Hexo 5.0.0以上版本
+
+在博客根目錄裡
+
+```powershell
+npm i hexo-theme-butterfly
 ```
 
 ## 應用主題
 修改hexo配置文件`_config.yml`，把主題改為`Butterfly`
 
 ```
-theme: Butterfly
+theme: butterfly
 ```
 
->如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save or yarn add hexo-renderer-pug hexo-renderer-stylus
-
-## 文檔
-
-可查看[hexo-theme-butterfly docs](https://docs.jerryc.me) 和 [JerryC](https://jerryc.me/posts/21cfbf15)
-
-你也可以加入群組
-
-[  💬 QQ群 [推薦]](https://jq.qq.com/?_wv=1027&k=5KI3Jqb)
-
-[  💬Telegram群](https://t.me/hexo_butterfly)
+>如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save
 
 ## 截圖
 

languages/default.yml

@@ -3,7 +3,7 @@ sidebar:
   have_read: You've read
 
 footer:
-  driven: Driven
+  framework: Framework
   theme: Theme
 
 copy:
@@ -24,7 +24,8 @@ post:
   created: Created
   updated: Updated
   wordcount: Word count
-  min2read: "Reading time: %s min"
+  min2read: Reading time
+  min2read_unit: min
   page_pv: Post View
   comments: Comments
   copyright:
@@ -32,13 +33,13 @@ post:
     link: Link
     copyright_notice: Copyright Notice
     copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
-  recommend: Recommend
+  recommend: Related Articles
 
 search: Search
 algolia_search:
   input_placeholder: Search for Posts
   hits_empty: "We didn't find any results for the search: ${query}."
-  hits_stats: "${hits} results found in ${time} ms"
+  hits_stats: '${hits} results found in ${time} ms'
 
 local_search:
   label: Local search
@@ -61,7 +62,6 @@ aside:
   card_tags: Tags
   card_archives: Archives
   card_recent_post: Recent Post
-  card_bookmark: Bookmark
   card_webinfo:
     headline: Info
     article_name: Article
@@ -78,13 +78,13 @@ bookmark:
 
 rightside:
   readmode_title: Read Mode
-  font_plus_title: Increase font size
-  font_minus_title: Decrease font size
-  translate_title: Traditional Chinese and Simplified Chinese Conversion
-  night_mode_title: Dark Mode
-  back_to_top: Back to top
-  toc: Table of Contents
-  scroll_to_comment: Scroll to comment
+  font_plus_title: Increase Font Size
+  font_minus_title: Decrease Font Size
+  translate_title: Switch Between Traditional Chinese And Simplified Chinese
+  night_mode_title: Switch Between Light And Dark Mode
+  back_to_top: Back To Top
+  toc: Table Of Contents
+  scroll_to_comment: Scroll To Comments
   setting: Setting
 
 runtime_unit: days
@@ -104,5 +104,8 @@ Snackbar:
   day_to_night: Dark Mode Activated Manually
   night_to_day: Light Mode Activated Manually
 
-error_title: Page not found
 loading: Loading...
+
+error404:
+  error_title: Page not found
+  back_button: Go back home

languages/en.yml

@@ -3,7 +3,7 @@ sidebar:
   have_read: You've read
 
 footer:
-  driven: Driven
+  framework: Framework
   theme: Theme
 
 copy:
@@ -24,7 +24,8 @@ post:
   created: Created
   updated: Updated
   wordcount: Word count
-  min2read: "Reading time: %s min"
+  min2read: Reading time
+  min2read_unit: min
   page_pv: Post View
   comments: Comments
   copyright:
@@ -32,13 +33,13 @@ post:
     link: Link
     copyright_notice: Copyright Notice
     copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
-  recommend: Recommend
+  recommend: Related Articles
 
 search: Search
 algolia_search:
   input_placeholder: Search for Posts
   hits_empty: "We didn't find any results for the search: ${query}."
-  hits_stats: "${hits} results found in ${time} ms"
+  hits_stats: '${hits} results found in ${time} ms'
 
 local_search:
   label: Local search
@@ -61,7 +62,6 @@ aside:
   card_tags: Tags
   card_archives: Archives
   card_recent_post: Recent Post
-  card_bookmark: Bookmark
   card_webinfo:
     headline: Info
     article_name: Article
@@ -78,13 +78,13 @@ bookmark:
 
 rightside:
   readmode_title: Read Mode
-  font_plus_title: Increase font size
-  font_minus_title: Decrease font size
-  translate_title: Traditional Chinese and Simplified Chinese Conversion
-  night_mode_title: Dark Mode
-  back_to_top: Back to top
-  toc: Table of Contents
-  scroll_to_comment: Scroll to comment
+  font_plus_title: Increase Font Size
+  font_minus_title: Decrease Font Size
+  translate_title: Switch Between Traditional Chinese And Simplified Chinese
+  night_mode_title: Switch Between Light And Dark Mode
+  back_to_top: Back To Top
+  toc: Table Of Contents
+  scroll_to_comment: Scroll To Comments
   setting: Setting
 
 runtime_unit: days
@@ -104,5 +104,8 @@ Snackbar:
   day_to_night: Dark Mode Activated Manually
   night_to_day: Light Mode Activated Manually
 
-error_title: Page not found
 loading: Loading...
+
+error404:
+  error_title: Page not found
+  back_button: Go back home

languages/zh-CN.yml

@@ -3,7 +3,7 @@ sidebar:
   have_read: 你已经读了
 
 footer:
-  driven: 驱动
+  framework: 框架
   theme: 主题
 
 copy:
@@ -24,7 +24,8 @@ post:
   created: 发表于
   updated: 更新于
   wordcount: 字数总计
-  min2read: "阅读时长: %s 分钟"
+  min2read: 阅读时长
+  min2read_unit: 分钟
   page_pv: 阅读量
   comments: 评论数
   copyright:
@@ -38,14 +39,14 @@ post:
 search: 搜索
 algolia_search:
   input_placeholder: 搜索文章
-  hits_empty: "找不到您查询的内容:${query}"
-  hits_stats: "找到 ${hits} 条结果，用时 ${time} 毫秒"
+  hits_empty: '找不到您查询的内容：${query}'
+  hits_stats: '找到 ${hits} 条结果，用时 ${time} 毫秒'
 
 local_search:
   label: 本地搜索
   input_placeholder: 搜索文章
-  hits_empty: "找不到您查询的内容:${query}"
-  powered: "提供支持"
+  hits_empty: '找不到您查询的内容：${query}'
+  powered: '提供支持'
   by: 由
 
 pagination:
@@ -63,7 +64,6 @@ aside:
   card_tags: 标签
   card_archives: 归档
   card_recent_post: 最新文章
-  card_bookmark: 加入书签
   card_webinfo:
     headline: 网站资讯
     article_name: 文章数目
@@ -83,7 +83,7 @@ rightside:
   font_plus_title: 放大字体
   font_minus_title: 缩小字体
   translate_title: 简繁转换
-  night_mode_title: 夜间模式
+  night_mode_title: 浅色和深色模式转换
   back_to_top: 回到顶部
   toc: 目录
   scroll_to_comment: 直达评论
@@ -107,4 +107,8 @@ Snackbar:
   night_to_day: 你已切换为浅色模式
 
 error_title: 页面没有找到
-loading: 加载中...
+loading: 加载中...
+
+error404:
+  error_title: 页面没有找到
+  back_button: 回到主页

languages/zh-TW.yml

@@ -3,8 +3,8 @@ sidebar:
   have_read: 你已經讀了
 
 footer:
-  driven: Power by
-  theme: Theme
+  framework: 框架
+  theme: 主題
 
 copy:
   success: 複製成功
@@ -24,7 +24,8 @@ post:
   created: 發表於
   updated: 更新於
   wordcount: 字數總計
-  min2read: "閱讀時長: %s 分鐘"
+  min2read: 閲讀時長
+  min2read_unit: 分鐘
   page_pv: 閱讀量
   comments: 評論數
   copyright:
@@ -38,14 +39,14 @@ post:
 search: 搜尋
 algolia_search:
   input_placeholder: 搜尋文章
-  hits_empty: "找不到您查詢的內容:${query}"
-  hits_stats: "找到 ${hits} 條結果，用時 ${time} 毫秒"
+  hits_empty: '找不到您查詢的內容：${query}'
+  hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒'
 
 local_search:
   label: 本地搜尋
   input_placeholder: 搜尋文章
-  hits_empty: "找不到您查詢的內容:${query}"
-  powered: "提供支援"
+  hits_empty: '找不到您查詢的內容：${query}'
+  powered: '提供支援'
   by: 由
 
 pagination:
@@ -63,7 +64,6 @@ aside:
   card_tags: 標籤
   card_archives: 歸檔
   card_recent_post: 最新文章
-  card_bookmark: 加入書籤
   card_webinfo:
     headline: 網站資訊
     article_name: 文章數目
@@ -83,7 +83,7 @@ rightside:
   font_plus_title: 放大字型
   font_minus_title: 縮小字型
   translate_title: 簡繁轉換
-  night_mode_title: 夜間模式
+  night_mode_title: 淺色和深色模式轉換
   back_to_top: 回到頂部
   toc: 目錄
   scroll_to_comment: 直達評論
@@ -106,6 +106,8 @@ Snackbar:
   day_to_night: 你已切換為深色模式
   night_to_day: 你已切換為淺色模式
 
-error_title: 頁面沒有找到
 loading: 載入中...
 
+error404:
+  error_title: 頁面沒有找到
+  back_button: 回到主頁

layout/404.pug

@@ -11,14 +11,20 @@ html(lang=config.language data-theme=theme.display_mode)
 
     if theme.fireworks && theme.fireworks.enable
       canvas.fireworks
+    
+    if theme.background
+      - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
+      #web_bg(data-type=is_photo)
 
-    include includes/mobile-sidebar/index.pug
-
-    nav#nav.error-no-found(style=bg_img)
-      include includes/header/header.pug
-      #error_info.is-center
-        h1#error_title= '404'
-        #error_subtitle= theme.error_404.subtitle
-    include includes/rightside.pug
-    !=partial('includes/search/index', {}, {cache:theme.fragment_cache})
+    #error-wrap
+      .error-content
+        .error-img(style=bg_img)
+        .error-info
+          h1.error_title= '404'
+          .error_subtitle= theme.error_404.subtitle
+          a.button--animated(href=config.root)
+            i.fas.fa-rocket
+            = _p('error404.back_button')
+          
+    !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache})
     include includes/additional-js.pug

layout/flink.pug

@@ -2,20 +2,23 @@
   .flink#article-container
     if site.data.link
       each i in site.data.link
-        h2= i.class_name
-        .post-cards
-          .md-links
-            each item in i.link_list
-              .md-links-item
-                a(href=url_for(item.link)  title=item.name target="_blank")
-                  if theme.lazyload
-                    img(data-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.lodding_bg.flink) + `'` alt=item.name )
-                  else
-                    img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.lodding_bg.flink) + `'` alt=item.name )
-                  .md-links-title= item.name 
-                  .md-links-des= item.descr
+        if i.class_name
+          h2!= i.class_name
+        if i.class_desc
+          .flink-desc!=i.class_desc
+        .flink-list
+          each item in i.link_list
+            .flink-list-item
+              a(href=url_for(item.link)  title=item.name target="_blank")
+                if theme.lazyload.enable
+                  img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+                else
+                  img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+                span.flink-item-name= item.name 
+                span.flink-item-desc(title=item.descr)= item.descr
     != page.content
-  if page.comments !== false
-    include includes/comments/index.pug
+  if page.comments !== false && theme.comments && theme.comments.use
+    - var commentsJsLoad = true
+    !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
 
 

layout/includes/additional-js.pug

@@ -1,74 +1,61 @@
-script(src=url_for(theme.CDN.jquery))
-script(src=url_for(theme.CDN.utils))
-script(src=url_for(theme.CDN.main))
+div
+  script(src=url_for(theme.CDN.jquery))
+  script(src=url_for(theme.CDN.utils))
+  script(src=url_for(theme.CDN.main))
 
-if theme.translate && theme.translate.enable
-  script(src=url_for(theme.CDN.translate))
+  if theme.translate && theme.translate.enable
+    script(src=url_for(theme.CDN.translate))
 
-if (theme.medium_zoom && theme.medium_zoom.enable)
-  script(src=url_for(theme.CDN.medium_zoom))
+  if theme.medium_zoom
+    script(src=url_for(theme.CDN.medium_zoom))
+  else if theme.fancybox
+    script(src=url_for(theme.CDN.fancybox))
 
-if (theme.fancybox && theme.fancybox.enable)
-  script(src=url_for(theme.CDN.fancybox))
+  if theme.instantpage
+    script(src=url_for(theme.CDN.instantpage) type="module" defer)
 
-include ./math/index.pug 
+  if theme.lazyload.enable
+    script(src=url_for(theme.CDN.lazyload) async)
 
-if theme.fireworks && theme.fireworks.enable
-  script(src=url_for(theme.CDN.anime))
-  script(src=url_for(theme.CDN.fireworks))
+  if (theme.snackbar && theme.snackbar.enable)
+    script(src=url_for(theme.CDN.snackbar))
 
-if (theme.snackbar && theme.snackbar.enable)
-  script(src=url_for(theme.CDN.snackbar))
+  if theme.pangu && theme.pangu.enable
+    !=partial('includes/third-party/pangu.pug', {}, {cache:theme.fragment_cache})
 
-if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
-  include ./third-party/canvas-ribbon.pug
+  //- search
+  if theme.algolia_search.enable
+    script(src=url_for(theme.CDN.algolia_js))
+  else if theme.local_search.enable
+    script(src=url_for(theme.CDN.local_search))
 
-if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable)
-  include ./third-party/canvas-ribbon-piao.pug
+  if theme.preloader
+    !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
 
-if (theme.canvas_nest && theme.canvas_nest.enable)
-  include ./third-party/canvas-nest.pug 
+  .js-pjax
+    if is_home() && theme.subtitle.enable
+      include ./third-party/subtitle.pug
 
-if theme.activate_power_mode.enable
-  script(src=url_for(theme.CDN.activate_power_mode))
-  script.
-    POWERMODE.colorful = #{theme.activate_power_mode.colorful};
-    POWERMODE.shake = #{theme.activate_power_mode.shake};
-    document.body.addEventListener('input', POWERMODE);
+    include ./third-party/math/index.pug
 
-if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-  script(async src=url_for(theme.CDN.busuanzi))
+    if commentsJsLoad
+      include ./third-party/comments/js.pug
 
-if theme.instantpage.enable
-  script(src=url_for(theme.CDN.instantpage) type="module")
+    if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+      script(async src=url_for(theme.CDN.busuanzi))
 
-if theme.lazyload
-  script(src=url_for(theme.CDN.lazyload))
+  !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
-//- 鼠標特效
-if theme.click_heart && theme.click_heart.enable
-  script(src=url_for(theme.CDN.click_heart))
+  !=partial('includes/third-party/effect', {}, {cache:theme.fragment_cache})
 
-if theme.ClickShowText && theme.ClickShowText.enable
-  script(src=url_for(theme.CDN.ClickShowText))
+  !=partial('includes/third-party/chat/index', {}, {cache:theme.fragment_cache})
 
-if theme.pangu && theme.pangu.enable
-  include ./third-party/pangu.pug
+  if theme.aplayerInject && theme.aplayerInject.enable
+    if theme.pjax || theme.aplayerInject.per_page
+      include ./head/aplayer.pug
+    else if page.aplayer
+      include ./head/aplayer.pug
 
-//- search
-if theme.algolia_search && theme.algolia_search.enable
-  script(src=url_for(theme.CDN.algolia_js))
-else if theme.local_search && theme.local_search.enable
-  script(src=url_for(theme.CDN.local_search))
+  if theme.pjax
+    !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache})
 
-//- mermaid
-if theme.mermaid.enable
-  include ./math/mermaid.pug
-
-if is_home()
-  include ./head/subtitle.pug
-
-!=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
-
-if theme.preloader
-  !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})

layout/includes/comments/disqus.pug

@@ -1,24 +0,0 @@
-#disqus_thread
-script.
-  var disqus_config = function () {
-    this.page.url = '!{ page.permalink }';
-    this.page.identifier = '!{ page.path }';
-    this.page.title = '!{ page.title }';
-  };
-  (function() { 
-    var d = document, s = d.createElement('script');
-    s.src = 'https://!{theme.disqus.shortname}.disqus.com/embed.js';
-    s.setAttribute('data-timestamp', +new Date());
-    (d.head || d.body).appendChild(s);
-  })();
-
-if is_post() && theme.disqus.count
-  script.
-    function getDisqusCount() {
-      var d = document, s = d.createElement('script');
-      s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
-      s.id = 'dsq-count-scr';
-      (d.head || d.body).appendChild(s);
-    }
-
-    window.addEventListener('load', getDisqusCount, false);

layout/includes/comments/disqusjs.pug

@@ -1,24 +0,0 @@
-#disqus_thread
-script(src=url_for(theme.CDN.disqusjs))
-script.
-  var dsqjs = new DisqusJS({
-    shortname: '!{theme.disqusjs.shortname}',
-    siteName: "!{theme.disqusjs.siteName}",
-    identifier: '!{ page.path }',
-    url: '!{ page.permalink }',
-    title: '!{ page.title }',
-    api: '!{theme.disqusjs.api}',
-    apikey: '!{theme.disqusjs.apikey}',
-    admin: '!{theme.disqusjs.admin}',
-    adminLabel: '!{theme.disqusjs.adminLabel}'
-  });
-
-if is_post() && theme.disqusjs.count
-  script.
-    function getDisqusCount() {
-      var d = document, s = d.createElement('script');
-      s.src = 'https://!{theme.disqusjs.shortname}.disqus.com/count.js';
-      s.id = 'dsq-count-scr';
-      (d.head || d.body).appendChild(s);
-    }
-    window.addEventListener('load', getDisqusCount, false);

layout/includes/comments/facebook_comments.pug

@@ -1,12 +0,0 @@
-#fb-root
-script(async defer crossorigin="anonymous" src=`https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v6.0`)
-.fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
-            data-href=urlNoIndex() 
-            data-numposts= theme.facebook_comments.pageSize || 10
-            data-order-by= theme.facebook_comments.order_by || 'social'
-            data-width="100%")
-
-if theme.darkmode.enable
-  script.
-    var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
-    document.getElementsByClassName('fb-comments')[0].setAttribute('data-colorscheme',themeNow)

layout/includes/comments/gitalk.pug

@@ -1,27 +0,0 @@
-#gitalk-container
-script.
-  var gitalk = new Gitalk({
-    clientID: '!{theme.gitalk.client_id}',
-    clientSecret: '!{theme.gitalk.client_secret}',
-    repo: '!{theme.gitalk.repo}',
-    owner: '!{theme.gitalk.owner}',
-    admin: ['!{theme.gitalk.admin}'],
-    id: md5(decodeURI(location.pathname)),
-    language: '!{theme.gitalk.language}',
-    perPage: !{theme.gitalk.perPage},
-    distractionFreeMode: !{theme.gitalk.distractionFreeMode},
-    pagerDirection: '!{theme.gitalk.pagerDirection}',
-    createIssueManually: !{theme.gitalk.createIssueManually},
-    updateCountCallback: commentCount
-  })
-  gitalk.render('gitalk-container')
-
-  function commentCount(n){
-    try {
-      document.getElementsByClassName('gitalk-comment-count')[0].innerHTML= n
-    } catch (e) {
-      return false
-    }
-  }
-
-

layout/includes/comments/index.pug

@@ -1,29 +0,0 @@
-- var d = theme.disqus && theme.disqus.enable
-- var dj = theme.disqusjs && theme.disqusjs.enable
-- var l = theme.laibili && theme.laibili.enable
-- var gt = theme.gitalk && theme.gitalk.enable
-- var v = theme.valine && theme.valine.enable
-- var u = theme.utterances && theme.utterances.enable
-- var fb = theme.facebook_comments && theme.facebook_comments.enable
-- var isComment = d || dj || l || gt || v || u || fb
-
-if isComment
-  hr
-  #post-comment
-    .comment_headling
-      i.fa.fa-comments.fa-fw(aria-hidden="true")
-      span= ' ' + _p('comment')
-    if d
-      include ./disqus.pug
-    else if dj
-      include ./disqusjs.pug
-    else if l
-      include ./laibili.pug
-    else if gt
-      include ./gitalk.pug
-    else if v
-      include ./valine.pug
-    else if u
-      include ./utterances.pug
-    else if fb
-      include ./facebook_comments.pug

layout/includes/comments/laibili.pug

@@ -1,10 +0,0 @@
-#lv-container(data-id="city" data-uid=theme.laibili.uid)
-  script.
-    (function(d, s) {
-        var j, e = d.getElementsByTagName(s)[0];
-        if (typeof LivereTower === 'function') { return; }
-        j = d.createElement(s);
-        j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
-        j.async = true;
-        e.parentNode.insertBefore(j, e);
-    })(document, 'script');

layout/includes/comments/utterances.pug

@@ -1,21 +0,0 @@
-script#utterances_comment(src=theme.CDN.utterances
-        repo=theme.utterances.repo
-        issue-term=theme.utterances.issue_term
-        theme= theme.display_mode === 'dark' ? theme.utterances.dark_theme : theme.utterances.light_theme
-        crossorigin="anonymous"
-        async)
-
-if theme.darkmode.enable
-  script.
-    var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
-    document.getElementById('utterances_comment').setAttribute('theme',themeNow)
-
-    function utterancesTheme () {
-    var theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
-    const message = {
-      type: 'set-theme',
-      theme: theme
-    };
-    const iframe = document.querySelector('.utterances-frame');
-    iframe.contentWindow.postMessage(message, 'https://utteranc.es');
-    }

layout/includes/comments/valine.pug

@@ -1,37 +0,0 @@
-- let emojiMaps = '""'
-if site.data.valine
-  - emojiMaps = JSON.stringify(site.data.valine)
-
-#vcomment.vcomment
-script(src=url_for(theme.CDN.valine))
-script.
-  var requestSetting = function (from,set) {
-    var from = from
-    var setting = set.split(',').filter(function(item){
-    return from.indexOf(item) > -1
-    });
-    setting = setting.length == 0 ? from :setting;
-    return setting
-  }
-
-  var guestInfo = requestSetting(['nick','mail','link'],'#{ theme.valine.guest_info }')
-  var requiredFields = requestSetting(['nick','mail','link'],'#{ theme.valine.requiredFields }')
-
-  window.valine = new Valine({
-    el:'#vcomment',
-    appId: '#{theme.valine.appId}',
-    appKey: '#{theme.valine.appKey}',
-    notify: #{theme.valine.notify},
-    verify: #{theme.valine.verify},
-    placeholder: '#{theme.valine.placeholder}',
-    avatar: '#{theme.valine.avatar}',
-    meta: guestInfo,
-    pageSize: '#{theme.valine.pageSize}',
-    lang: '#{theme.valine.lang}',
-    recordIP: #{theme.valine.recordIP},
-    serverURLs: '#{theme.valine.serverURLs}',
-    emojiCDN: '#{theme.valine.emojiCDN}',
-    emojiMaps: !{emojiMaps},
-    enableQQ: #{theme.valine.enableQQ},
-    requiredFields: requiredFields
-  });

layout/includes/footer.pug

@@ -1,24 +1,23 @@
 #footer-wrap
-  - var now = new Date()
-  - var nowYear = now.getFullYear()
-  if theme.since && theme.since != nowYear
-    .copyright!= `©${theme.since} - ${nowYear} By ${config.author}`
-  else
-    .copyright!= `©${nowYear} By ${config.author}`
-  if theme.footer_copyright.enable
+  if theme.footer.owner.enable
+    - var now = new Date()
+    - var nowYear = now.getFullYear()
+    if theme.footer.owner.since && theme.footer.owner.since != nowYear
+      .copyright!= `©${theme.footer.owner.since} - ${nowYear} By ${config.author}`
+    else
+      .copyright!= `©${nowYear} By ${config.author}`
+  if theme.footer.copyright
     .framework-info
-      span= _p('footer.driven') + ' '
-      a(href='https://hexo.io')
-        span Hexo
+      span= _p('footer.framework') + ' '
+      a(href='https://hexo.io')= 'Hexo'
       span.footer-separator |
       span= _p('footer.theme') + ' '
-      a(href='https://github.com/jerryc127/hexo-theme-butterfly')
-        span Butterfly
-  if theme.footer_custom_text
-    .footer_custom_text!=`${theme.footer_custom_text}`   
-  if theme.ICP.enable
+      a(href='https://github.com/jerryc127/hexo-theme-butterfly')= 'Butterfly'
+  if theme.footer.custom_text
+    .footer_custom_text!=`${theme.footer.custom_text}`   
+  if theme.footer.ICP.enable
     .icp
-      a(href=theme.ICP.url)
-        if theme.ICP.icon
-          img.icp-icon(src=url_for(theme.ICP.icon))
-        span=theme.ICP.text
+      a(href=theme.footer.ICP.url)
+        if theme.footer.ICP.icon
+          img.icp-icon(src=url_for(theme.footer.ICP.icon))
+        span=theme.footer.ICP.text

layout/includes/head.pug

@@ -4,7 +4,7 @@
 - else if (is_category()) pageTitle = _p('page.category') + ': ' + page.category
 - else if (is_month()) pageTitle += ': ' + page.month + '/' + page.year
 - else if (is_year()) pageTitle += ': ' + page.year
-- else if (is_current('/404.html', [strict])) pageTitle = _p('error_title')
+- else if (is_current('/404.html', [strict])) pageTitle = _p('error404.error_title')
 - else pageTitle = page.title || config.title || ''
 
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
@@ -29,17 +29,14 @@ meta(name="author" content=pageAuthor)
 meta(name="copyright" content=pageCopyright)
 meta(name ="format-detection" content="telephone=no")
 !=favicon_tag(theme.favicon || config.favicon)
+link(rel="canonical" href=urlNoIndex())
 
 if theme.disable_baidu_transformation
   meta(http-equiv="Cache-Control" content="no-transform")
   meta(http-equiv="Cache-Control" content="no-siteapp")
 
-if theme.douban
-  if theme.douban.meta && (is_current('/movies/', [strict]) || is_current('/books/', [strict]) || is_current('/games/', [strict]))
-    meta(name="referrer" content="no-referrer")
-
 //- 預解析
-!=partial('includes/head/dns_prefetch', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/preconnect', {}, {cache:theme.fragment_cache})
 
 //- 網站驗證
 !=partial('includes/head/site_verification', {}, {cache:theme.fragment_cache})
@@ -47,53 +44,41 @@ if theme.douban
 //- Open_Graph
 include ./head/Open_Graph.pug
 
+if theme.facebook_comments.app_id
+  meta(property="fb:app_id" content=theme.facebook_comments.app_id )
+if theme.facebook_comments.user_id
+  meta(property="fb:admins" content=theme.facebook_comments.user_id)
+
 //- PWA
 if (theme.pwa && theme.pwa.enable)
   !=partial('includes/head/pwa', {}, {cache:theme.fragment_cache})
 
-script(src=url_for(theme.CDN.js_cookies))
-
 if theme.darkmode.enable
   !=partial('includes/head/darkmode', {}, {cache:theme.fragment_cache})
 
 //- main css
 link(rel='stylesheet', href=url_for(theme.CDN.main_css))
+link(rel='stylesheet', href=url_for(theme.CDN.fontawesome))
 
-if theme.fontawesome_v5 && theme.fontawesome_v5.enable
-  link(rel='stylesheet', href=url_for(theme.CDN.fontawesome_v5))
-else
-  link(rel='stylesheet', href=url_for(theme.CDN.fontawesome_v4))
-
-if (theme.fancybox && theme.fancybox.enable)
+if theme.fancybox
   link(rel='stylesheet', href=url_for(theme.CDN.fancybox_css))
 
 if (theme.snackbar && theme.snackbar.enable)
   link(rel='stylesheet', href=url_for(theme.CDN.snackbar_css))
 
-if theme.canonical
-  link(rel="canonical" href=urlNoIndex())
-
-if is_post()
-  if(page.prev)
-    link(rel="prev" title=page.prev.title href=url_for(page.prev.permalink) )
-  if(page.next)
-    link(rel="next" title=page.next.title  href=url_for(page.next.permalink) )
-
 if theme.algolia_search.enable
-  link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.algolia_search_css))
+  link(rel='stylesheet' href=url_for(theme.CDN.algolia_search_css))
   script(src=url_for(theme.CDN.algolia_search) defer)
 
-//- comment css
-include ./head/comment.pug
-
 //- google_adsense
 !=partial('includes/head/google_adsense', {}, {cache:theme.fragment_cache})
 
 //- analytics
 !=partial('includes/head/analytics', {}, {cache:theme.fragment_cache})
 
+//- font
 if theme.blog_title_font.font_link
-  link(rel='stylesheet', href=url_for(theme.blog_title_font.font_link))
+  link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link))
 
 //- global config
 !=partial('includes/head/config', {}, {cache:theme.fragment_cache})
@@ -101,4 +86,5 @@ if theme.blog_title_font.font_link
 include ./head/config_site.pug
 include ./head/noscript.pug
 
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
+

layout/includes/head/Open_Graph.pug

@@ -1,13 +1,5 @@
 - var contentType = is_post() ? 'article' : 'website'
 
-//- twitter meta
-if theme.twitter_meta
-  meta(name="twitter:card" content="summary")
-  meta(name="twitter:title" content=pageTitle)
-  meta(name="twitter:description" content!=pageDescription)
-  meta(name="twitter:image" content=full_url_for(page.cover || theme.avatar.img))
-
-//- Open_Graph
 if theme.Open_Graph_meta
   meta(property="og:type" content=contentType)
   meta(property="og:title" content=pageTitle)
@@ -17,3 +9,4 @@ if theme.Open_Graph_meta
   meta(property="og:image" content=full_url_for(page.cover || theme.avatar.img))
   meta(property="article:published_time" content=date_xml(page.date))
   meta(property="article:modified_time" content=date_xml(page.updated))
+  meta(name="twitter:card" content="summary")

layout/includes/head/analytics.pug

@@ -9,14 +9,12 @@ if theme.baidu_analytics
     })();
 
 if theme.google_analytics
+  script(async src=`https://www.googletagmanager.com/gtag/js?id=${theme.google_analytics}`)
   script.
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '!{theme.google_analytics}', 'auto');
-    ga('send', 'pageview');
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+    gtag('config', '!{theme.google_analytics}');
 
 if theme.tencent_analytics
-  script(src=`https://tajs.qq.com/stats?sId=${theme.tencent_analytics}` charset="UTF-8")
+  script(src=`https://tajs.qq.com/stats?sId=${theme.tencent_analytics}` charset="UTF-8" data-pjax)

layout/includes/head/aplayer.pug

@@ -0,0 +1,3 @@
+link(rel='stylesheet' href=url_for(theme.CDN.aplayer_css))
+script(src=url_for(theme.CDN.aplayer_js))
+script(src=url_for(theme.CDN.meting_js))

layout/includes/head/comment.pug

@@ -1,14 +0,0 @@
-if (theme.facebook_comments.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home())
-  if theme.facebook_comments.app_id
-    meta(property="fb:app_id" content=theme.facebook_comments.app_id )
-  if theme.facebook_comments.user_id
-    meta(property="fb:admins" content=theme.facebook_comments.user_id)
-
-if (theme.disqusjs && theme.disqusjs.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home())
-  link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.disqusjs_css))
-
-if (theme.gitalk && theme.gitalk.enable && page.comments !== false && !is_tag() && !is_category() && !is_archive() && !is_home())
-  link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.gitalk_css))
-  script(src=url_for(theme.CDN.gitalk))
-  script(src=url_for(theme.CDN.blueimp_md5))
-

layout/includes/head/config.pug

@@ -31,20 +31,20 @@
     translate = JSON.stringify({
       defaultEncoding: theme.translate.defaultEncoding,
       translateDelay: theme.translate.translateDelay,
-      cookieDomain: theme.translate.cookieDomain,
       msgToTraditionalChinese: theme.translate.msgToTraditionalChinese,
       msgToSimplifiedChinese: theme.translate.msgToSimplifiedChinese
     })
   }
 
-  var copyright = 'undefined' ;
-  if (theme.copy.enable && theme.copy.copyright){
-    copyright = JSON.stringify({      
+  var copyright = 'undefined';
+  if (theme.copy.enable && theme.copy.copyright.enable){
+    copyright = JSON.stringify({
+      limitCount: theme.copy.copyright.limit_count,
       languages: {
-      author: _p("copy_copyright.author") + ': ' + config.author,
-      link: _p("copy_copyright.link") + ': ',
-      source: _p("copy_copyright.source") + ': ' + config.title,
-      info: _p("copy_copyright.info")
+        author: _p("copy_copyright.author") + ': ' + config.author,
+        link: _p("copy_copyright.link") + ': ',
+        source: _p("copy_copyright.source") + ': ' + config.title,
+        info: _p("copy_copyright.info")
       }
     })
   }
@@ -60,7 +60,7 @@
   
   var Snackbar = 'undefined';
   if (theme.snackbar && theme.snackbar.enable) {
-  Snackbar = JSON.stringify({      
+  Snackbar = JSON.stringify({
     bookmark: {
       message_prev: _p("Snackbar.bookmark.message_prev"),
       message_next: _p("Snackbar.bookmark.message_next")
@@ -75,12 +75,23 @@
     })
   }
 
+  var noticeOutdate = 'undefined';
+  if (theme.noticeOutdate && theme.noticeOutdate.enable) {
+    noticeOutdate = JSON.stringify({
+      limitDay: theme.noticeOutdate.limit_day,
+      position: theme.noticeOutdate.position,
+      messagePrev: theme.noticeOutdate.message_prev,
+      messageNext: theme.noticeOutdate.message_next,
+    })
+  }
+
 script.
   var GLOBAL_CONFIG = { 
     root: '!{config.root}',
     algolia: !{algolia},
     localSearch: !{localSearch},
     translate: !{translate},
+    noticeOutdate: !{noticeOutdate},
     copy: {
       success: '!{_p("copy.success")}',
       error: '!{_p("copy.error")}',
@@ -94,17 +105,18 @@ script.
     runtime: !{theme.runtimeshow.enable},
     copyright: !{copyright},
     ClickShowText: !{ClickShowText},
-    medium_zoom: !{theme.medium_zoom.enable},
-    fancybox: !{theme.fancybox.enable},
+    medium_zoom: !{theme.medium_zoom},
+    fancybox: !{theme.fancybox},
     Snackbar: !{Snackbar},
-    baiduPush: !{theme.baidu_push && theme.baidu_push.enable},
+    justifiedGallery: {
+      js: '!{theme.CDN.justifiedGallery_js}',
+      css: '!{theme.CDN.justifiedGallery_css}'
+    },
+    baiduPush: !{theme.baidu_push},
     highlightCopy: !{theme.highlight_copy},
     highlightLang: !{theme.highlight_lang},
-    highlightShrink: '!{theme.highlight_shrink}',
-    isFontAwesomeV5: !{theme.fontawesome_v5 && theme.fontawesome_v5.enable},
     isPhotoFigcaption: !{theme.photofigcaption},
-    islazyload: !{theme.lazyload},
-    isanchor: !{theme.anchor}
-    
+    islazyload: !{theme.lazyload.enable},
+    isanchor: !{theme.anchor}    
   }
 

layout/includes/head/config_site.pug

@@ -1,7 +1,19 @@
-script.
-  var GLOBAL_CONFIG_SITE = { 
-    isPost: !{is_post()},
-    isHome: !{is_home()},
-    isSidebar: !{is_post() && page.toc !== false && theme.toc.enable && (toc(page.content) !== '' || page.encrypt == true )}  
-    }
+-
+  let isHighlightShrink
+  if (theme.highlight_shrink == 'none') isHighlightShrink = 'undefined'
+  else if (page.highlight_shrink === true || page.highlight_shrink === false) isHighlightShrink = page.highlight_shrink
+  else isHighlightShrink = theme.highlight_shrink
 
+  const pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
+  const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true )
+-
+
+script#config_change
+  .
+    var GLOBAL_CONFIG_SITE = { 
+      isPost: !{is_post()},
+      isHome: !{is_home()},
+      isHighlightShrink: !{isHighlightShrink},
+      isSidebar: !{showToc},
+      postUpdate: '!{full_date(page.updated)}'
+    }

layout/includes/head/darkmode.pug

@@ -1,47 +1,56 @@
 script.
+  var activateDarkMode = function () {
+    document.documentElement.setAttribute('data-theme', 'dark')
+    if (document.querySelector('meta[name="theme-color"]') !== null) {
+      document.querySelector('meta[name="theme-color"]').setAttribute('content', '#000')
+    }
+  }
+  var activateLightMode = function () {
+    document.documentElement.setAttribute('data-theme', 'light')
+    if (document.querySelector('meta[name="theme-color"]') !== null) {
+      document.querySelector('meta[name="theme-color"]').setAttribute('content', '#fff')
+    }
+  }
+
+  var getCookies = function (name) {
+    const value = `; ${document.cookie}`
+    const parts = value.split(`; ${name}=`)
+    if (parts.length === 2) return parts.pop().split(';').shift()
+  }
+
   var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-  var t = Cookies.get("theme")
-  if (autoChangeMode == '1'){
-    var isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches
-    var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches
-    var isNotSpecified = window.matchMedia("(prefers-color-scheme: no-preference)").matches
+  var t = getCookies('theme')
+  if (autoChangeMode === '1') {
+    var isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
+    var isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
+    var isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
     var hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
 
-    if (t === undefined){
+    if (t === undefined) {
       if (isLightMode) activateLightMode()
       else if (isDarkMode) activateDarkMode()
-      else if (isNotSpecified || hasNoSupport){
+      else if (isNotSpecified || hasNoSupport) {
         console.log('You specified no preference for a color scheme or your browser does not support it. I Schedule dark mode during night time.')
         var now = new Date()
         var hour = now.getHours()
-        var isNight = hour < 6 || hour >= 18
+        var isNight = hour <= 6 || hour >= 18
         isNight ? activateDarkMode() : activateLightMode()
-    }
-    } else if (t == 'light') activateLightMode()
+      }
+      window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
+        if (Cookies.get('theme') === undefined) {
+          e.matches ? activateDarkMode() : activateLightMode()
+        }
+      })
+    } else if (t === 'light') activateLightMode()
     else activateDarkMode()
- 
-  } else if (autoChangeMode == '2'){
-    now = new Date();
-    hour = now.getHours();
-    isNight = hour < 6 || hour >= 18
-    if(t === undefined) isNight? activateDarkMode() : activateLightMode()
+  } else if (autoChangeMode === '2') {
+    now = new Date()
+    hour = now.getHours()
+    isNight = hour <= 6 || hour >= 18
+    if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
     else if (t === 'light') activateLightMode()
-    else activateDarkMode() 
+    else activateDarkMode()
   } else {
-    if ( t == 'dark' ) activateDarkMode()
-    else if ( t == 'light') activateLightMode()
+    if (t === 'dark') activateDarkMode()
+    else if (t === 'light') activateLightMode()
   }
-
-  function activateDarkMode(){
-    document.documentElement.setAttribute('data-theme', 'dark')
-    if (document.querySelector('meta[name="theme-color"]') !== null){
-      document.querySelector('meta[name="theme-color"]').setAttribute('content','#000')
-    }
-  }
-  function activateLightMode(){
-    document.documentElement.setAttribute('data-theme', 'light')
-    if (document.querySelector('meta[name="theme-color"]') !== null){
-    document.querySelector('meta[name="theme-color"]').setAttribute('content','#fff')
-    }
-  }
-

layout/includes/head/dns_prefetch.pug

@@ -1,22 +0,0 @@
-link(rel="preconnect" href="//cdn.jsdelivr.net")
-link(rel="dns-prefetch" href="//cdn.jsdelivr.net")
-
-if theme.google_analytics
-  link(rel="preconnect" href="https://www.google-analytics.com" crossorigin)
-  link(rel="dns-prefetch" href="https://www.google-analytics.com")
-
-if theme.baidu_analytics
-  link(rel="preconnect" href="https://hm.baidu.com")
-  link(rel="dns-prefetch" href="https://hm.baidu.com")
-
-if theme.tencent_analytics
-  link(rel="preconnect" href="http://ta.qq.com")
-  link(rel="dns-prefetch" href="http://ta.qq.com")
-
-if theme.blog_title_font.font_link
-  link(rel="preconnect" href="https://fonts.googleapis.com" crossorigin)
-  link(rel="dns-prefetch" href="https://fonts.googleapis.com")
-
-if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-  link(rel="preconnect" href="//busuanzi.ibruce.info")
-  link(rel="dns-prefetch" href="//busuanzi.ibruce.info")

layout/includes/head/google_adsense.pug

@@ -1,7 +1,9 @@
 if (theme.google_adsense && theme.google_adsense.enable)
   script(async src=theme.google_adsense.js)
-  script.
-    (adsbygoogle = window.adsbygoogle || []).push({
-      google_ad_client: '!{theme.google_adsense.client}',
-      enable_page_level_ads: '!{theme.google_adsense.enable_page_level_ads}'
-    });
+
+  if theme.google_adsense.auto_ads
+    script.
+      (adsbygoogle = window.adsbygoogle || []).push({
+        google_ad_client: '!{theme.google_adsense.client}',
+        enable_page_level_ads: '!{theme.google_adsense.enable_page_level_ads}'
+      });

layout/includes/head/noscript.pug

@@ -1,9 +1,9 @@
 noscript. 
   <style>
-  #page-header {
+  #nav {
     opacity: 1
   }
-  .justified-gallery img{
+  .justified-gallery img {
     opacity: 1
   }
   </style>

layout/includes/head/preconnect.pug

@@ -0,0 +1,19 @@
+link(rel="preconnect" href="//cdn.jsdelivr.net")
+
+if theme.google_analytics
+  link(rel="preconnect" href="//www.google-analytics.com" crossorigin)
+
+if theme.baidu_analytics
+  link(rel="preconnect" href="//hm.baidu.com")
+
+if theme.tencent_analytics
+  link(rel="preconnect" href="//ta.qq.com")
+
+if theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
+  link(rel="preconnect" href="//fonts.googleapis.com" crossorigin)
+
+if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+  link(rel="preconnect" href="//busuanzi.ibruce.info")
+
+if theme.baidu_push
+  link(rel="preconnect" href="//zz.bdstatic.com")

layout/includes/head/pwa.pug

@@ -1,13 +1,13 @@
-link(rel="manifest" href=theme.pwa.manifest)
+link(rel="manifest" href=url_for(theme.pwa.manifest))
 if(theme.pwa.theme_color) 
   meta(name="theme-color" content=theme.pwa.theme_color)
 if(theme.pwa.theme_color) 
   meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
 if(theme.pwa.apple_touch_icon) 
-  link(rel="apple-touch-icon" sizes="180x180" href=theme.pwa.apple_touch_icon)
+  link(rel="apple-touch-icon" sizes="180x180" href=url_for(theme.pwa.apple_touch_icon))
 if(theme.pwa.favicon_32_32) 
-  link(rel="icon" type="image/png" sizes="32x32" href=theme.pwa.favicon_32_32)
+  link(rel="icon" type="image/png" sizes="32x32" href=url_for(theme.pwa.favicon_32_32))
 if(theme.pwa.favicon_16_16)
-  link(rel="icon" type="image/png" sizes="16x16" href=theme.pwa.favicon_16_16)
+  link(rel="icon" type="image/png" sizes="16x16" href=url_for(theme.pwa.favicon_16_16))
 if(theme.pwa.mask_icon)
-  link(rel="mask-icon" href=theme.pwa.mask_icon color="#5bbad5")
+  link(rel="mask-icon" href=url_for(theme.pwa.mask_icon) color="#5bbad5")

layout/includes/head/site_verification.pug

@@ -9,3 +9,6 @@ if theme.baidu_site_verification
 
 if theme.qihu_site_verification
   meta(name="360-site-verification" content=theme.qihu_site_verification)
+
+if theme.yandex_site_verification
+  meta(name="yandex-verification" content=theme.yandex_site_verification)

layout/includes/head/subtitle.pug

@@ -1,130 +0,0 @@
-if theme.subtitle.enable
-  - var source = theme.subtitle.source
-  - var subtitleEffect = theme.subtitle.effect
-
-  if subtitleEffect
-    script(src=url_for(theme.CDN.typed))
-
-  if source == '1'
-    script.
-      var subtitleType = function () {
-        var subtitleEffect = !{ subtitleEffect }
-        fetch('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',)
-          .then(function (res) {
-            return res.json()
-          })
-          .then(function (data) {
-            if (subtitleEffect) {
-              var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
-              var both = sub.unshift(data.text)
-              var typed = new Typed('#subtitle', {
-                strings: sub,
-                startDelay: 300,
-                typeSpeed: 150,
-                loop: !{theme.subtitle.loop},
-                backSpeed: 50,
-              })
-            } else {
-              document.getElementById('subtitle').innerHTML = data.text
-            }
-          })
-          .catch(function (err) {
-            console.error(err)
-          })
-      }
-      window.addEventListener('load', subtitleType)
-
-  else if source == '2'
-    script.
-      var subtitleType = function () {
-        var subtitleEffect = !{ subtitleEffect }
-        fetch('https://v1.hitokoto.cn')
-          .then(function (res) {
-            return res.json()
-          })
-          .then(function (data) {
-            if (subtitleEffect) {
-              var from = '出自 ' + data.from
-              var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
-              var both = sub.unshift(data.hitokoto, from)
-              var typed = new Typed('#subtitle', {
-                strings: sub,
-                startDelay: 300,
-                typeSpeed: 150,
-                loop: !{theme.subtitle.loop},
-                backSpeed: 50,
-              })
-            } else {
-              document.getElementById('subtitle').innerHTML = data.hitokoto
-            }
-          })
-          .catch(function (err) {
-            console.error(err)
-          })
-      }
-      window.addEventListener('load', subtitleType)
-
-  else if source == '3'
-    script.
-      var subtitleType = function () {
-        loadScript('http://yijuzhan.com/api/word.php?m=js', function () {
-          var subtitleEffect = !{ subtitleEffect }
-          var con = str[0]
-          if (subtitleEffect) {
-            var from = '出自 ' + str[1]
-            var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
-            var both = sub.unshift(con, from)
-            var typed = new Typed('#subtitle', {
-              strings: sub,
-              startDelay: 300,
-              typeSpeed: 150,
-              loop: !{theme.subtitle.loop},
-              backSpeed: 50,
-            })
-          } else {
-            document.getElementById('subtitle').innerHTML = con
-          }
-        })
-      }
-      window.addEventListener('load', subtitleType)
-
-  else if source == '4'
-    script.
-      var subtitleType = function () {
-        loadScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
-            var subtitleEffect = !{ subtitleEffect }
-            jinrishici.load(function (result) {
-              if (subtitleEffect) {
-                var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
-                var content = result.data.content
-                var both = sub.unshift(content)
-                var typed = new Typed('#subtitle', {
-                  strings: sub,
-                  startDelay: 300,
-                  typeSpeed: 150,
-                  loop: !{theme.subtitle.loop},
-                  backSpeed: 50,
-                })
-              } else {
-                document.getElementById('subtitle').innerHTML = result.data.content
-              }
-            })
-          }
-        )
-      }
-      window.addEventListener('load', subtitleType)
-
-  else
-    script.
-      var subtitleEffect = !{subtitleEffect}
-      if (subtitleEffect) { 
-        var typed = new Typed("#subtitle", {
-          strings: '!{theme.subtitle.sub}'.split(","),
-          startDelay: 300,
-          typeSpeed: 150,
-          loop: !{theme.subtitle.loop},
-          backSpeed: 50
-        })
-      } else {
-        document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}'
-      }

layout/includes/header/index.pug

@@ -24,8 +24,8 @@ if theme.douban
 - var isHomeClass = is_home() ? 'full_page' : 'not-index-bg'
 - is_post() ? isHomeClass = 'post-bg' : isHomeClass
 
-#nav(class=isHomeClass style=bg_img)
-  !=partial('includes/header/header', {}, {cache:theme.fragment_cache})
+header#page-header(class=isHomeClass style=bg_img)
+  !=partial('includes/header/nav', {}, {cache:theme.fragment_cache})
   if is_home()
     #site-info
       h1#site_title=site_title
@@ -35,7 +35,7 @@ if theme.douban
         #site_social_icons
           !=fragment_cache('social', function(){return partial('includes/header/social')})
     #scroll_down
-      i.fa.fa-angle-down.scroll-down-effects
+      i.fas.fa-angle-down.scroll-down-effects
   else if is_post()
     include ./post-info.pug 
   else

layout/includes/header/menu_item.pug

@@ -1,22 +1,23 @@
-.menus_items
-  each value, label in theme.menu
-    if !Array.isArray(value)
-      .menus_item
-        a.site-page(href=url_for(trim(value.split('||')[0])))
-          if value.split('||')[1]
-            i.fa-fw(class=trim(value.split('||')[1]))
-          span=' '+label
-    else
-      .menus_item
-        a.site-page
-          if label.split('||')[1]
-            i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true")
-          span=' '+ trim(label.split('||')[0])
-          i.fa.fa-chevron-down.menus-expand(aria-hidden="true")
-        ul.menus_item_child
-          each i in value
-            li
-              a.site-page(href=url_for(trim(i.split('||')[1])))
-                if i.split('||')[2]
-                  i.fa-fw(class=trim(i.split('||')[2]))
-                span=' '+trim(i.split('||')[0])
+if theme.menu
+  .menus_items
+    each value, label in theme.menu
+      if !Array.isArray(value)
+        .menus_item
+          a.site-page(href=url_for(trim(value.split('||')[0])))
+            if value.split('||')[1]
+              i.fa-fw(class=trim(value.split('||')[1]))
+            span=' '+label
+      else
+        .menus_item
+          a.site-page(href='javascript:void(0);')
+            if label.split('||')[1]
+              i.fa-fw(class=trim(label.split('||')[1]))
+            span=' '+ trim(label.split('||')[0])
+            i.fas.fa-chevron-down.expand
+          ul.menus_item_child
+            each i in value
+              li
+                a.site-page(href=url_for(trim(i.split('||')[1])))
+                  if i.split('||')[2]
+                    i.fa-fw(class=trim(i.split('||')[2]))
+                  span=' '+trim(i.split('||')[0])

layout/includes/header/nav.pug

@@ -1,17 +1,17 @@
-#page-header
-  span#blog_name.pull_left
+nav#nav
+  span#blog_name.pull-left
     a#site-name.blog_title(href=url_for('/')) #[=config.title]
     
-  span.pull_right.menus
-    if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable)
+  span.pull-right.menus
+    if (theme.algolia_search.enable || theme.local_search.enable)
       #search_button
         a.site-page.social-icon.search
-          i.fa.fa-search.fa-fw
+          i.fas.fa-search.fa-fw
           span=' '+_p('search')
     !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
 
     span.toggle-menu.close
       a.site-page
-        i.fa.fa-bars.fa-fw(aria-hidden="true")
+        i.fas.fa-bars.fa-fw
 
 

layout/includes/header/post-info.pug

@@ -5,87 +5,79 @@
   #post-meta
     .meta-firstline
       if (theme.post_meta.post.date_type)
-        if (theme.post_meta.post.date_type === 'both')
-          time.post-meta__date
-            span.post-meta__date-created(title= _p('post.created')+' '+full_date(page.date))
-              i.fa.fa-calendar(aria-hidden="true")
-              =' '+_p('post.created')+' '+date(page.date, config.date_format)
-            span.post-meta__separator |
-            span.post-meta__date-updated(title= _p('post.updated')+' '+full_date(page.updated))
-              i.fa.fa-history(aria-hidden="true")
-              =' '+_p('post.updated')+' '+date(page.updated, config.date_format)
-        else
-          - var data_type_update = theme.post_meta.post.date_type === 'updated'
-          - var date_type = data_type_update ? 'updated' : 'date'
-          - var date_icon = data_type_update ? 'fa-history' :'fa-calendar'
-          - var data_info = data_type_update ? _p('post.updated') : _p('post.created')
-          time.post-meta__date(title=data_info + ' ' + full_date(page[date_type]))
-            i.fa(class=date_icon aria-hidden="true")
-            =' ' + data_info + ' ' + date(page[date_type], config.date_format)
-                
+        span.post-meta-date
+          if (theme.post_meta.post.date_type === 'both')
+            i.far.fa-calendar-alt.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.created')
+            time.post-meta-date-created(datetime=date_xml(page.date) title=_p('post.created') + ' ' + full_date(page.date))=date(page.date, config.date_format)
+            span.post-meta-separator |
+            i.fas.fa-history.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.updated')
+            time.post-meta-date-updated(datetime=date_xml(page.updated) title=_p('post.updated') + ' ' + full_date(page.updated))=date(page.updated, config.date_format)
+          else
+            - let data_type_update = theme.post_meta.post.date_type === 'updated'
+            - let date_type = data_type_update ? 'updated' : 'date'
+            - let date_icon = data_type_update ? 'fas fa-history' :'far fa-calendar-alt'
+            - let data_info = data_type_update ? _p('post.updated') : _p('post.created')
+            i.fa-fw.post-meta-icon(class=date_icon)
+            span.post-meta-label= data_info
+            time(datetime=date_xml(page[date_type]) title=date_title + ' ' + full_date(page[date_type]))=date(page[date_type], config.date_format)
       if (theme.post_meta.post.categories && page.categories.data.length > 0)
-        span.post-meta__categories
+        span.post-meta-categories
           if (theme.post_meta.post.date_type)
-            span.post-meta__separator |
+            span.post-meta-separator |
 
           each item, index in page.categories.data
-            i.fa.fa-inbox.post-meta__icon(aria-hidden="true")
-            a(href=url_for(item.path)).post-meta__categories #[=item.name]
+            i.fas.fa-inbox.fa-fw.post-meta-icon
+            a(href=url_for(item.path)).post-meta-categories #[=item.name]
             if (index < page.categories.data.length - 1)
-              i.fa.fa-angle-right.post-meta__separator(aria-hidden="true")
+              i.fas.fa-angle-right.post-meta-separator
 
     .meta-secondline  
       - let postWordcount = theme.wordcount.enable && (theme.wordcount.post_wordcount || theme.wordcount.min2read)
       if (postWordcount)
+        span.post-meta-separator |
         span.post-meta-wordcount
           if theme.wordcount.post_wordcount
-            - var wordCountIcon = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-file-word' : 'fa fa-file-word-o'
-            i.post-meta__icon(class=wordCountIcon aria-hidden="true")
-            span= _p('post.wordcount') + ':'
+            i.far.fa-file-word.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.wordcount') + ':'
             span.word-count= wordcount(page.content)
             if theme.wordcount.min2read
-              span.post-meta__separator |
+              span.post-meta-separator |
           if theme.wordcount.min2read
-            - var readCountIcon = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-clock' : 'fa fa-clock-o'
-            i.post-meta__icon(class=readCountIcon aria-hidden="true")
-            span= _p('post.min2read', min2read(page.content, {cn: 350, en: 160}))
+            i.far.fa-clock.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.min2read') + ':'
+            span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
     
-    .meta-thirdline
-      span.post-meta-pv-cv
-        if (postWordcount && theme.busuanzi.page_pv)
-          span.post-meta__separator |
-        if theme.busuanzi.page_pv
-          i.fa.fa-eye.post-meta__icon(aria-hidden="true") 
-          span=_p('post.page_pv') + ':'
+      if theme.busuanzi.page_pv
+        span.post-meta-separator |
+        span.post-meta-pv-cv
+          i.far.fa-eye.fa-fw.post-meta-icon
+          span.post-meta-label=_p('post.page_pv') + ':'
           span#busuanzi_value_page_pv
 
-      span.post-meta-commentcount
-        - var commentCount = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-comments' : 'fa fa-comment-o'
-        if ((theme.disqus && theme.disqus.enable && theme.disqus.count && page.comments !== false) || (theme.disqusjs && theme.disqusjs.enable && theme.disqusjs.count && page.comments !== false))
-          if (postWordcount || theme.busuanzi.page_pv)
-            span.post-meta__separator |
-          i.post-meta__icon(class=commentCount aria-hidden="true")
-          span= _p('post.comments') + ':'
-          span.disqus-comment-count.comment-count
-            a(href=full_url_for(page.path) + '#disqus_thread')
-        else if (theme.valine && theme.valine.enable && theme.valine.count && page.comments !== false)
-          if (postWordcount || theme.busuanzi.page_pv)
-            span.post-meta__separator |
-          i.post-meta__icon(class=commentCount aria-hidden="true")
-          span= _p('post.comments') + ':'
-          a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
-            span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-        else if (theme.gitalk && theme.gitalk.enable && theme.gitalk.count && page.comments !== false)
-          if (postWordcount || theme.busuanzi.page_pv)
-            span.post-meta__separator |
-          i.post-meta__icon(class=commentCount aria-hidden="true")
-          span= _p('post.comments') + ':'
-          a(href=url_for(page.path) + '#post-comment')
-            span.gitalk-comment-count.comment-count
-        else if theme.facebook_comments.enable && theme.facebook_comments.count && page.comments !== false
-          if (postWordcount || theme.busuanzi.page_pv)
-            span.post-meta__separator |
-          i.post-meta__icon(class=commentCount aria-hidden="true")
-          span= _p('post.comments') + ':'
-          a.comment-count(href=url_for(page.path) + '#post-comment')
-            span.fb-comments-count(data-href=urlNoIndex())
+      if !theme.comments.lazyload && page.comments !== false && theme.comments.use && theme.comments.count
+        - var whichCount = theme.comments.use[0]
+        if whichCount !== 'Livere' && whichCount !== 'Utterances'
+          span.post-meta-separator |
+          span.post-meta-commentcount
+            if whichCount === 'Disqus' || whichCount === 'Disqusjs'
+              i.far.fa-comments.fa-fw.post-meta-icon
+              span.post-meta-label= _p('post.comments') + ':'
+              span.disqus-comment-count.comment-count
+                a(href=full_url_for(page.path) + '#disqus_thread')
+            else if whichCount === 'Valine'
+              i.far.fa-comments.fa-fw.post-meta-icon
+              span.post-meta-label= _p('post.comments') + ':'
+              a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
+                span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+            else if whichCount === 'Gitalk'
+              i.far.fa-comments.fa-fw.post-meta-icon
+              span.post-meta-label= _p('post.comments') + ':'
+              a(href=url_for(page.path) + '#post-comment')
+                span.gitalk-comment-count.comment-count
+            else if whichCount === 'Facebook Comments'
+              i.far.fa-comments.fa-fw.post-meta-icon
+              span.post-meta-label= _p('post.comments') + ':'
+              a.comment-count(href=url_for(page.path) + '#post-comment')
+                span.fb-comments-count(data-href=urlNoIndex())

layout/includes/header/social.pug

@@ -1,4 +1,4 @@
 each url, icon in theme.social
-  a.social-icon(href=trim(url.split('||')[0]) target="_blank" 
+  a.social-icon(href=url_for(trim(url.split('||')[0])) target="_blank" 
   title=url.split('||')[1] === undefined ? '' : trim(url.split('||')[1]))
-    i(class=icon aria-hidden="true")
+    i(class=icon)

layout/includes/layout.pug

@@ -8,17 +8,14 @@ html(lang=config.language data-theme=theme.display_mode)
     if theme.preloader
       !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
 
-    if theme.fireworks && theme.fireworks.enable
-      canvas.fireworks
-
     !=partial('includes/mobile-sidebar/index', {}, {cache:theme.fragment_cache})
 
-    include ./sidebar.pug
-
     #body-wrap
       if theme.background
-        - var is_photo = theme.background.substring(3,0) === 'url' ? 'photo':'color'
+        - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
         #web_bg(data-type=is_photo)
+
+      include ./sidebar.pug
       include ./header/index.pug
 
       if (!is_post())
@@ -41,5 +38,5 @@ html(lang=config.language data-theme=theme.display_mode)
         !=partial('includes/footer', {}, {cache:theme.fragment_cache})
 
     include ./rightside.pug
-    !=partial('includes/search/index', {}, {cache:theme.fragment_cache})
+    !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache})
     include ./additional-js.pug

layout/includes/math/mathjax.pug

@@ -1,27 +0,0 @@
-script(type="text/x-mathjax-config").
-  MathJax.Hub.Config({
-    tex2jax: {
-      inlineMath: [ ['$','$'], ["\\(","\\)"]  ],
-      processEscapes: true,
-      skipTags: ['script', 'noscript', 'style', 'textarea', 'pre', 'code']
-    },
-    CommonHTML: {
-      linebreaks: { automatic: true, width: "90% container" }
-    },
-    "HTML-CSS": { 
-      linebreaks: { automatic: true, width: "90% container" }
-    },
-    "SVG": { 
-      linebreaks: { automatic: true, width: "90% container" }
-    }
-  });
-
-script(type="text/x-mathjax-config").
-  MathJax.Hub.Queue(function() {
-    var all = MathJax.Hub.getAllJax(), i;
-    for (i=0; i < all.length; i += 1) {
-      all[i].SourceElement().parentNode.className += ' has-jax';
-    }
-  });
-
-script(src=theme.CDN.mathjax)

layout/includes/math/mermaid.pug

@@ -1,8 +0,0 @@
-script.
-  if (document.getElementsByClassName('mermaid').length) {
-    loadScript('!{theme.CDN.mermaid}',function () {
-      mermaid.initialize({
-        theme: '!{theme.mermaid.theme}',
-    })
-  })
-  }

layout/includes/mixins/article-sort.pug

@@ -2,19 +2,22 @@ mixin articleSort(posts)
   .article-sort
     - var year
     - posts.each(function (article) {
-      - var tempYear = date(article.date, 'YYYY')
-      - var no_cover = article.cover === false || !theme.cover.archives_enable ? 'no-article-cover' : ''
+      - let tempYear = date(article.date, 'YYYY')
+      - let no_cover = article.cover === false || !theme.cover.archives_enable ? 'no-article-cover' : ''
+      - let title = article.title || _p('no_title')
       if tempYear !== year
         - year = tempYear
         .article-sort-item.year= year
       .article-sort-item(class=no_cover)
         if article.cover && theme.cover.archives_enable
-          .article-sort-img
-            a.article-sort-item__img(href=url_for(article.path))
-              img(src=url_for(article.cover) alt=article.title || 'No Title' onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'`)
-        .article-sort-post
-          a.article-sort-item__post(href=url_for(article.path))
-            i.fa.fa-clock-o(aria-hidden="true")
-            time.article-sort-item__time(title=_p('post.created') + ' ' + full_date(article.date))= date(article.date, config.date_format)
-            .article-sort-item__title= article.title || 'No Title'
+          a.article-sort-item-img(href=url_for(article.path) title=title)
+            if theme.lazyload.enable
+              img(data-lazy-src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
+            else
+              img(src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`)
+        .article-sort-item-info
+          .article-sort-item-time
+            i.far.fa-calendar-alt
+            time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))= date(article.date, config.date_format)
+          a.article-sort-item-title(href=url_for(article.path) title=title)= title
     - })

layout/includes/mixins/post-ui.pug

@@ -1,67 +1,77 @@
 mixin postUI(posts)
   each article , index in page.posts.data
     .recent-post-item
-      - var link = article.link || article.path
-      - var title = article.title || _p('no_title')
-      - var leftOrRight = index%2 == 0 ? 'left_radius' : 'right_radius'
-      - var post_cover = article.cover
-      - var no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
+      - let link = article.link || article.path
+      - let title = article.title || _p('no_title')
+      - let leftOrRight = index%2 == 0 ? 'left_radius' : 'right_radius'
+      - let post_cover = article.cover
+      - let no_cover = article.cover === false || !theme.cover.index_enable ? 'no-cover' : ''
       if post_cover && theme.cover.index_enable
         .post_cover(class=leftOrRight)
           a(href=url_for(link) title=title)      
-            if theme.lazyload
-              img.post_bg(data-src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
+            if theme.lazyload.enable
+              img.post_bg(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title)
             else
-              img.post_bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
+              img.post_bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.error_img.post_page) + `'` alt=title)
       .recent-post-info(class=no_cover)
         a.article-title(href=url_for(link) title=title)= title
         .article-meta-wrap
           if (is_home() && (article.top || article.sticky > 0))
             span.article-meta
-              i.fa.fa-thumb-tack.article-meta__icon.sticky
+              i.fas.fa-thumbtack.article-meta__icon.sticky
               span.sticky= _p('sticky')
               span.article-meta__separator |
           if (theme.post_meta.page.date_type)
-            if (theme.post_meta.page.date_type === 'both')
-              time.post-meta__date
-                span.post-meta__date-created(title=_p('post.created') + ' ' + full_date(article.date))
-                  i.fa.fa-calendar(aria-hidden="true")
-                  =date(article.date, config.date_format)
+            span.post-meta-date
+              if (theme.post_meta.page.date_type === 'both')               
+                i.far.fa-calendar-alt
+                span.article-meta-label=_p('post.created')
+                time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))=date(article.date, config.date_format)
                 span.article-meta__separator |
-                span.post-meta__date-updated(title=_p('post.updated') + ' ' + full_date(article.updated))
-                  i.fa.fa-history(aria-hidden="true")
-                  =date(article.updated, config.date_format)
-            else
-              - var data_type_updated = theme.post_meta.page.date_type === 'updated'
-              - var date_type = data_type_updated ? 'updated' : 'date'
-              - var date_icon = data_type_updated ? 'fa-history' :'fa-calendar'
-              - var date_title = data_type_updated ? _p('post.updated') : _p('post.created')
-              time.post-meta__date(title=date_title + ' ' + full_date(article[date_type]))
-                i.fa(class=date_icon aria-hidden="true")
-                =date(article[date_type], config.date_format)
+                i.fas.fa-history
+                span.article-meta-label=_p('post.updated')
+                time.post-meta-date-updated(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated))=date(article.updated, config.date_format)
+              else
+                - let data_type_updated = theme.post_meta.page.date_type === 'updated'
+                - let date_type = data_type_updated ? 'updated' : 'date'
+                - let date_icon = data_type_updated ? 'fas fa-history' :'far fa-calendar-alt'
+                - let date_title = data_type_updated ? _p('post.updated') : _p('post.created')
+                i(class=date_icon)
+                span.article-meta-label=date_title
+                time(datetime=date_xml(article[date_type]) title=date_title + ' ' + full_date(article[date_type]))=date(article[date_type], config.date_format)
           if (theme.post_meta.page.categories && article.categories.data.length > 0)
             span.article-meta
               span.article-meta__separator |
+              i.fas.fa-inbox.article-meta__icon
               each item, index in article.categories.data
-                i.fa.fa-inbox.article-meta__icon(aria-hidden="true")
                 a(href=url_for(item.path)).article-meta__categories #[=item.name]
                 if (index < article.categories.data.length - 1)
-                    i.fa.fa-angle-right(aria-hidden="true")
+                  i.fas.fa-angle-right
           if (theme.post_meta.page.tags && article.tags.data.length > 0)
             span.article-meta.tags
               span.article-meta__separator |
+              i.fas.fa-tag.article-meta__icon
               each item, index in article.tags.data
-                i.fa.fa-tag.article-meta__icon(aria-hidden="true")
                 a(href=url_for(item.path)).article-meta__tags #[=item.name]
                 if (index < article.tags.data.length - 1)
-                  span.article-meta__link -
-        if theme.auto_excerpt && theme.auto_excerpt.enable
-          - const content = strip_html(article.content)
-          - let expert = content.substring(0, theme.auto_excerpt.length) 
-          - content.length > theme.auto_excerpt.length ? expert += ' ...' : ''
-          .content!= expert
-        else
+                  span.article-meta__link #[='•']
+
+        //- Display the article introduction on homepage
+        if theme.index_post_content.method == 1
           .content!= article.description
+        else if theme.index_post_content.method == 2
+          if article.description
+            .content!= article.description
+          else
+            - const content = strip_html(article.content)
+            - let expert = content.substring(0, theme.index_post_content.length) 
+            - content.length > theme.index_post_content.length ? expert += ' ...' : ''
+            .content!= expert
+        else
+          - const content = strip_html(article.content)
+          - let expert = content.substring(0, theme.index_post_content.length) 
+          - content.length > theme.index_post_content.length ? expert += ' ...' : ''
+          .content!= expert
 
     if theme.ad && theme.ad.index
       if (index + 1) % 3 == 0

layout/includes/mobile-sidebar/mobile-menus.pug

@@ -1,6 +1,9 @@
 #mobile-sidebar-menus
   .mobile_author_icon
-    img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.lodding_bg.flink}'` alt="avatar")
+    if theme.lazyload.enable
+      img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+    else
+      img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
   .mobile_post_data
     if site.posts.length
       .mobile_data_item.is-center

layout/includes/pagination.pug

@@ -1,7 +1,7 @@
 -
   var options = {
-    prev_text: '<i class="fa fa-fw fa-chevron-left" aria-hidden="true"></i>',
-    next_text: '<i class="fa fa-fw fa-chevron-right" aria-hidden="true"></i>',
+    prev_text: '<i class="fas fa-chevron-left fa-fw"></i>',
+    next_text: '<i class="fas fa-chevron-right fa-fw"></i>',
     mid_size: 1,
     escape: false
   }
@@ -11,29 +11,29 @@ if(!is_post())
     div.pagination
       !=paginator(options)
 else
-  nav#pagination.pagination_post
+  nav#pagination.pagination-post
     if(page.prev)
-      - var hasPageNext = page.prev ? 'pull_left' : 'pull-full'
+      - var hasPageNext = page.next ? 'pull-left' : 'pull-full'
       .prev-post(class=hasPageNext)
         - var pagination_cover = page.prev.cover === false ? page.prev.randomcover : page.prev.cover
         a(href=url_for(page.prev.path))
-          if theme.lazyload
-            img.prev_cover(data-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.lodding_bg.post_page)}'` )
+          if theme.lazyload.enable
+            img.prev-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` )
           else
-            img.prev_cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.lodding_bg.post_page)}'` )
+            img.prev-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` )
           .pagination-info
             .label=_p('pagination.prev')
             .prev_info=page.prev.title
           
     if(page.next)
-      - var hasPagePrev = page.prev ? 'pull_right' : 'pull-full'
+      - var hasPagePrev = page.prev ? 'pull-right' : 'pull-full'
       - var pagination_cover = page.next.cover == false ? page.next.randomcover : page.next.cover
       .next-post(class=hasPagePrev)
         a(href=url_for(page.next.path))
-          if theme.lazyload
-            img.next_cover(data-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.lodding_bg.post_page)}'`)
+          if theme.lazyload.enable
+            img.next-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'`)
           else
-            img.next_cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.lodding_bg.post_page)}'`)
+            img.next-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'`)
           .pagination-info
             .label=_p('pagination.next')
             .next_info=page.next.title 

layout/includes/post/post-copyright.pug

@@ -1,13 +1,17 @@
-if (theme.post_copyright && theme.post_copyright.enable && page.copyright != false)
+if theme.post_copyright.enable && page.copyright !== false
+  - let author = page.copyright_author ? page.copyright_author : config.author
+  - let authorHref = page.copyright_author_href ? page.copyright_author_href : `mailto:${config.email}`
+  - let url = page.copyright_url ? page.copyright_url : page.permalink
+  - let info = page.copyright_info ? page.copyright_info : _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
   .post-copyright
     .post-copyright__author
       span.post-copyright-meta= _p('post.copyright.author') + ": "
       span.post-copyright-info
-        a(href=`mailto:${config.email}`) #[=config.author]
+        a(href=authorHref)=author
     .post-copyright__type
       span.post-copyright-meta= _p('post.copyright.link') + ": "
       span.post-copyright-info
-        a(href=url_for(page.permalink))= theme.post_copyright.decode ? decodeURI(page.permalink) : page.permalink
+        a(href=url_for(url))= theme.post_copyright.decode ? decodeURI(url) : url
     .post-copyright__notice
       span.post-copyright-meta= _p('post.copyright.copyright_notice') + ": "
-      span.post-copyright-info!= _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
+      span.post-copyright-info!= info

layout/includes/post/reward.pug

@@ -1,11 +1,16 @@
 .post-reward
-  a.reward-button.button--primary.button--animated 
-    i.fa.fa-qrcode
+  .reward-button
+    i.fas.fa-qrcode
     = ' ' + _p('donate')
     .reward-main
       ul.reward-all
         each item in theme.reward.QR_code
+          - var clickTo = (item.itemlist||item).link ? (item.itemlist||item).link : (item.itemlist||item).img
           li.reward-item
-            img.post-qr-code__img(src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text)
-            .post-qr-code__desc=(item.itemlist||item).text
+            a(href=clickTo target='_blank')
+              if theme.lazyload.enable
+                img.post-qr-code-img(data-lazy-src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text)
+              else
+                img.post-qr-code-img(src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text)
+            .post-qr-code-desc=(item.itemlist||item).text
 

layout/includes/rightside.pug

@@ -1,23 +1,32 @@
-section#rightside.rightside
+section#rightside
   #rightside-config-hide
-    if theme.readmode.enable && is_post()
-      i#readmode.fa.fa-book(title=_p('rightside.readmode_title'))
     if is_post()
-      i#font_plus.fa.fa-plus(title=_p('rightside.font_plus_title'))
-      i#font_minus.fa.fa-minus(title=_p('rightside.font_minus_title'))
+      if theme.readmode
+        button#readmode(type="button" title=_p('rightside.readmode_title'))
+          i.fas.fa-book-open
+      button#font_plus(type="button" title=_p('rightside.font_plus_title'))
+        i.fas.fa-plus
+      button#font_minus(type="button" title=_p('rightside.font_minus_title'))
+        i.fas.fa-minus
     if theme.translate && theme.translate.enable
-      a#translateLink.translate_chn_to_cht(href="javascript:translatePage();" title=_p('rightside.translate_title') target="_self")= theme.translate.default
+      button#translateLink(type="button" title=_p('rightside.translate_title'))= theme.translate.default
     if theme.darkmode.enable && theme.darkmode.button
-      - var lightModeIcon = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-sun' : 'fa fa-sun-o'
-      - var darkModeIcon = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-moon' : 'fa fa-moon-o'
-      - var display_mode = theme.display_mode == 'dark' ? lightModeIcon : darkModeIcon
-      i#darkmode.darkmode(class=display_mode title=_p('rightside.night_mode_title'))
+      button#darkmode(type="button" title=_p('rightside.night_mode_title'))
+        i.fas.fa-adjust
   #rightside-config-show
-    #rightside_config(title=_p("rightside.setting"))
-      i.fa.fa-cog(aria-hidden="true")
-    if is_post() && page.comments !== false && isComment
+    button#rightside_config(type="button" title=_p("rightside.setting"))
+      i.fas.fa-cog
+    if is_post() && page.comments !== false && theme.comments.use
       a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
-        i.scroll_to_comment.fa.fa-comments   
-    if is_post() && page.toc !== false && theme.toc.enable && (toc(page.content) !== '' || page.encrypt == true )
-      i#mobile-toc-button.fa.fa-list-ul.close(title=_p("rightside.toc") aria-hidden="true")
-    i.fa.fa-arrow-up#go-up(title=_p("rightside.back_to_top") aria-hidden="true")
+        i.fas.fa-comments
+    if showToc
+      button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
+        i.fas.fa-list-ul
+    if theme.chat_btn
+      button#chat_btn(type="button" title=_p("rightside.chat_btn"))
+        i.fas.fa-sms
+
+    button#go-up(type="button" title=_p("rightside.back_to_top"))
+      i.fas.fa-arrow-up
+
+

layout/includes/search/index.pug

@@ -1,5 +0,0 @@
-if (theme.algolia_search.enable)
-  include ./algolia.pug
-if (theme.local_search)
-  if (!theme.algolia_search.enable && theme.local_search.enable)
-    include ./local-search.pug

layout/includes/share/index.pug

@@ -1,7 +0,0 @@
-.post_share
-  if theme.addThis.enable
-    include ./add-this.pug
-  else if theme.sharejs && theme.sharejs.enable
-    include ./share-js.pug
-  else if theme.addtoany.enable
-    include ./addtoany.pug

layout/includes/share/share-js.pug

@@ -1,4 +0,0 @@
-if (theme.sharejs && theme.sharejs.enable)
-  .social-share(data-image=url_for(page.cover|| theme.avatar.img) data-sites= theme.sharejs.sites)
-  link(rel="stylesheet" href=url_for(theme.CDN.sharejs_css))
-  script(src=url_for(theme.CDN.sharejs))

layout/includes/sidebar.pug

@@ -1,16 +1,12 @@
-- let showToc = is_post() && page.toc !== false && theme.toc.enable && (toc(page.content) !== '' || page.encrypt == true )
-- let autoOpenSidebar = theme.auto_open_sidebar.enable === true ? 'on' : ''
-
 -
-  let tocNumber
-  if (page.toc_number !== undefined) tocNumber = page.toc_number
-  else if (theme.toc.number !== undefined) tocNumber = theme.toc.number
-  else tocNumber = true
+  let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
+  let autoOpenPostSet = page.auto_open == undefined ? theme.toc.auto_open : page.auto_open
+  let autoOpenSidebar = autoOpenPostSet ? 'on' : ''
 -
 
 if(showToc)
-  i.fa.fa-arrow-right#toggle-sidebar(aria-hidden="true" class=autoOpenSidebar)      
   #sidebar
+    i.fas.fa-arrow-right#toggle-sidebar(class=autoOpenSidebar)
     .sidebar-toc
       div.sidebar-toc__title= _p('sidebar.catalog')
       div.sidebar-toc__progress

layout/includes/third-party/canvas-nest.pug

@@ -1 +0,0 @@
-script#canvas_nest(color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.CDN.canvas_nest))

layout/includes/third-party/canvas-ribbon-piao.pug

@@ -1 +0,0 @@
-script(id="ribbon_piao" mobile=`${theme.canvas_ribbon_piao.mobile}` src=url_for(theme.CDN.canvas_ribbon_piao))

layout/includes/third-party/canvas-ribbon.pug

@@ -1,3 +0,0 @@
-script(defer id="ribbon" src=url_for(theme.CDN.canvas_ribbon) size=theme.canvas_ribbon.size
-alpha=theme.canvas_ribbon.alpha zIndex=theme.canvas_ribbon.zIndex mobile=`${theme.canvas_ribbon.mobile}` data-click=`${theme.canvas_ribbon.click_to_change}`)
-

layout/includes/third-party/chat/chatra.pug

@@ -0,0 +1,33 @@
+//- https://chatra.io/help/api/
+script.
+  (function(d, w, c) {
+      w.ChatraID = '#{theme.chatra.id}';
+      var s = d.createElement('script');
+      w[c] = w[c] || function() {
+          (w[c].q = w[c].q || []).push(arguments);
+      };
+      s.async = true;
+      s.src = 'https://call.chatra.io/chatra.js';
+      if (d.head) d.head.appendChild(s);
+  })(document, window, 'Chatra');
+
+  if (!{theme.chat_btn}) {
+    var chatBtnFn = () => {
+      var chatBtn = document.getElementById("chat_btn")
+      chatBtn.addEventListener("click", function(){
+        Chatra('openChat')
+      });
+    }
+    chatBtnFn()
+  } else {
+    if (!{theme.chat_hide_show}) {
+      function chatBtnHide () {
+        Chatra('hide')
+      }
+      function chatBtnShow () {
+        Chatra('show')
+      }
+    }
+  }
+
+

layout/includes/third-party/chat/crisp.pug

@@ -0,0 +1,36 @@
+script.
+  window.$crisp = [];
+  window.CRISP_WEBSITE_ID = "!{theme.crisp.website_id}";
+  (function () {
+    d = document;
+    s = d.createElement("script");
+    s.src = "https://client.crisp.chat/l.js";
+    s.async = 1;
+    d.getElementsByTagName("head")[0].appendChild(s);
+  })();
+  $crisp.push(["safe", true])
+
+  if (!{theme.chat_btn}) {
+    $crisp.push(["do", "chat:hide"])
+    $crisp.push(["on", "chat:closed", function() {
+      $crisp.push(["do", "chat:hide"])
+    }])
+    var chatBtnFn = () => {
+      var chatBtn = document.getElementById("chat_btn")
+      chatBtn.addEventListener("click", function(){
+        $crisp.push(["do", "chat:show"])
+        $crisp.push(["do", "chat:open"])
+
+      });
+    }
+    chatBtnFn()
+  } else {
+    if (!{theme.chat_hide_show}) {
+      function chatBtnHide () {
+        $crisp.push(["do", "chat:hide"])
+      }
+      function chatBtnShow () {
+        $crisp.push(["do", "chat:show"])
+      }
+    }
+  }

layout/includes/third-party/chat/daovoice.pug

@@ -0,0 +1,40 @@
+//- https://guide.daocloud.io/daovoice/javascript-api-5869833.html
+script.
+  (function(i,s,o,g,r,a,m){i["DaoVoiceObject"]=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;a.charset="utf-8";m.parentNode.insertBefore(a,m)})(window,document,"script",('https:' == document.location.protocol ? 'https:' : 'http:') + "//widget.daovoice.io/widget/!{theme.daovoice.app_id}.js","daovoice")
+
+script.
+  var isChatBtn = !{theme.chat_btn}
+  daovoice('init', {
+    app_id: '!{theme.daovoice.app_id}',},{
+    launcher: { 
+       disableLauncherIcon: isChatBtn // 悬浮 ICON 是否显示
+    },
+  });
+  daovoice('update');
+
+  if (isChatBtn) {
+    var chatBtnFn = () => {
+      var chatBtn = document.getElementById("chat_btn")
+      chatBtn.addEventListener("click", function(){
+        daovoice('show')
+      });
+    }
+    chatBtnFn()
+  } else {
+    if (!{theme.chat_hide_show}) {
+      function chatBtnHide () {
+        daovoice('update', {},{
+          launcher: { 
+          disableLauncherIcon: true // 悬浮 ICON 是否显示
+          },
+        });
+      }
+      function chatBtnShow () {
+        daovoice('update', {},{
+          launcher: { 
+          disableLauncherIcon: false // 悬浮 ICON 是否显示
+          },
+        });
+      }
+    }
+  }

layout/includes/third-party/chat/gitter.pug

@@ -0,0 +1,43 @@
+if theme.chat_btn
+  script.
+    ((window.gitter = {}).chat = {}).options = {
+      disableDefaultChat: true,
+    };
+    document.addEventListener('gitter-sidecar-ready', (e) => {
+      const GitterChat = e.detail.Chat
+      let chat
+
+      function initGitter () {
+        chat = new GitterChat({
+          room: '#{theme.gitter.room}',
+          activationElement: '#chat_btn'
+        });
+      }
+
+      initGitter()
+
+      if (!{theme.pjax}) {
+        document.addEventListener('pjax:complete', () => {
+          chat.destroy()
+          initGitter()
+        })
+      }
+
+    })
+else
+  script.
+    ((window.gitter = {}).chat = {}).options = {
+      room: '#{theme.gitter.room}',
+    };
+
+    if (!{theme.chat_hide_show}) {
+      function chatBtnHide () {
+        document.getElementsByClassName('gitter-open-chat-button')[0].style.display= 'none'
+      }
+
+      function chatBtnShow () {
+        document.getElementsByClassName('gitter-open-chat-button')[0].style.display= 'block'
+      }
+    }
+
+script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)

layout/includes/third-party/chat/index.pug

@@ -0,0 +1,10 @@
+if theme.chatra && theme.chatra.enable
+  include ./chatra.pug
+else if theme.tidio && theme.tidio.enable
+  include ./tidio.pug
+else if theme.daovoice && theme.daovoice.enable
+  include ./daovoice.pug
+else if theme.gitter && theme.gitter.enable
+  include ./gitter.pug
+else if theme.crisp && theme.crisp.enable
+  include ./crisp.pug

layout/includes/third-party/chat/tidio.pug

@@ -0,0 +1,41 @@
+script(src=`//code.tidio.co/${theme.tidio.public_key}.js` async)
+
+if theme.chat_btn
+  script.
+    function onTidioChatApiReady() {
+      window.tidioChatApi.hide();
+      window.tidioChatApi.on("close", function() {
+        window.tidioChatApi.hide();
+      });
+    }
+    if (window.tidioChatApi) {
+      window.tidioChatApi.on("ready", onTidioChatApiReady);
+    } else {
+      document.addEventListener("tidioChat-ready", onTidioChatApiReady);
+    }
+
+    var chatBtnFn = () => {
+      document.getElementById("chat_btn").addEventListener("click", function(){
+        window.tidioChatApi.show();
+        window.tidioChatApi.open();
+      });
+    }
+    chatBtnFn()
+
+else if theme.chat_hide_show
+  script.
+    function chatBtnHide () {
+      if (window.tidioChatApi) {
+        //- window.tidioChatApi.hide();
+        document.getElementById('tidio-chat').style.display= 'none'
+      }
+    }
+
+    function chatBtnShow () {
+      if (window.tidioChatApi) {
+        //- window.tidioChatApi.show();
+        document.getElementById('tidio-chat').style.display= 'block'
+      } 
+    }
+
+

layout/includes/third-party/comments/disqus.pug

@@ -0,0 +1,45 @@
+script.
+  function loadDisqus () {
+    var disqus_config = function () {
+      this.page.url = '!{ page.permalink }'
+      this.page.identifier = '!{ page.path }'
+      this.page.title = '!{ page.title }'
+    };
+
+    window.disqusReset = () => {
+      DISQUS.reset({
+        reload: true,
+        config: disqus_config
+      })
+    }
+
+    if (window.DISQUS) disqusReset()
+    else {
+      (function() { 
+        var d = document, s = d.createElement('script');
+        s.src = 'https://!{theme.disqus.shortname}.disqus.com/embed.js';
+        s.setAttribute('data-timestamp', +new Date());
+        (d.head || d.body).appendChild(s);
+      })();
+    }
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Disqus' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) loadComment(document.getElementById('disqus_thread'), loadDisqus)
+    else loadDisqus()
+  } else {
+    function loadOtherComment () {
+      loadDisqus()
+    }
+  }
+
+if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqus'
+  script.
+    if (window.DISQUSWIDGETS === undefined) {
+      var d = document, s = d.createElement('script');
+      s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
+      s.id = 'dsq-count-scr';
+      (d.head || d.body).appendChild(s);
+    } else {
+      DISQUSWIDGETS.getCount({reset: true});
+    }

layout/includes/third-party/comments/disqusjs.pug

@@ -0,0 +1,57 @@
+script.
+  function loadDisqusjs () {
+    function addDisqusjsCSS () {
+      const ele = document.createElement('link')
+      ele.rel = 'stylesheet'
+      ele.href= '!{url_for(theme.CDN.disqusjs_css)}'
+      document.getElementsByTagName('head')[0].appendChild(ele)
+    }
+
+    function initDisqusjs () {
+      window.DISQUS = null
+      new DisqusJS({
+        shortname: '!{theme.disqusjs.shortname}',
+        siteName: '!{theme.disqusjs.siteName}',
+        identifier: '!{ page.path }',
+        url: '!{ page.permalink }',
+        title: '!{ page.title }',
+        api: '!{theme.disqusjs.api}',
+        apikey: '!{theme.disqusjs.apikey}',
+        nocomment: '!{theme.disqusjs.nocomment}',
+        admin: '!{theme.disqusjs.admin}',
+        adminLabel: '!{theme.disqusjs.adminLabel}'
+      });
+    }
+
+    window.disqusReset = initDisqusjs
+
+    if (window.disqusJsLoad) initDisqusjs()
+    else {
+      addDisqusjsCSS()
+      $.getScript('!{url_for(theme.CDN.disqusjs)}', initDisqusjs)
+      window.disqusJsLoad = true
+    }
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) loadComment(document.getElementById('disqus_thread'), loadDisqusjs)
+    else loadDisqusjs()
+  }
+  else {
+    function loadOtherComment () {
+      loadDisqusjs()
+    }
+  }
+
+
+if is_post() && !theme.comments.lazyload && theme.comments.count && theme.comments.use[0] === 'Disqusjs'
+  script.
+    if (window.DISQUSWIDGETS === undefined) {
+      var d = document, s = d.createElement('script');
+      s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
+      s.id = 'dsq-count-scr';
+      (d.head || d.body).appendChild(s);
+    } else {
+      DISQUSWIDGETS.getCount({reset: true});
+    }
+

layout/includes/third-party/comments/facebook_comments.pug

@@ -0,0 +1,26 @@
+#fb-root
+script.
+  function loadFBComment () {
+    var themeNow = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
+    document.getElementsByClassName('fb-comments')[0].setAttribute('data-colorscheme',themeNow)
+
+    if (typeof FB === 'object') FB.XFBML.parse()
+    else {
+      let ele = document.createElement('script')
+      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v7.0')
+      ele.setAttribute('async', 'true')
+      ele.setAttribute('defer', 'true')
+      ele.setAttribute('crossorigin', 'anonymous')
+      document.getElementById('fb-root').insertAdjacentElement('afterbegin',ele)
+    }   
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Facebook Comments' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) loadComment(document.querySelector('#post-comment .fb-comments'), loadFBComment)
+    else loadFBComment()
+  } else {
+    function loadOtherComment () {
+      loadFBComment()
+    }
+  }
+

layout/includes/third-party/comments/gitalk.pug

@@ -0,0 +1,52 @@
+script.
+  function addGitalkSource () {
+    const ele = document.createElement('link')
+    ele.rel = 'stylesheet'
+    ele.href= '!{url_for(theme.CDN.gitalk_css)}'
+    document.getElementsByTagName('head')[0].appendChild(ele)
+  }
+
+  function loadGitalk () {
+    function initGitalk () {
+      var gitalk = new Gitalk({
+        clientID: '!{theme.gitalk.client_id}',
+        clientSecret: '!{theme.gitalk.client_secret}',
+        repo: '!{theme.gitalk.repo}',
+        owner: '!{theme.gitalk.owner}',
+        admin: ['!{theme.gitalk.admin}'],
+        id: '!{md5(page.path)}',
+        language: '!{theme.gitalk.language}',
+        perPage: !{theme.gitalk.perPage},
+        distractionFreeMode: !{theme.gitalk.distractionFreeMode},
+        pagerDirection: '!{theme.gitalk.pagerDirection}',
+        createIssueManually: !{theme.gitalk.createIssueManually},
+        updateCountCallback: commentCount
+      })
+      gitalk.render('gitalk-container')
+    }
+
+    if (typeof Gitalk === 'function') initGitalk()
+    else {
+      addGitalkSource()
+      $.getScript('!{url_for(theme.CDN.gitalk)}', initGitalk)
+    }
+  }
+  
+  function commentCount(n){
+    let isCommentCount = document.querySelector('#post-meta .gitalk-comment-count')
+    if (isCommentCount) {
+      isCommentCount.innerHTML= n
+    }
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) loadComment(document.getElementById('gitalk-container'), loadGitalk)
+    else loadGitalk()
+  } else {
+    function loadOtherComment () {
+      loadGitalk()
+    }
+  }
+
+
+

layout/includes/third-party/comments/index.pug

@@ -0,0 +1,38 @@
+- let defaultComment = theme.comments.use[0]
+hr
+#post-comment
+  .comment-head
+    .comment-headline
+      i.fas.fa-comments.fa-fw
+      span= ' ' + _p('comment')
+    
+    if theme.comments.use.length > 1
+      .comment-switch
+        span.first-comment=defaultComment
+        label
+          input#switch-comments-btn(type="checkbox")
+          span.slider
+        span.second-comment=theme.comments.use[1]
+
+
+  .comment-wrap
+    each name in theme.comments.use
+      div
+        case name
+          when 'Disqus'
+            #disqus_thread
+          when 'Valine'
+            #vcomment.vcomment
+          when 'Disqusjs'
+            #disqus_thread
+          when 'Livere'
+            #lv-container(data-id="city" data-uid=theme.livere.uid)
+          when 'Gitalk'
+            #gitalk-container
+          when 'Utterances'
+            #utterances-wrap
+          when 'Facebook Comments'
+            .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
+                        data-numposts= theme.facebook_comments.pageSize || 10
+                        data-order-by= theme.facebook_comments.order_by || 'social'
+                        data-width="100%")

layout/includes/third-party/comments/js.pug

@@ -0,0 +1,16 @@
+each name in theme.comments.use
+  case name
+    when 'Valine'
+      !=partial('includes/third-party/comments/valine', {}, {cache:theme.fragment_cache})
+    when 'Disqus'
+      include ./disqus.pug
+    when 'Disqusjs'
+      include ./disqusjs.pug
+    when 'Livere'
+      !=partial('includes/third-party/comments/livere', {}, {cache:theme.fragment_cache})
+    when 'Gitalk'
+      include ./gitalk.pug
+    when 'Utterances'
+      !=partial('includes/third-party/comments/utterances', {}, {cache:theme.fragment_cache})
+    when 'Facebook Comments'
+      !=partial('includes/third-party/comments/facebook_comments', {}, {cache:theme.fragment_cache})

layout/includes/third-party/comments/livere.pug

@@ -0,0 +1,26 @@
+script.
+  function loadLivere () {
+    if (typeof LivereTower === 'object') {
+      window.LivereTower.init()
+    }
+    else {
+      (function(d, s) {
+          var j, e = d.getElementsByTagName(s)[0];
+          if (typeof LivereTower === 'function') { return; }
+          j = d.createElement(s);
+          j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
+          j.async = true;
+          e.parentNode.insertBefore(j, e);
+      })(document, 'script');
+    }
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) loadComment(document.getElementById('lv-container'), loadLivere)
+    else loadLivere()
+  }
+  else {
+    function loadOtherComment () {
+      loadLivere()
+    }
+  }

layout/includes/third-party/comments/utterances.pug

@@ -0,0 +1,34 @@
+script.
+  function loadUtterances () {
+    let ele = document.createElement('script')
+    ele.setAttribute('id', 'utterances_comment')
+    ele.setAttribute('src', '!{url_for(theme.CDN.utterances)}')
+    ele.setAttribute('repo', '!{theme.utterances.repo}')
+    ele.setAttribute('issue-term', '!{theme.utterances.issue_term}')
+    let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
+    ele.setAttribute('theme', nowTheme)
+    ele.setAttribute('crossorigin', 'anonymous')
+    ele.setAttribute('async', 'true')
+    document.getElementById('utterances-wrap').insertAdjacentElement('afterbegin',ele)
+  }
+
+  function utterancesTheme () {
+    if (document.querySelector('.utterances-frame')) {
+      const theme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'
+      const message = {
+        type: 'set-theme',
+        theme: theme
+      };
+      const iframe = document.querySelector('.utterances-frame');
+      iframe.contentWindow.postMessage(message, 'https://utteranc.es');
+    }
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Utterances' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) loadComment(document.getElementById('utterances-wrap'), loadUtterances)
+    else loadUtterances()
+  } else {
+    function loadOtherComment () {
+      loadUtterances()
+    }
+  }

layout/includes/third-party/comments/valine.pug

@@ -0,0 +1,40 @@
+- let emojiMaps = '""'
+if site.data.valine
+  - emojiMaps = JSON.stringify(site.data.valine)
+
+script.
+  function loadValine () {
+    function initValine () {
+      window.valine = new Valine({
+        el: '#vcomment',
+        appId: '#{theme.valine.appId}',
+        appKey: '#{theme.valine.appKey}',
+        placeholder: '#{theme.valine.placeholder}',
+        avatar: '#{theme.valine.avatar}',
+        meta: '#{theme.valine.guest_info }'.split(','),
+        pageSize: '#{theme.valine.pageSize}',
+        lang: '#{theme.valine.lang}',
+        recordIP: #{theme.valine.recordIP},
+        serverURLs: '#{theme.valine.serverURLs}',
+        emojiCDN: '#{theme.valine.emojiCDN}',
+        emojiMaps: !{emojiMaps},
+        enableQQ: #{theme.valine.enableQQ},
+        path: window.location.pathname,
+      });
+      if ('#{theme.valine.requiredFields}') { valine.config.requiredFields= '#{theme.valine.requiredFields}'.split(',') }
+    }
+
+    if (typeof Valine === 'function') initValine() 
+    else $.getScript('!{url_for(theme.CDN.valine)}', initValine)
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) loadComment(document.querySelector('#vcomment'),loadValine)
+    else setTimeout(() => loadValine(), 0)
+  } else {
+    function loadOtherComment () {
+      loadValine()
+    }
+  }
+  
+

layout/includes/third-party/effect.pug

@@ -0,0 +1,28 @@
+if theme.fireworks && theme.fireworks.enable
+  canvas.fireworks
+  script(src=url_for(theme.CDN.anime))
+  script(src=url_for(theme.CDN.fireworks))
+
+if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
+  script(defer id="ribbon" src=url_for(theme.CDN.canvas_ribbon) size=theme.canvas_ribbon.size
+  alpha=theme.canvas_ribbon.alpha zIndex=theme.canvas_ribbon.zIndex mobile=`${theme.canvas_ribbon.mobile}` data-click=`${theme.canvas_ribbon.click_to_change}`)
+
+if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable)
+  script(defer id="ribbon_piao" mobile=`${theme.canvas_ribbon_piao.mobile}` src=url_for(theme.CDN.canvas_ribbon_piao))
+
+if (theme.canvas_nest && theme.canvas_nest.enable)
+  script#canvas_nest(defer color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.CDN.canvas_nest))
+
+if theme.activate_power_mode.enable
+  script(src=url_for(theme.CDN.activate_power_mode))
+  script.
+    POWERMODE.colorful = #{theme.activate_power_mode.colorful};
+    POWERMODE.shake = #{theme.activate_power_mode.shake};
+    document.body.addEventListener('input', POWERMODE);
+
+//- 鼠標特效
+if theme.click_heart
+  script(src=url_for(theme.CDN.click_heart) async)
+
+if theme.ClickShowText && theme.ClickShowText.enable
+  script(src=url_for(theme.CDN.ClickShowText) async)

layout/includes/third-party/math/index.pug

@@ -13,3 +13,6 @@ if theme.katex && theme.katex.enable
   else
     if page.katex
       include ./katex.pug
+
+if theme.mermaid.enable
+  include ./mermaid.pug

layout/includes/third-party/math/mathjax.pug

@@ -0,0 +1,45 @@
+//- Mathjax 3
+//- http://docs.mathjax.org/en/latest/upgrading/v2.html#changes-in-the-mathjax-api
+//- https://github.com/mathjax/MathJax/issues/2209
+//- http://docs.mathjax.org/en/latest/options/input/tex.html#the-configuration-block
+//- http://docs.mathjax.org/en/latest/web/typeset.html#resetting-automatic-equation-numbering
+
+script.
+  if (!window.MathJax) {
+    window.MathJax = {
+      loader: {
+        source: {
+          '[tex]/amsCd': '[tex]/amscd'
+        }
+      },
+      tex: {
+        inlineMath: [ ['$','$'], ["\\(","\\)"]],
+        tags: 'ams'
+      },
+      options: {
+        renderActions: {
+          findScript: [10, doc => {
+            for (const node of document.querySelectorAll('script[type^="math/tex"]')) {
+              const display = !!node.type.match(/; *mode=display/)
+              const math = new doc.options.MathItem(node.textContent, doc.inputJax[0], display)
+              const text = document.createTextNode('')
+              node.parentNode.replaceChild(text, node)
+              math.start = {node: text, delim: '', n: 0}
+              math.end = {node: text, delim: '', n: 0}
+              doc.math.push(math)
+            }
+          }, '']
+        }
+      }
+    }
+    
+    var script = document.createElement('script')
+    script.src = '!{theme.CDN.mathjax}'
+    script.id = 'MathJax-script'
+    script.async = true
+    document.head.appendChild(script)
+  } else {
+    MathJax.startup.document.state(0)
+    MathJax.texReset()
+    MathJax.typeset()
+  }

layout/includes/third-party/math/mermaid.pug

@@ -0,0 +1,15 @@
+script.
+  if (document.getElementsByClassName('mermaid').length) {
+    if (window.mermaidJsLoad) mermaid.init()
+    else {
+      $.getScript('!{theme.CDN.mermaid}', function () {
+        window.mermaidJsLoad = true
+        mermaid.initialize({
+          theme: '!{theme.mermaid.theme}',
+        })
+        !{theme.pjax} && mermaid.init()
+      })
+    }
+  }
+
+

layout/includes/third-party/pangu.pug

@@ -1,13 +1,19 @@
-script(src=url_for(theme.CDN.pangu))
-if theme.pangu.field === 'post'
-  if is_post()
-    script.
-      document.addEventListener('DOMContentLoaded', function() {
-          pangu.spacingElementById('content-inner')
+script.
+  function panguFn () {
+    if (typeof pangu === 'object') pangu.spacingElementById('content-inner')
+    else {
+      $.getScript('!{url_for(theme.CDN.pangu)}', () => {
+        pangu.spacingElementById('content-inner')
       })
-else if theme.pangu.field === 'page'
-  script.
-    document.addEventListener('DOMContentLoaded', function() {
-          pangu.spacingElementById('content-inner')
-    })
+    }
+  }
 
+  function panguInit () {
+    if (!{theme.pangu.field === 'post'}){
+      GLOBAL_CONFIG_SITE.isPost && panguFn()
+    } else {
+      panguFn()
+    }
+  }
+
+  document.addEventListener('DOMContentLoaded', panguFn)

layout/includes/third-party/pjax.pug

@@ -0,0 +1,56 @@
+script(src=url_for(theme.CDN.pjax))
+script.
+  var pjax = new Pjax({
+    elements: 'a:not([target="_blank"])',
+    selectors: [
+      'title',
+      'meta[name=description]',
+      '#config_change',
+      '#body-wrap',
+      '#rightside-config-hide',
+      '#rightside-config-show',
+      '.js-pjax'
+    ],
+    cacheBust: false,
+  })
+
+  document.addEventListener('pjax:complete', function () {
+    refreshFn()
+
+    $('script[data-pjax]').each(function () {
+      $(this).parent().append($(this).remove())
+    })
+
+    GLOBAL_CONFIG.islazyload && lazyLoadInstance.update()
+
+    typeof chatBtnFn === 'function' && chatBtnFn()
+    typeof panguInit === 'function' && panguInit()
+
+    if (typeof gtag === 'function') {
+      gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
+    }
+
+    typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()
+
+  })
+
+  document.addEventListener('pjax:send', function () {
+    if (window.aplayers) {
+      for (let i = 0; i < window.aplayers.length; i++) {
+        if (!window.aplayers[i].options.fixed) {
+          window.aplayers[i].destroy()
+        }
+      }
+    }
+
+    typeof typed === 'object' && typed.destroy()
+
+    $(window).off('scroll')
+
+    //reset readmode
+    $('body').hasClass('read-mode') && $('body').removeClass('read-mode')
+
+    //reset font-size
+    $('body').css('font-size') !== originFontSize && $('body').css('font-size', parseFloat(originFontSize))
+  })
+

layout/includes/third-party/search/algolia.pug

@@ -8,5 +8,5 @@
     #algolia-pagination
     #algolia-stats
   span.search-close-button
-    i.fa.fa-times
-.search-mask
+    i.fas.fa-times
+#search-mask

layout/includes/third-party/search/index.pug

@@ -0,0 +1,4 @@
+if theme.algolia_search.enable
+  include ./algolia.pug
+else if theme.local_search.enable
+  include ./local-search.pug

layout/includes/third-party/search/local-search.pug

@@ -19,5 +19,5 @@
             span=_p("local_search.powered_by")
             |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
   span.search-close-button
-    i.fa.fa-times
-.search-mask
+    i.fas.fa-times
+#search-mask

layout/includes/third-party/share/index.pug

@@ -0,0 +1,7 @@
+.post_share
+  if theme.addThis.enable
+    !=partial('includes/third-party/share/add-this', {}, {cache:theme.fragment_cache})
+  else if theme.sharejs.enable
+    include ./share-js.pug
+  else if theme.addtoany.enable
+    !=partial('includes/third-party/share/addtoany', {}, {cache:theme.fragment_cache})

layout/includes/third-party/share/share-js.pug

@@ -0,0 +1,3 @@
+.social-share(data-image=url_for(page.cover|| theme.avatar.img) data-sites= theme.sharejs.sites)
+link(rel="stylesheet" href=url_for(theme.CDN.sharejs_css))
+script(src=url_for(theme.CDN.sharejs) defer)

layout/includes/third-party/subtitle.pug

@@ -0,0 +1,137 @@
+- var source = theme.subtitle.source
+if source == '1'
+  script.
+    function subtitleType () {
+      $.getJSON('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',function (data) {
+        if (!{theme.subtitle.effect}) {
+          var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+          var both = sub.unshift(data.text)
+          typed = new Typed('#subtitle', {
+            strings: sub,
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{theme.subtitle.loop},
+            backSpeed: 50,
+          })
+        } else {
+          document.getElementById('subtitle').innerHTML = data.text
+        }
+      })
+    }
+
+    if (!{theme.subtitle.effect}) {
+      if (typeof Typed === 'function') subtitleType()
+      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+    } else {
+      subtitleType()
+    }
+
+else if source == '2'
+  script.
+    function subtitleType () {
+      $.getJSON('https://v1.hitokoto.cn', function (data) {
+        if (!{theme.subtitle.effect}) {
+          var from = '出自 ' + data.from
+          var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+          var both = sub.unshift(data.hitokoto, from)
+          var typed = new Typed('#subtitle', {
+            strings: sub,
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{theme.subtitle.loop},
+            backSpeed: 50,
+          })
+        } else {
+          document.getElementById('subtitle').innerHTML = data.hitokoto
+        }
+      })
+    }
+
+    if (!{theme.subtitle.effect}) {
+      if (typeof Typed === 'function') subtitleType()
+      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+    } else {
+      subtitleType()
+    }
+
+else if source == '3'
+  script.
+    function subtitleType () {
+      $.getScript('http://yijuzhan.com/api/word.php?m=js', function () {
+        var con = str[0]
+        if (!{theme.subtitle.effect}) {
+          var from = '出自 ' + str[1]
+          var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+          var both = sub.unshift(con, from)
+          var typed = new Typed('#subtitle', {
+            strings: sub,
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{theme.subtitle.loop},
+            backSpeed: 50,
+          })
+        } else {
+          document.getElementById('subtitle').innerHTML = con
+        }
+      })
+    }
+
+    if (!{theme.subtitle.effect}) {
+      if (typeof Typed === 'function') subtitleType()
+      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+    } else {
+      subtitleType()
+    }
+
+else if source == '4'
+  script.
+    function subtitleType () {
+      $.getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
+        jinrishici.load(function (result) {
+          if (!{theme.subtitle.effect}) {
+            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+            var content = result.data.content
+            var both = sub.unshift(content)
+            var typed = new Typed('#subtitle', {
+              strings: sub,
+              startDelay: 300,
+              typeSpeed: 150,
+              loop: !{theme.subtitle.loop},
+              backSpeed: 50,
+            })
+          } else {
+            document.getElementById('subtitle').innerHTML = result.data.content
+          }
+        })
+      })
+    }
+
+    if (!{theme.subtitle.effect}) {
+      if (typeof Typed === 'function') subtitleType()
+      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+    } else {
+      subtitleType()
+    }
+
+else
+  script.
+    function subtitleType () {
+      if (!{theme.subtitle.effect}) { 
+        var typed = new Typed("#subtitle", {
+          strings: "!{theme.subtitle.sub}".split(","),
+          startDelay: 300,
+          typeSpeed: 150,
+          loop: !{theme.subtitle.loop},
+          backSpeed: 50
+        })
+      } else {
+        document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}'
+      }
+    }
+
+    if (!{theme.subtitle.effect}) {
+      if (typeof Typed === 'function') subtitleType()
+      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+    } else {
+      subtitleType()
+    }

layout/includes/widget/card_announcement.pug

@@ -1,6 +1,6 @@
 .card-widget.card-announcement
   .card-content
     .item-headline
-      i.fa.fa-bullhorn.card-announcement-animation(aria-hidden="true")
+      i.fas.fa-bullhorn.card-announcement-animation
       span= _p('aside.card_announcement')
     .announcement_content!= theme.aside.card_announcement.content

layout/includes/widget/card_archives.pug

@@ -1,7 +1,7 @@
 .card-widget.card-archives
   .card-content
     .item-headline
-      i.fa.fa-archive(aria-hidden="true")
+      i.fas.fa-archive
       span= _p('aside.card_archives')
     
     - let type = theme.aside.card_archives.type || 'monthly'

layout/includes/widget/card_author.pug

@@ -1,9 +1,12 @@
 .card-widget.card-info
   .card-content
     .card-info-avatar.is-center
-      img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.lodding_bg.flink) + `'` alt="avatar")
+      if theme.lazyload.enable
+        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
+      else
+        img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")      
       .author-info__name= config.author
-      .author-info__description= theme.aside.card_author.description || config.description
+      .author-info__description!= theme.aside.card_author.description || config.description
 
     .card-info-data
       if site.posts.length
@@ -19,15 +22,14 @@
             .length_num= site.tags.length
 
       if site.categories.length
-        .card-info-data-item.is-center      
+        .card-info-data-item.is-center
           a(href=url_for(config.category_dir))
             .headline= _p('aside.categories') 
             .length_num= site.categories.length
 
-    .card-info-bookmark.is-center
-      a#bookmark-it.bookmark.button--primary.button--animated(href="javascript:;" title= _p('aside.card_bookmark') target="_self")
-        i.fa.fa-bookmark(aria-hidden="true")
-        span= _p('aside.card_bookmark') || 'Follow Me'
+    a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
+      i(class=theme.aside.card_author.button.icon)
+      span=theme.aside.card_author.button.text
   
     if(theme.social)
         .card-info-social-icons.is-center

layout/includes/widget/card_categories.pug

@@ -2,8 +2,8 @@ if site.categories.length
   .card-widget.card-categories
       .card-content
         .item-headline
-          i.fa.fa-folder-open(aria-hidden="true")
+          i.fas.fa-folder-open
           span= _p('aside.card_categories')
-        !=aside_categories({ limit: theme.aside.card_categories.limit === 0 ? 0 : theme.aside.card_categories.limit || 8 })
+        !=aside_categories({ limit: theme.aside.card_categories.limit === 0 ? 0 : theme.aside.card_categories.limit || 8 , expand: theme.aside.card_categories.expand })
 
   

layout/includes/widget/card_recent_post.pug

@@ -1,26 +1,27 @@
 .card-widget.card-recent-post
   .card-content
     .item-headline
-      i.fa.fa-history(aria-hidden="true")
+      i.fas.fa-history
       span= _p('aside.card_recent_post')
     .aside-recent-item
-      - var postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5
-      - site.posts.sort('date', -1).limit(postLimit).each(function(article){
+      - let postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5
+      - let sort = theme.aside.card_recent_post.sort === 'updated' ? 'updated' : 'date'
+      - site.posts.sort(sort, -1).limit(postLimit).each(function(article){
         .aside-recent-post
-          - var link = article.link || article.path
-          - var title = article.title || _p('no_title')
-          - var no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-aside-cover' : ''
-          - var post_cover = article.cover
-
-            a(href=url_for(link))
-              if post_cover && theme.cover.aside_enable
-                .aside-post-cover
-                  if theme.lazyload
-                    img.aside-post-bg(data-src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` title=title alt=title)
-                  else
-                    img.aside-post-bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` title=title alt=title)
-              .aside-post-title(class=no_cover)
-                .aside-post_title(href=url_for(link) title=article.title || _p('no_title'))= article.title || _p('no_title')
-                time.aside-post_meta.post-meta__date(title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)]
-    
+          - let link = article.link || article.path
+          - let title = article.title || _p('no_title')
+          - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-aside-cover' : ''
+          - let post_cover = article.cover
+          if post_cover && theme.cover.aside_enable
+            a.aside-post-cover(href=url_for(link) title=title)
+              if theme.lazyload.enable
+                img.aside-post-bg(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
+              else
+                img.aside-post-bg(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
+          .aside-post-info(class=no_cover)
+            a.aside-post-title(href=url_for(link) title=title)= title
+            if theme.aside.card_recent_post.sort === 'updated'
+              time.aside-post_meta.post-meta-updated(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated)) #[=date(article.updated, config.date_format)]
+            else
+              time.aside-post_meta.post-meta-date(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)]
       - })

layout/includes/widget/card_tags.pug

@@ -2,7 +2,7 @@ if site.tags.length
   .card-widget.card-tags
     .card-content
       .item-headline
-        i.fa.fa-tags(aria-hidden="true")
+        i.fas.fa-tags
         span= _p('aside.card_tags')
 
       - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40

layout/includes/widget/card_webinfo.pug

@@ -1,8 +1,7 @@
-- var webinfoIcon = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'fas fa-chart-line' : 'fa fa-line-chart'
 .card-widget.card-webinfo
   .card-content
     .item-headline
-        i(class=webinfoIcon aria-hidden="true")
+        i.fas.fa-chart-line
         span= _p('aside.card_webinfo.headline')
     .webinfo
       .webinfo-item
@@ -11,7 +10,7 @@
       if theme.runtimeshow.enable
         .webinfo-item
           .webinfo-runtime-name= _p('aside.card_webinfo.runtime_name') + " :"
-          #webinfo-runtime-count.webinfo-runtime-count(start_date=theme.runtimeshow.start_date)      
+          #webinfo-runtime-count.webinfo-runtime-count(publish_date=theme.runtimeshow.publish_date)      
       if theme.wordcount.enable && theme.wordcount.total_wordcount
         .webinfo-item
           .webinfo-site-wordcount-name=_p('aside.card_webinfo.site_wordcount') + " :"

layout/page.pug

@@ -8,8 +8,9 @@ block content
         span.tag-cloud__amount= site.tags.length
       .tag-cloud-tags
         !=cloudTags({source: site.tags, minfontsize: 15, maxfontsize: 30, limit: 0})
-      if page.comments !== false
-        include includes/comments/index.pug
+      if page.comments !== false && theme.comments && theme.comments.use
+        - var commentsJsLoad = true
+        !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
   else if page.type === 'link'
     include flink.pug
   else if page.type === 'categories'    
@@ -19,10 +20,15 @@ block content
           |  - 
           span.category__amount= site.categories.length
         div!= list_categories()
-      if page.comments !== false
-        include includes/comments/index.pug
+      if page.comments !== false && theme.comments && theme.comments.use
+        - var commentsJsLoad = true
+        !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
   else
     #page
+      if theme.douban && theme.douban.meta
+        if (is_current('/movies/', [strict]) || is_current('/books/', [strict]) || is_current('/games/', [strict]))
+          meta(name="referrer" content="no-referrer")
       #article-container!= page.content
-      if page.comments !== false
-        include includes/comments/index.pug
+      if page.comments !== false && theme.comments && theme.comments.use
+        - var commentsJsLoad = true
+        !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})

layout/post.pug

@@ -9,7 +9,7 @@ block content
         .post-meta__tag-list
           each item, index in page.tags.data
             a(href=url_for(item.path)).post-meta__tags #[=item.name]
-      !=partial('includes/share/index', {}, {cache:theme.fragment_cache})
+      include includes/third-party/share/index.pug
         
     if theme.reward.enable
       !=partial('includes/post/reward', {}, {cache:theme.fragment_cache})
@@ -21,5 +21,8 @@ block content
     include includes/pagination.pug
     if theme.related_post && theme.related_post.enable
       != related_posts(page,site.posts)
-    if page.comments !== false
-      include includes/comments/index.pug
+
+    if page.comments !== false && theme.comments && theme.comments.use
+      - var commentsJsLoad = true
+      !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
+      

package.json

@@ -1,18 +1,32 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "2.3.5",
-  "private": true,
-  "engines": {
-    "node": ">=8.10.0"
-  },
+  "version": "3.0.0",
   "description": "A Simple and Card UI Design theme for Hexo",
+  "main": "package.json",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
   "keywords": [
     "hexo",
     "theme",
     "butterfly",
-    "Card UI Design"
+    "Card UI Design",
+    "Jerry",
+    "hexo-theme-butterfly"
   ],
-  "repository": "https://github.com/jerryc127/hexo-theme-butterfly.git",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/jerryc127/hexo-theme-butterfly.git"
+  },
+  "bugs": {
+    "url": "https://github.com/jerryc127/hexo-theme-butterfly/issues",
+    "email": "wong@jerryc.me"
+  },
+  "dependencies": {
+    "hexo-renderer-stylus": "^1.1.0",
+    "hexo-renderer-pug": "^1.0.0"
+  },
+  "homepage": "https://demo.jerryc.me/",
   "author": "Jerry <wong@jerryc.me>",
-  "license": "MIT"
-}
+  "license": "Apache-2.0"
+}