Merge branch 'dev' into master

fix: 簡體中文的 ‘小時’ 修改為簡體

.github/ISSUE_TEMPLATE.md

@@ -1,45 +0,0 @@
-<!--
-IMPORTANT: Please follow the template to create a new issue.
-重要：請依照該模板來提交。
--->
-
-## I want to create a new issue <!-- 我想要建立一個新的issue --> 
-
-<!-- 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/).
-- [] 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
-
-<!-- Butterfly的版本 -->
-<!-- 檢視主題的package.json -->
-**Butterfly Version:**
-
-<!-- Windows/macOS/Linux/Android/iOS -->
-**Platform:**
-
-<!-- Chrome/Safari/FireFox/.. -->
-**Browser:**
-
-## Expected behavior <!-- (預期行為) -->
-
-## Actual behavior <!-- (實際行為) -->
-
-<!-- Please give me the screenshots to locate the issue -->
-<!-- 請儘量提供截圖來定位問題 -->
-
-## Steps to reproduce the behavior <!-- (重現步驟) -->
-
-## Feature Request
-
-<!-- If you have any ideas of theme-butterfly, please write down here and we can have a discussion. -->
-<!-- 如果你有任何關於Butterfly的功能方面的想法，可以在這個部分裡寫下來我們一起討論 -->
-
----
-
-<!--
-Love hexo-theme-butterfly? Please consider starring the repo to support it!
-喜歡 hexo-theme-butterfly嗎？ 考慮一下給它點個star來支援它吧！
--->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,61 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Do not delete the template (不要刪除模板) -->
+
+<!--
+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設定去(如有)
+
+If you are a problem when visiting 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 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 [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
+
+<!-- Butterfly的版本 -->
+<!-- 檢視主題的package.json -->
+**Butterfly Version:**
+
+<!-- Windows/macOS/Linux/Android/iOS -->
+**Platform:**
+
+<!-- Chrome/Safari/FireFox/.. -->
+**Browser:**
+
+## Expected behavior <!-- (預期行為) -->
+
+## Actual behavior <!-- (實際行為) -->
+
+## Steps to reproduce the behavior <!-- (重現步驟) -->
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+<!-- If applicable, add screenshots to help explain your problem -->
+<!-- 請儘量提供截圖來定位問題 -->
+## Screenshots <!-- (截圖) -->
+
+<!-- Provide your website to find the issues -->
+## Website
+
+## Describe the bug

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,9 @@
+---
+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.

.github/stale.yml

@@ -0,0 +1,20 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - bug
+  - enhancement
+  - documentation 
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

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,96 @@
 # hexo-theme-butterfly
 
-<a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.1.0-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-3.0+-0e83c"/></a>
-<a href="https://nodejs.org/"><img alt="node.js" src="https://img.shields.io/badge/node.js-6.0-blur"/></a>
-
-Demo:  https://demo.jerryc.me/ 
-
-JerryC:  https://jerryc.me/
+![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.2+-0e83c)
+![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
+![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
+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
 
-Stable branch:
+### 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
+## Features
 
- Documentation is [here](https://jerryc.me/posts/21cfbf15). it supports `zh-TW`
+- [x] Card UI Design
+- [X] Support sub-menu
+- [x] Two Column designs
+- [x] Responsive Web Design
+- [x] Dark Mode
+- [x] Pjax
+- [x] Read Mode
+- [x] Conversion between Traditional and Simplified Chinese
+- [X] TOC catalog is available for both computers and mobile phones
+- [X] Color themes (darker/pale night/light/ocean/mac/mac light), support custom colors
+- [X] Code Blocks (Display code language/close or expand Code Blocks/Copy Button/word wrap)
+- [X] Disable copy/Add a Copyright Notice to the Copied Text
+- [X] Search (Algolia SearchZ/Local Search)
+- [x] Mathjax and Katex
+- [x] Built-in 404 page
+- [x] WordCount
+- [x] Related articles
+- [x] Displays outdated notice for a post
+- [x] Share (AddThis/Sharejs/Addtoany)
+- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments)
+- [x] Multiple Comment System Support
+- [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp)
+- [x] Web analytics (Baidu Analytics/Google Analytics/Tencent Analytics/CNZZ Analytics)
+- [x] Google AdSense
+- [x] Webmaster Verification (google/Bing/Baidu/360/Yandex)
+- [x] Change website colour scheme
+- [x] Typewriter Effect: activate_power_mode
+- [x] Background effects (Canvas ribbon/canvas_ribbon_piao/canvas_nest)
+- [x] Mouse click effects (Fireworks/Heart/Text)
+- [x] Preloader/Loading Animation
+- [x] Busuanzi visitor counter
+- [x] Medium Zoom/Fancybox
+- [x] Mermaid
+- [x] Justified Gallery
+- [x] Lazyload images
+- [x] Instantpage/Pangu/Snackbar notification toast/PWA......
 
 ## Screenshots
 
-![image](https://user-images.githubusercontent.com/16351105/58887365-1272f780-8718-11e9-9329-3292c6ba20d4.png)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
 
-![](https://user-images.githubusercontent.com/16351105/58887457-3cc4b500-8718-11e9-9417-2bdea603c92e.png)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
 
-![](https://user-images.githubusercontent.com/16351105/69338594-7d03f980-0c9e-11ea-8b64-7f165e6508e2.png)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)

README_CN.md

@@ -1,46 +1,96 @@
 # hexo-theme-butterfly
 
-<a href="https://github.com/jerryc127/hexo-theme-butterfly/releases"><img alt="Version" src="https://img.shields.io/badge/release-2.1.0-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-3.0+-0e83c"/></a>
-<a href="https://nodejs.org/"><img alt="node.js" src="https://img.shields.io/badge/node.js-6.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.2+-0e83c)
+![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
+![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-Demo:  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
+>如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save
 
-## 文檔
+## 特色
 
-可查看[這裏](https://jerryc.me/posts/21cfbf15)
+- [x] 卡片化設計
+- [X] 支持二級目錄
+- [x] 雙欄設計
+- [x] 響應式主題
+- [x] 夜間模式
+- [x] Pjax
+- [x] 文章閲讀模式
+- [x] 簡體和繁體轉換
+- [X] 電腦和手機都可查看TOC目錄
+- [X] 內置多種代碼配色（darker/pale night/light/ocean/mac/mac light），可自定義代碼配色
+- [X] 代碼塊顯示代碼語言/關閉或展開代碼塊/代碼複製/代碼自動換行
+- [X] 可關閉文字複製/可開啟內容複製增加版權信息）
+- [X] 兩種搜索（Algolia搜索和本地搜索）
+- [x] Mathjax 和 Katex
+- [x] 內置404頁面
+- [x] 顯示字數統計
+- [x] 顯示相關文章
+- [x] 過期文章提醒
+- [x] 多種分享系統（AddThis/Sharejs/Addtoany）
+- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments）
+- [x] 支持雙評論部署
+- [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
+- [x] 多種分析系統（百度分析/谷歌分析/騰訊分析/CNZZ分析）
+- [x] 谷歌廣告/手動廣告位置
+- [x] 各種站長驗證（Google/Bing/Baidu/360/Yandex）
+- [x] 修改網站配色
+- [x] 打字特效 activate_power_mode
+- [x] 多種背景特效（靜止彩帶/動態彩帶/Canvas Nest）
+- [x] 多種鼠標點擊特效（煙花/文字/愛心）
+- [x] 內置一種 Preloader 加載動畫
+- [x] 不蒜子訪問統計
+- [x] 兩種大圖模式（Medium Zoom/Fancybox）
+- [x] Mermaid 圖表顯示
+- [x] 照片牆
+- [x] 圖片懶加載
+- [x] Instantpage/Pangu/Snackbar彈窗/PWA......
 
 ## 截圖
-![image](https://user-images.githubusercontent.com/16351105/58887365-1272f780-8718-11e9-9329-3292c6ba20d4.png)
-![image](https://user-images.githubusercontent.com/16351105/58887457-3cc4b500-8718-11e9-9417-2bdea603c92e.png)
 
-![](https://user-images.githubusercontent.com/16351105/69338594-7d03f980-0c9e-11ea-8b64-7f165e6508e2.png)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
+
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
+
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)

languages/default.yml

@@ -3,7 +3,7 @@ sidebar:
   have_read: You've read
 
 footer:
-  driven: Driven
+  framework: Framework
   theme: Theme
 
 copy:
@@ -19,26 +19,27 @@ page:
 
 sticky: Sticky
 no_title: No title
-archives: Archives
 
 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
+  comments: Comments
   copyright:
     author: Author
     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: 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,34 +62,45 @@ aside:
   card_tags: Tags
   card_archives: Archives
   card_recent_post: Recent Post
-  card_bookmark: Add to bookmark
   card_webinfo:
     headline: Info
     article_name: Article
-    runtime_name: Run time
+    runtime:
+      name: Run time
+      unit: days
+    last_push_date:
+      name: Last Push
+    site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
+  more_button: More
+  card_newest_comments:
+    heading: Newest Comments
+    loading_text: loading...
+    zero_day: Today
+    day: days ago
+
+date_suffix:
+  one_hour: Just
+  hours: hours ago
+  day: days ago
 
 donate: Donate
 share: Share
-
 bookmark:
   title: 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
-
 copy_copyright:
   author: Author
   link: Link
@@ -101,5 +113,11 @@ Snackbar:
     message_next: to bookmark this page
   chs_to_cht: Traditional Chinese Activated Manually
   cht_to_chs: Simplified Chinese Activated Manually
-  day_to_night: Light Mode Activated Manually
-  night_to_day: Dark Mode Activated Manually
+  day_to_night: Dark Mode Activated Manually
+  night_to_day: Light Mode Activated Manually
+
+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:
@@ -19,26 +19,27 @@ page:
 
 sticky: Sticky
 no_title: No title
-archives: Archives
 
 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
+  comments: Comments
   copyright:
     author: Author
     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: 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,13 +62,28 @@ aside:
   card_tags: Tags
   card_archives: Archives
   card_recent_post: Recent Post
-  card_bookmark: Add to bookmark
   card_webinfo:
     headline: Info
     article_name: Article
-    runtime_name: Run time
+    runtime:
+      name: Run time
+      unit: days
+    last_push_date:
+      name: Last Push
+    site_wordcount: Total Count
     site_uv_name: UV
     site_pv_name: PV
+  more_button: More
+  card_newest_comments:
+    heading: Newest Comments
+    loading_text: loading...
+    zero_day: Today
+    day: days ago
+
+date_suffix:
+  one_hour: Just
+  hours: hours ago
+  day: days ago
 
 donate: Donate
 share: Share
@@ -76,17 +92,15 @@ 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
-
 copy_copyright:
   author: Author
   link: Link
@@ -99,5 +113,11 @@ Snackbar:
     message_next: to bookmark this page
   chs_to_cht: Traditional Chinese Activated Manually
   cht_to_chs: Simplified Chinese Activated Manually
-  day_to_night: Light Mode Activated Manually
-  night_to_day: Dark Mode Activated Manually
+  day_to_night: Dark Mode Activated Manually
+  night_to_day: Light Mode Activated Manually
+
+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:
@@ -19,32 +19,34 @@ page:
 
 sticky: 置顶
 no_title: 无题
-archives: 时间轴
 
 post:
   created: 发表于
   updated: 更新于
   wordcount: 字数总计
-  min2read: "阅读时长: %s 分钟"
+  min2read: 阅读时长
+  min2read_unit: 分钟
   page_pv: 阅读量
   comments: 评论数
   copyright:
     author: 文章作者
     link: 文章链接
     copyright_notice: 版权声明
-    copyright_content: '本博客所有文章除特别声明外，均采用 <a href="%s">%s</a> 许可协议。转载请注明来自 <a href="%s">%s</a>！'
+    copyright_content: '本博客所有文章除特别声明外，均采用
+      <a href="%s" target="_blank">%s</a> 许可协议。转载请注明来自 <a href="%s" target="_blank">%s</a>！'
+  recommend: 相关推荐
 
 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:
@@ -62,33 +64,45 @@ aside:
   card_tags: 标签
   card_archives: 归档
   card_recent_post: 最新文章
-  card_bookmark: 加入书签
   card_webinfo:
     headline: 网站资讯
     article_name: 文章数目
-    runtime_name: 已运行时间
+    runtime:
+      name: 已运行时间
+      unit: 天
+    last_push_date:
+      name: 最后更新时间
+    site_wordcount: 本站总字数
     site_uv_name: 本站访客数
     site_pv_name: 本站总访问量
+  more_button: 查看更多
+  card_newest_comments:
+    heading: 最新评论
+    loading_text: 正在加载中...
+    zero_day: 今天
+    day: 天前
+
+date_suffix:
+  one_hour: 刚刚
+  hours: 小时前
+  day: 天前
 
 donate: 打赏
 share: 分享
 bookmark:
   title: 添加书签
 
-
 rightside:
   readmode_title: 阅读模式
   font_plus_title: 放大字体
   font_minus_title: 缩小字体
   translate_title: 简繁转换
-  night_mode_title: 夜间模式
+  night_mode_title: 浅色和深色模式转换
   back_to_top: 回到顶部
   toc: 目录
   scroll_to_comment: 直达评论
   setting: 设置
 
-runtime_unit: 天
-
 copy_copyright:
   author: 作者
   link: 链接
@@ -103,3 +117,9 @@ Snackbar:
   cht_to_chs: 你已切换为简体
   day_to_night: 你已切换为深色模式
   night_to_day: 你已切换为浅色模式
+
+loading: 加载中...
+
+error404:
+  error_title: 页面没有找到
+  back_button: 回到主页

languages/zh-TW.yml

@@ -3,49 +3,50 @@ sidebar:
   have_read: 你已經讀了
 
 footer:
-  driven: Power by
-  theme: Theme
+  framework: 框架
+  theme: 主題
 
 copy:
   success: 複製成功
   error: 複製錯誤
-  noSupport: 瀏覽器不支持
+  noSupport: 瀏覽器不支援
 
 page:
   articles: 文章總覽
   tag: 標籤
   category: 分類
-  archives: 時間軸
+  archives: 歸檔
 
 sticky: 置頂
 no_title: 無題
-archives: 時間軸
 
 post:
   created: 發表於
   updated: 更新於
   wordcount: 字數總計
-  min2read: "閲讀時長: %s 分鐘"
-  page_pv: 閲讀量
+  min2read: 閲讀時長
+  min2read_unit: 分鐘
+  page_pv: 閱讀量
   comments: 評論數
   copyright:
     author: 文章作者
-    link: 文章鏈接
+    link: 文章連結
     copyright_notice: 版權聲明
-    copyright_content: '本博客所有文章除特別聲明外，均採用
+    copyright_content: '本部落格所有文章除特別聲明外，均採用
       <a href="%s" target="_blank">%s</a> 許可協議。轉載請註明來自 <a href="%s" target="_blank">%s</a>！'
+  recommend: 相關推薦
 
-search: 搜索
+search: 搜尋
 algolia_search:
-  input_placeholder: 搜索文章
-  hits_empty: "找不到您查詢的內容:${query}"
-  hits_stats: "找到 ${hits} 條結果，用時 ${time} 毫秒"
+  input_placeholder: 搜尋文章
+  hits_empty: '找不到您查詢的內容：${query}'
+  hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒'
 
 local_search:
-  label: 本地搜索
-  input_placeholder: 搜索文章
-  hits_empty: "找不到您查詢的內容:${query}"
-  powered: "提供支持"
+  label: 本地搜尋
+  input_placeholder: 搜尋文章
+  hits_empty: '找不到您查詢的內容：${query}'
+  powered: '提供支援'
   by: 由
 
 pagination:
@@ -63,38 +64,50 @@ aside:
   card_tags: 標籤
   card_archives: 歸檔
   card_recent_post: 最新文章
-  card_bookmark: 加入書籤
   card_webinfo:
     headline: 網站資訊
     article_name: 文章數目
-    runtime_name: 已運行時間
+    runtime:
+      name: 已運行時間
+      unit: 天
+    last_push_date:
+      name: 最後更新時間
+    site_wordcount: 本站總字數
     site_uv_name: 本站訪客數
     site_pv_name: 本站總訪問量
+  more_button: 檢視更多
+  card_newest_comments:
+    heading: 最新評論
+    loading_text: 正在加載中...
+    zero_day: 今天
+    day: 天前
+
+date_suffix:
+  one_hour: 剛剛
+  hours: 小時前
+  day: 天前
 
 donate: 打賞
 share: 分享
 bookmark:
-  title: 添加書籤
-
+  title: 新增書籤
 
 rightside:
-  readmode_title: 閲讀模式
-  font_plus_title: 放大字體
-  font_minus_title: 縮小字體
+  readmode_title: 閱讀模式
+  font_plus_title: 放大字型
+  font_minus_title: 縮小字型
   translate_title: 簡繁轉換
-  night_mode_title: 夜間模式
+  night_mode_title: 淺色和深色模式轉換
   back_to_top: 回到頂部
   toc: 目錄
   scroll_to_comment: 直達評論
-  setting: 設置
-
-runtime_unit: 天
+  setting: 設定
 
 copy_copyright:
   author: 作者
-  link: 鏈接
+  link: 連結
   source: 來源
-  info: 著作權歸作者所有。商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
+  info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
 
 Snackbar:
   bookmark:
@@ -105,4 +118,8 @@ Snackbar:
   day_to_night: 你已切換為深色模式
   night_to_day: 你已切換為淺色模式
 
+loading: 載入中...
 
+error404:
+  error_title: 頁面沒有找到
+  back_button: 回到主頁

layout/404.pug

@@ -0,0 +1,30 @@
+- var top_img = theme.error_404.background || theme.default_top_img
+- var bg_img = `background-image: url(${url_for(top_img)})`
+
+doctype html
+html(lang=config.language data-theme=theme.display_mode)
+  head
+    include includes/head.pug
+  body
+    if theme.preloader
+      !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
+
+    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)
+
+    #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/archive.pug

@@ -1,4 +1,3 @@
-
 extends includes/layout.pug
 
 block content
@@ -6,6 +5,4 @@ block content
   #archive
     .article-sort-title= _p('page.articles') + ' - ' + site.posts.length
     +articleSort(page.posts)
-    include includes/pagination.pug
-  #aside_content.aside_content
-    include includes/widget/index.pug
+    include includes/pagination.pug

layout/category.pug

@@ -2,18 +2,13 @@ extends includes/layout.pug
 
 block content
   if theme.category_ui == 'index'
-    include ./includes/mixins/UI.pug
+    include ./includes/mixins/post-ui.pug
     #recent-posts.recent-posts.category_ui   
-      +UI_NEW(page.posts)
-      include includes/pagination.pug
-    #aside_content.aside_content
-      include includes/widget/index.pug
+      +postUI
+      include includes/pagination.pug    
   else
     include ./includes/mixins/article-sort.pug
     #category
       .article-sort-title= _p('page.category') + ' - ' + page.category
       +articleSort(page.posts)
-      include includes/pagination.pug
-    #aside_content.aside_content
-      include includes/widget/index.pug
-    
+      include includes/pagination.pug    

layout/flink.pug

@@ -1,30 +1,24 @@
-.flink
-  each i in site.data.link
-    h1= i.class_name
-    .post-cards
-      ul.md-links
-        each item in i.link_list
-          li.md-links-item
-            a(href=item.link  title=item.name target="_blank")
-              if theme.lazyload.enable
-                img.lazyload(data-src=item.avatar onerror=`this.onerror=null;this.src='` + url_for(theme.lodding_bg.flink) + `'` alt=item.name )
-              else
-                img(src=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
-
-  hr
-  div 
-    h2= theme.Flink.info_headline
-    ul
-      li= theme.Flink.name
-      li= theme.Flink.address
-      li= theme.Flink.avatar 
-      li= theme.Flink.info
-
-  hr
-  .comment_int
-    p.comment-word= theme.Flink.comment
-
+#page
+  .flink#article-container
+    if site.data.link
+      each i in site.data.link
+        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 && theme.comments && theme.comments.use
+    - var commentsJsLoad = true
+    !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
 
 

layout/includes/additional-js.pug

@@ -1,54 +1,68 @@
-if (theme.medium_zoom && theme.medium_zoom.enable)
-  script(src=url_for(theme.CDN.medium_zoom))
+div
+  script(src=url_for(theme.CDN.jquery))
+  script(src=url_for(theme.CDN.utils))
+  script(src=url_for(theme.CDN.main))
 
-if (theme.fancybox && theme.fancybox.enable)
-  script(src=url_for(theme.CDN.fancybox))
+  if theme.translate && theme.translate.enable
+    script(src=url_for(theme.CDN.translate))
 
-include ./math/index.pug 
+  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.fireworks && theme.fireworks.enable
-  script(src=url_for(theme.CDN.anime))
-  script(src=url_for(theme.CDN.fireworks))
+  if theme.instantpage
+    script(src=url_for(theme.CDN.instantpage) type="module" defer)
 
-if (theme.snackbar && theme.snackbar.enable)
-  script(src=url_for(theme.CDN.snackbar))
+  if theme.lazyload.enable
+    script(src=url_for(theme.CDN.lazyload))
 
-if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
-  include ./third-party/canvas-ribbon.pug
+  if (theme.snackbar && theme.snackbar.enable)
+    script(src=url_for(theme.CDN.snackbar))
 
-if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable)
-  include ./third-party/canvas-ribbon-piao.pug
+  if theme.pangu && theme.pangu.enable
+    !=partial('includes/third-party/pangu.pug', {}, {cache:theme.fragment_cache})
 
-if (theme.canvas_nest && theme.canvas_nest.enable)
-  include ./third-party/canvas-nest.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.activate_power_mode.enable
-  - var colorful = theme.activate_power_mode.colorful == false ? false : true
-  - var shake = theme.activate_power_mode.shake == false ? false : true
-  script(src=url_for(theme.CDN.activate_power_mode))
-  script.
-    POWERMODE.colorful = !{colorful};
-    POWERMODE.shake = !{shake}; 
-    document.body.addEventListener('input', POWERMODE);
+  if theme.preloader
+    !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
 
-if theme.translate && theme.translate.enable
-  script(src=url_for(theme.CDN.translate))
+  .js-pjax
+    if is_home() && theme.subtitle.enable
+      include ./third-party/subtitle.pug
 
-if is_home()
-  include index-js.pug
+    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.enable
-  script(src=url_for(theme.CDN.lazyload) async="")
+  !=partial('includes/third-party/prismjs', {}, {cache:theme.fragment_cache})
 
-//- 鼠標特效
-if theme.click_heart && theme.click_heart.enable
-  script(src=url_for(theme.CDN.click_heart))
+  if theme.aside.enable && theme.newest_comments.enable
+    if theme.pjax.enable
+      !=partial('includes/third-party/newest-comments/index', {}, {cache:theme.fragment_cache})
+    else if (!is_post() && page.aside !== false)
+      !=partial('includes/third-party/newest-comments/index', {}, {cache:theme.fragment_cache})
 
-if theme.ClickShowText && theme.ClickShowText.enable
-  script(src=url_for(theme.CDN.ClickShowText))
+  !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
+
+  !=partial('includes/third-party/effect', {}, {cache:theme.fragment_cache})
+
+  !=partial('includes/third-party/chat/index', {}, {cache:theme.fragment_cache})
+
+  if theme.aplayerInject && theme.aplayerInject.enable
+    if theme.pjax.enable || theme.aplayerInject.per_page
+      include ./head/aplayer.pug
+    else if page.aplayer
+      include ./head/aplayer.pug
+
+  if theme.pjax.enable
+    !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache})

layout/includes/comments/disqus.pug

@@ -1,13 +0,0 @@
-if theme.disqus && theme.disqus.enable
-  #disqus_thread
-  script.
-    var unused = null;
-    var disqus_config = function () {
-      this.page.url = '!{ page.permalink }';
-      this.page.identifier = '!{ page.path }';
-      this.page.title = '!{ page.title }';
-    }
-    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);

layout/includes/comments/gitalk.pug

@@ -1,20 +0,0 @@
-if theme.gitalk && theme.gitalk.enable
-  #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}',
-      updateCountCallback: commentCount
-    })
-    gitalk.render('gitalk-container')
-
-    function commentCount(n){
-      document.getElementsByClassName('gitalk-comment-count')[0].innerHTML= n
-    }
-
-

layout/includes/comments/index.pug

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

layout/includes/comments/laibili.pug

@@ -1,11 +0,0 @@
-if theme.laibili && theme.laibili.enable
-  #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/valine.pug

@@ -1,25 +0,0 @@
-if theme.valine && theme.valine.enable
-  #vcomment.vcomment
-  script(src=url_for(theme.CDN.valine))
-  script.
-    var notify = #{ theme.valine.notify } == true ? true : false;
-    var verify = #{ theme.valine.verify } == true ? true : false;
-    var GUEST_INFO = ['nick','mail','link'];
-    var guest_info = '#{ theme.valine.guest_info }'.split(',').filter(function(item){
-      return GUEST_INFO.indexOf(item) > -1
-    });
-    guest_info = guest_info.length == 0 ? GUEST_INFO :guest_info;
-
-    window.valine = new Valine({
-      el:'#vcomment',
-      notify:notify,
-      verify:verify,
-      appId:'#{theme.valine.appId}',
-      appKey:'#{theme.valine.appKey}',
-      placeholder:'#{theme.valine.placeholder}',
-      avatar:'#{theme.valine.avatar}',
-      guest_info:guest_info,
-      pageSize:'#{theme.valine.pageSize}',
-      lang:'#{theme.valine.lang}',
-      recordIP: true
-    });

layout/includes/config.pug

@@ -1,115 +0,0 @@
--
-  var algolia = 'undefined';
-  var env = process.env;
-  if (theme.algolia_search.enable) {
-    algolia = JSON.stringify({
-      appId: env.ALGOLIA_APP_ID || config.algolia.appId || config.algolia.applicationID,
-      apiKey: env.ALGOLIA_API_KEY || config.algolia.apiKey,
-      indexName: env.ALGOLIA_INDEX_NAME || config.algolia.indexName,
-      hits: theme.algolia_search.hits,
-      // search languages
-      languages: {
-        input_placeholder: _p("algolia_search.input_placeholder"),
-        hits_empty: _p("algolia_search.hits_empty"),
-        hits_stats: _p("algolia_search.hits_stats")
-      }
-    })
-  } 
-  
-  var localSearch = 'undefined';
-  if (theme.local_search && theme.local_search.enable) {
-    localSearch = JSON.stringify({
-      path: config.search.path,
-      languages: {
-        // search languages
-        hits_empty: _p("local_search.hits_empty")
-      }
-    })
-  }
-  var translate = 'undefined';
-  if (theme.translate && theme.translate.enable){
-    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({      
-      languages: {
-      author: _p("copy_copyright.author") + ': ' + config.author,
-      link: _p("copy_copyright.link") + ': ' + without_html,
-      source: _p("copy_copyright.source") + ': ' + config.title,
-      info: _p("copy_copyright.info")
-      }
-    })
-  }
-
-  var ClickShowText = 'undefined';
-  if (theme.ClickShowText && theme.ClickShowText.enable) {
-    ClickShowText = JSON.stringify({
-    text: theme.ClickShowText.text.join(","),
-      fontSize: theme.ClickShowText.fontSize
-    })
-  }
-
-  
-  var Snackbar = 'undefined';
-  if (theme.snackbar && theme.snackbar.enable) {
-  Snackbar = JSON.stringify({      
-    bookmark: {
-      title: _p("Snackbar.bookmark.title"),
-      message_prev: _p("Snackbar.bookmark.message_prev"),
-      message_next: _p("Snackbar.bookmark.message_next")
-    },
-    chs_to_cht: _p("Snackbar.chs_to_cht"),
-    cht_to_chs: _p("Snackbar.cht_to_chs"),
-    day_to_night: _p("Snackbar.day_to_night"),
-    night_to_day: _p("Snackbar.night_to_day"),
-    bgLight: theme.snackbar.bg_light,
-    bgDark: theme.snackbar.bg_dark,
-    position: theme.snackbar.position,
-    })
-  }
-
-  var runtime = theme.runtimeshow.enable
-  var fancybox = theme.fancybox.enable
-  var medium_zoom = theme.medium_zoom.enable
-  var baiduPush = theme.baidu_push && theme.baidu_push.enable
-  var isHome = is_home() ? true : false
-  var isPost = is_post() ? true : false
-
-
-script.
-  var GLOBAL_CONFIG = { 
-    root: '!{config.root}',
-    algolia: !{algolia},
-    localSearch: !{localSearch},
-    translate: !{translate},
-    copy: {
-      success: '!{_p("copy.success")}',
-      error: '!{_p("copy.error")}',
-      noSupport: '!{_p("copy.noSupport")}'
-    },
-    bookmark: {
-      title: '!{_p("Snackbar.bookmark.title")}',
-      message_prev: '!{_p("Snackbar.bookmark.message_prev")}',
-      message_next: '!{_p("Snackbar.bookmark.message_next")}'
-    },
-    runtime_unit: '!{_p("runtime_unit")}',
-    runtime: !{runtime},
-    copyright: !{copyright},
-    ClickShowText: !{ClickShowText},
-    medium_zoom: !{medium_zoom},
-    fancybox: !{fancybox},
-    Snackbar: !{Snackbar},
-    baiduPush: !{baiduPush},
-    isHome: !{isHome},
-    isPost: !{isPost}
-    
-  }
-

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='http://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

@@ -1,79 +1,92 @@
-if is_home()
-  - var top_img = theme.index_img || theme.default_top_img
-else if is_archive()
-  - var top_img = theme.archive_img || theme.default_top_img
-else if is_tag()
-  - var top_img = theme.tag_img || theme.default_top_img
-else if is_category()
-  - var top_img = theme.category_img || theme.default_top_img
-else if is_current('/movies/', [strict])
-  - var top_img = theme.movies_img || theme.default_top_img
-else if !is_post()
-  - var top_img = page.top_img || theme.default_top_img
+- var pageTitle
+- if (is_archive()) pageTitle = _p('page.archives')
+- else if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
+- 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('error404.error_title')
+- else pageTitle = page.title || config.title || ''
 
-- var without_index = url.replace('index.html', '')
-- var without_html = without_index.replace('.html', '')
+- var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
+- var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
 
-//- 預解析
-include ./head/dns_prefetch.pug
+- var pageDescription = page_description()
+- var pageKeywords
+- if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') :  ([]).join(',') || page.keywords
+- else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
+- else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
+- var pageAuthor = config.email ? config.author + ',' + config.email : config.author
+- var pageCopyright = config.copyright || config.author
+- var themeColor = theme.display_mode === 'dark' ? '#0d0d0d' : '#ffffff'
 
-//- PWA
-if (theme.pwa && theme.pwa.enable)
-  include ./head/pwa.pug
-
-//- 網站驗證
-include ./head/site_verification.pug
-
-//- Open_Graph
-include ./head/Open_Graph.pug
+meta(charset='UTF-8')
+meta(http-equiv="X-UA-Compatible" content="IE=edge")
+meta(name="viewport" content="width=device-width,initial-scale=1")
+title= tabTitle
+meta(name="description" content!=pageDescription)
+if pageKeywords
+  meta(name="keywords" content=pageKeywords)
+meta(name="author" content=pageAuthor)
+meta(name="copyright" content=pageCopyright)
+meta(name ="format-detection" content="telephone=no")
+meta(name="theme-color" content=themeColor)
 
 if theme.disable_baidu_transformation
   meta(http-equiv="Cache-Control" content="no-transform")
   meta(http-equiv="Cache-Control" content="no-siteapp")
 
-if page.hide == true
-  meta(name="robots" content="noindex")
+!=favicon_tag(theme.favicon || config.favicon)
+link(rel="canonical" href=urlNoIndex())
 
-script(src=url_for(theme.CDN.js_cookies))
+//- 預解析
+!=partial('includes/head/preconnect', {}, {cache:theme.fragment_cache})
 
-if (theme.darkmode && theme.darkmode.enable) || theme.autoChangeMode !== false
-  include ./head/darkmode.pug
+//- 網站驗證
+!=partial('includes/head/site_verification', {}, {cache:theme.fragment_cache})
 
-each item in theme.CDN_USE.css
-  link(rel='stylesheet', href=url_for(item))
+//- Open_Graph
+include ./head/Open_Graph.pug
 
-if (theme.fancybox && theme.fancybox.enable)
+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})
+
+//- main css
+link(rel='stylesheet', href=url_for(theme.CDN.main_css))
+link(rel='stylesheet', href=url_for(theme.CDN.fontawesome))
+
+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=without_html)
-
-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)
 
-if (theme.gitalk && theme.gitalk.enable)
-  link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.gitalk_css))
-  script(src=url_for(theme.CDN.gitalk) defer)
-  script(src=url_for(theme.CDN.blueimp_md5) defer)
-
 //- google_adsense
-include ./head/google_adsense.pug
+!=partial('includes/head/google_adsense', {}, {cache:theme.fragment_cache})
 
 //- analytics
-include ./head/analytics.pug
+!=partial('includes/head/analytics', {}, {cache:theme.fragment_cache})
 
-if !is_post()
-  link(rel="preload" href=url_for(top_img)  as="image" )
+//- font
+if theme.blog_title_font &&　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})
+
+include ./head/config_site.pug
+include ./head/noscript.pug
+
+!=partial('includes/head/darkmode', {}, {cache:theme.fragment_cache})
+
+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
 
-if theme.blog_title_font.font_link
-  link(rel='stylesheet', href=url_for(theme.blog_title_font.font_link))

layout/includes/head/Open_Graph.pug

@@ -1,19 +1,12 @@
-- var photo_check = is_post() ? page.cover || theme.avatar : theme.avatar
-- var photo_link = url_check (photo_check) ? photo_check : config.url + photo_check
 - var contentType = is_post() ? 'article' : 'website'
 
-//- twitter meta
-if theme.twitter_meta
-  meta(name="twitter:card" content="summary")
-  meta(name="twitter:title" content=pageTitle_no_include_blog_name)
-  meta(name="twitter:description" content=pageDescription)
-  meta(name="twitter:image" content=photo_link)
-
-//- Open_Graph
 if theme.Open_Graph_meta
   meta(property="og:type" content=contentType)
-  meta(property="og:title" content=pageTitle_no_include_blog_name)
-  meta(property="og:url" content=without_html)
+  meta(property="og:title" content=pageTitle)
+  meta(property="og:url" content=urlNoIndex())
   meta(property="og:site_name" content=config.title)
-  meta(property="og:description" content=pageDescription)
-  meta(property="og:image" content=photo_link)
+  meta(property="og:description" content!=pageDescription)
+  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,24 @@ 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=`http://tajs.qq.com/stats?sId=` + theme.tencent_analytics charset="UTF-8")
+  script.
+    var _mtac = {};
+    (function() {
+        var mta = document.createElement("script");
+        mta.src = "//pingjs.qq.com/h5/stats.js?v2.0.4";
+        mta.setAttribute("name", "MTAH5");
+        mta.setAttribute("sid", "!{theme.tencent_analytics}");
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(mta, s);
+    })();
+
+if theme.cnzz_analytics
+  script(async data-pjax src=`https://s4.cnzz.com/z_stat.php?id=${theme.cnzz_analytics}&web_id=${theme.cnzz_analytics}`)

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/config.pug

@@ -0,0 +1,172 @@
+-
+  let algolia = 'undefined';
+  let env = process.env;
+  if (theme.algolia_search.enable) {
+    algolia = JSON.stringify({
+      appId: env.ALGOLIA_APP_ID || config.algolia.appId || config.algolia.applicationID,
+      apiKey: env.ALGOLIA_API_KEY || config.algolia.apiKey,
+      indexName: env.ALGOLIA_INDEX_NAME || config.algolia.indexName,
+      hits: theme.algolia_search.hits,
+      // search languages
+      languages: {
+        input_placeholder: _p("algolia_search.input_placeholder"),
+        hits_empty: _p("algolia_search.hits_empty"),
+        hits_stats: _p("algolia_search.hits_stats")
+      }
+    })
+  } 
+  
+  let localSearch = 'undefined';
+  if (theme.local_search && theme.local_search.enable) {
+    localSearch = JSON.stringify({
+      path: config.search.path,
+      languages: {
+        // search languages
+        hits_empty: _p("local_search.hits_empty")
+      }
+    })
+  }
+
+  let translate = 'undefined';
+  if (theme.translate && theme.translate.enable){
+    translate = JSON.stringify({
+      defaultEncoding: theme.translate.defaultEncoding,
+      translateDelay: theme.translate.translateDelay,
+      msgToTraditionalChinese: theme.translate.msgToTraditionalChinese,
+      msgToSimplifiedChinese: theme.translate.msgToSimplifiedChinese
+    })
+  }
+
+  let 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")
+      }
+    })
+  }
+
+  let ClickShowText = 'undefined';
+  if (theme.ClickShowText && theme.ClickShowText.enable) {
+    ClickShowText = JSON.stringify({
+    text: theme.ClickShowText.text.join(","),
+      fontSize: theme.ClickShowText.fontSize
+    })
+  }
+
+  
+  let Snackbar = 'undefined';
+  if (theme.snackbar && theme.snackbar.enable) {
+    Snackbar = JSON.stringify({
+      bookmark: {
+        message_prev: _p("Snackbar.bookmark.message_prev"),
+        message_next: _p("Snackbar.bookmark.message_next")
+      },
+      chs_to_cht: _p("Snackbar.chs_to_cht"),
+      cht_to_chs: _p("Snackbar.cht_to_chs"),
+      day_to_night: _p("Snackbar.day_to_night"),
+      night_to_day: _p("Snackbar.night_to_day"),
+      bgLight: theme.snackbar.bg_light,
+      bgDark: theme.snackbar.bg_dark,
+      position: theme.snackbar.position,
+    })
+  }
+
+  let 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,
+    })
+  }
+
+  let highlight = 'undefined';
+  if ((config.highlight && config.highlight.enable) || (config.prismjs && config.prismjs.enable)) {
+    highlight = JSON.stringify({
+      plugin: config.highlight.enable ? 'highlighjs' : 'prismjs',
+      highlightCopy: theme.highlight_copy,
+      highlightLang: theme.highlight_lang
+    })
+  }
+
+  let date_suffix = 'undefined';
+  if (theme.aside.card_webinfo.last_push_date) {
+    date_suffix = JSON.stringify({
+      one_hour: _p("date_suffix.one_hour"),
+      hours: _p("date_suffix.hours"),
+      day: _p('date_suffix.day')
+
+    })
+  }
+
+script.
+  var GLOBAL_CONFIG = { 
+    root: '!{config.root}',
+    hexoversion: '!{get_hexo_version()}',
+    algolia: !{algolia},
+    localSearch: !{localSearch},
+    translate: !{translate},
+    noticeOutdate: !{noticeOutdate},
+    highlight: !{highlight},
+    copy: {
+      success: '!{_p("copy.success")}',
+      error: '!{_p("copy.error")}',
+      noSupport: '!{_p("copy.noSupport")}'
+    },
+    bookmark: {
+      message_prev: '!{_p("Snackbar.bookmark.message_prev")}',
+      message_next: '!{_p("Snackbar.bookmark.message_next")}'
+    },
+    runtime: '!{theme.runtimeshow.enable ? _p("aside.card_webinfo.runtime.unit") : ""}',
+    date_suffix: !{date_suffix},
+    copyright: !{copyright},
+    ClickShowText: !{ClickShowText},
+    medium_zoom: !{theme.medium_zoom},
+    fancybox: !{theme.fancybox},
+    Snackbar: !{Snackbar},
+    justifiedGallery: {
+      js: '!{theme.CDN.justifiedGallery_js}',
+      css: '!{theme.CDN.justifiedGallery_css}'
+    },
+    baiduPush: !{theme.baidu_push},
+    isPhotoFigcaption: !{theme.photofigcaption},
+    islazyload: !{theme.lazyload.enable},
+    isanchor: !{theme.anchor}
+  };
+  
+  var saveToLocal = {
+    set: function setWithExpiry(key, value, ttl) {
+        const now = new Date()
+        const expiryDay = ttl * 86400000
+        const item = {
+          value: value,
+          expiry: now.getTime() + expiryDay,
+        }
+        localStorage.setItem(key, JSON.stringify(item))
+      },
+    
+    get: function getWithExpiry(key) {
+      const itemStr = localStorage.getItem(key)
+
+      if (!itemStr) {
+        return undefined
+      }
+      const item = JSON.parse(itemStr)
+      const now = new Date()
+
+      if (now.getTime() > item.expiry) {
+        localStorage.removeItem(key)
+        return undefined
+      }
+      return item.value
+    }
+  }
+
+
+

layout/includes/head/config_site.pug

@@ -0,0 +1,19 @@
+-
+  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,48 +1,50 @@
-script.
-  const autoChangeMode = '#{theme.autoChangeMode}'
-  var t = Cookies.get("theme");
-  if (autoChangeMode == '1'){
-  const isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches
-  const isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches
-  const isNotSpecified = window.matchMedia("(prefers-color-scheme: no-preference)").matches
-  const hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-
-  if (t === undefined){
-    if (isLightMode) activateLightMode()
-    else if (isDarkMode) activateDarkMode()
-    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.')
-      now = new Date();
-      hour = now.getHours();
-      isNight = hour < 6 || hour >= 18
-      isNight ? 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 (t === 'light') activateLightMode()
-    else activateDarkMode() 
-  } else {
-    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')
+if theme.darkmode.enable
+  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', '#0d0d0d')
+      }
     }
-  }
-  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')
+    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', '#ffffff')
+      }
     }
-  }
 
+    var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
+    var t = saveToLocal.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 hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
+
+      if (t === undefined) {
+        if (isLightMode) activateLightMode()
+        else if (isDarkMode) activateDarkMode()
+        else if (isNotSpecified || hasNoSupport) {
+          var now = new Date()
+          var hour = now.getHours()
+          var isNight = hour <= 6 || hour >= 18
+          isNight ? activateDarkMode() : activateLightMode()
+        }
+        window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
+          if (saveToLocal.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 (t === 'light') activateLightMode()
+      else activateDarkMode()
+    } else {
+      if (t === 'dark') activateDarkMode()
+      else if (t === 'light') activateLightMode()
+    }

layout/includes/head/dns_prefetch.pug

@@ -1,16 +0,0 @@
-link(rel="preconnect" href="//cdn.jsdelivr.net")
-
-if theme.google_analytics
-  link(rel="preconnect" href="https://www.google-analytics.com" crossorigin)
-
-if theme.baidu_analytics
-  link(rel="preconnect" href="https://hm.baidu.com")
-
-if theme.tencent_analytics
-  link(rel="preconnect" href="http://ta.qq.com")
-
-if theme.blog_title_font.font_link
-  link(rel="preconnect" href="https://fonts.googleapis.com" crossorigin)
-
-if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-  link(rel="preconnect" 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

@@ -0,0 +1,9 @@
+noscript. 
+  <style type="text/css">
+  #nav {
+    opacity: 1
+  }
+  .justified-gallery img {
+    opacity: 1
+  }
+  </style>

layout/includes/head/preconnect.pug

@@ -0,0 +1,22 @@
+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="//pingjs.qq.com")
+
+if theme.cnzz_analytics
+  link(rel="preconnect" href="//s4.cnzz.com")
+
+if theme.blog_title_font && 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,11 @@
-link(rel="manifest" href=theme.pwa.manifest)
-if(theme.pwa.theme_color) 
-  meta(name="theme-color" content=theme.pwa.theme_color)
+link(rel="manifest" href=url_for(theme.pwa.manifest))
 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/header.pug

@@ -1,16 +0,0 @@
-header  
-  #page-header
-    span#blog_name.pull_left
-      a#site-name.blog_title(href=url_for('/')) #[=config.title]
-    span.toggle-menu.pull_right.close
-      a.site-page
-        i.fa.fa-bars.fa-fw(aria-hidden="true")
-    span.pull_right.menus
-      .menus_items
-        include menu_item.pug
-
-    if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable)
-      span#search_button.pull_right
-        a.site-page.social-icon.search
-          i.fa.fa-search.fa-fw
-          span=' '+_p('search')

layout/includes/header/index.pug

@@ -0,0 +1,43 @@
+if is_home()
+  - var top_img = theme.index_img || theme.default_top_img
+else if is_post()
+  - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
+else if is_archive()
+  - var top_img = theme.archive_img || theme.default_top_img
+else if is_tag()
+  - var top_img = theme.tag_img || theme.default_top_img
+else if is_category()
+  - var top_img = theme.category_img || theme.default_top_img
+else
+  - var top_img = page.top_img || theme.default_top_img
+
+if theme.douban
+  if is_current('/movies/', [strict])
+    - var top_img = theme.douban.movies_img || theme.default_top_img
+  else if is_current('/books/', [strict])
+    - var top_img = theme.douban.books_img || theme.default_top_img
+  else if is_current('/games/', [strict])
+    - var top_img = theme.douban.games_img || theme.default_top_img
+
+- var bg_img = top_img && top_img !== true ? `background-image: url(${url_for(top_img)})` : ''
+- var site_title = is_archive() ? _p('page.archives') : page.title || page.tag || page.category || config.title
+- var isHomeClass = is_home() ? 'full_page' : 'not-index-bg'
+- is_post() ? isHomeClass = 'post-bg' : isHomeClass
+
+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
+      #site_subtitle
+        span#subtitle
+      if(theme.social)
+        #site_social_icons
+          !=fragment_cache('social', function(){return partial('includes/header/social')})
+    #scroll_down
+      i.fas.fa-angle-down.scroll-down-effects
+  else if is_post()
+    include ./post-info.pug 
+  else
+    #page_site-info
+      h1#site_title=site_title

layout/includes/header/menu_item.pug

@@ -0,0 +1,26 @@
+if theme.menu
+  //- for mobile sidebar
+  - let sidebarChildHide = theme.hide_sidebar_menu_child ? 'hide' : ''
+
+  .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(class=sidebarChildHide)
+          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

@@ -0,0 +1,17 @@
+nav#nav
+  span#blog_name
+    a#site-name(href=url_for('/')) #[=config.title]
+    
+  span#menus
+    if (theme.algolia_search.enable || theme.local_search.enable)
+      #search_button
+        a.site-page.social-icon.search
+          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.fas.fa-bars.fa-fw
+
+

layout/includes/header/post-info.pug

@@ -0,0 +1,83 @@
+#post-info
+  #post-title
+    .posttitle= page.title || _p('no_title')
+    
+  #post-meta
+    .meta-firstline
+      if (theme.post_meta.post.date_type)
+        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
+          if (theme.post_meta.post.date_type)
+            span.post-meta-separator |
+
+          each item, index in page.categories.data
+            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.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
+            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 |
+          if theme.wordcount.min2read
+            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')
+    
+      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
+
+      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

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

layout/includes/index-js.pug

@@ -1,90 +0,0 @@
-if theme.subtitle.enable
-  script(src=url_for(theme.CDN.typed))
-  - var source = theme.subtitle.source
-
-  if source == '1' || source == '2'
-    script(src="https://cdn.jsdelivr.net/npm/bluebird@3/js/browser/bluebird.min.js")
-    script(src="https://cdn.jsdelivr.net/npm/whatwg-fetch@2.0.3/fetch.min.js")
-
-  if source == '1'
-    script.
-      fetch('https://api.ooopn.com/ciba/api.php',)
-      .then(function (res){
-        return res.json();
-      })
-      .then(function (data) {
-        var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
-        var both = sub.unshift(data['ciba-en'],data.ciba)
-        var typed = new Typed(".subtitle", {
-        strings: sub,
-        startDelay: 300,
-        typeSpeed: 100,
-        loop: true,
-        backSpeed: 50
-        });
-      })
-      .catch(function (err) {
-        console.error(err);
-      })
-  else if source == '2'
-    script.
-      fetch('https://v1.hitokoto.cn')
-      .then(function (res){
-        return res.json();
-      })
-      .then(function (data) {
-        var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
-        var both = sub.unshift(data.hitokoto)  
-        var typed = new Typed(".subtitle", {
-        strings: sub,
-        startDelay: 300,
-        typeSpeed: 100,
-        loop: true,
-        backSpeed: 50
-        });
-      })
-      .catch(function (err) {
-        console.error(err);
-      })
-  else if source == "3"
-    script(type="text/javascript" src="http://yijuzhan.com/api/word.php?m=js")
-    script.
-      var con = str[0];
-      var author = "出自 " + str[1];
-      var sub = '!{theme.subtitle.sub}'.length == 0  ? new Array() : '!{theme.subtitle.sub}'.split(",");
-      var both = sub.unshift(con,author)
-      var typed = new Typed(".subtitle", {
-      strings: sub,
-      startDelay: 300,
-      typeSpeed: 100,
-      loop: true,
-      backSpeed: 50
-      });
-  else if source == '4'
-    script(type="text/javascript" src="https://sdk.jinrishici.com/v2/browser/jinrishici.js" charset="utf-8")
-    script.
-      jinrishici.load(function(result) {
-        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: 100,
-        loop: true,
-        backSpeed: 50
-      });
-      })
-     
-  else
-    script.
-      var typed = new Typed(".subtitle", {
-      strings: '!{theme.subtitle.sub}'.split(","),
-      startDelay: 300,
-      typeSpeed: 100,
-      loop: true,
-      backSpeed: 50
-      });
-
-
-

layout/includes/layout.pug

@@ -1,85 +1,43 @@
-
-- var pageTitle = page.title || config.subtitle || ''
-- if (is_archive()) pageTitle = _p('page.archives')
-- if (is_tag()) pageTitle = _p('page.tag') + ': ' + page.tag
-- if (is_category()) pageTitle = _p('page.category') + ': ' + page.category
-- if (is_month()) pageTitle += ': ' + page.month + '/' + page.year
-- if (is_year()) pageTitle += ': ' + page.year
-- var pageTitle_saved  //- 暫時存儲pageTitle
-- var pageTitle_no_include_blog_name //- 存儲pageTitle， 不帶 " | "，meta用
-- var home_subtitle_true //有subtitle
-//- home時顯示config.title (JerryC)，其他顯示 pageTitle。meta用
-- is_home() ? pageTitle_no_include_blog_name = config.title : pageTitle_no_include_blog_name = pageTitle
-//- 暫時存儲pageTitle
-- pageTitle ? pageTitle_saved = pageTitle + ' | ' + config.title : pageTitle_saved = config.title
-//- 是否有 config.subtitle 是各自显示
-- config.subtitle ? home_subtitle_true = ' - ' + config.subtitle : home_subtitle_true = ''
-//- home時pageTitle顯示 JerryC - subtitle，其他顯示 pageTitle | JerryC
-- is_home() ? pageTitle = config.title + home_subtitle_true : pageTitle = pageTitle_saved
-//- 判断keywords
-
-- var pageDescription = page.description || page.title || config.description
-- var pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
-- if (page.tags && page.tags.data) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
-- var pageAuthor = config.email ? config.author + ',' + config.email : config.author
-- var pageCopyright = config.copyright || config.author
+- var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
 
 doctype html
 html(lang=config.language data-theme=theme.display_mode)
   head
-    meta(charset='UTF-8')
-    meta(http-equiv="X-UA-Compatible" content="IE=edge")
-    meta(name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5")
-    title= pageTitle
-    meta(name="description" content=pageDescription)
-    if pageKeywords
-      meta(name="keywords" content=pageKeywords)
-    meta(name="author" content=pageAuthor)
-    meta(name="copyright" content=pageCopyright)
-    meta(name ="format-detection" content="telephone=no")
-    !=favicon_tag(config.favicon || theme.favicon || '/favicon.ico')
     include ./head.pug
-    include ./config.pug
   body
-    if theme.fireworks && theme.fireworks.enable
-      canvas.fireworks
-    //- !=partial('includes/header.pug', {}, {cache: true})
-    include ./header.pug
-    include ./mobile-sidebar.pug
+    if theme.preloader
+      !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
+
+    !=partial('includes/mobile-sidebar/index', {}, {cache:theme.fragment_cache})
+
     #body-wrap
       if theme.background
-        - var source = theme.background
-        - var is_photo = source.substring(3,0) === 'url' ? 'photo':'color'
+        - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
         #web_bg(data-type=is_photo)
-      if (is_post() && page.toc != false && theme.toc.enable)      
-        i.fa.fa-arrow-right#toggle-sidebar(aria-hidden="true")      
-        include ./sidebar.pug
+
+      include ./sidebar.pug
+      include ./header/index.pug
+
       if (!is_post())
-        include ./nav.pug
-      main#content-outer
-        block top_img
-        if (!is_post())
-          #content-inner.layout_page
-            if body
-              div!= body
-            else
-              block content
-        else
-          #content-inner.layout.layout_post    
-            if body
-              div!= body
-            else
-              block content
+        main#content-inner.layout_page(class=hideAside)
+          if body
+            div!= body
+          else
+            block content
+            if theme.aside.enable && page.aside !== false
+              !=partial('includes/widget/index', {}, {cache:theme.fragment_cache})
+      else
+        main#content-inner.layout_post
+          if body
+            div!= body
+          else
+            block content
       
       - var footer_bg = theme.footer_bg == false ? '' : bg_img
       - var is_bg = theme.footer_bg == false ? 'color' : 'photo'
       footer#footer(style=footer_bg data-type=is_bg)
-        include ./footer.pug    
-    include ./rightside.pug
-    each item in theme.CDN_USE.js
-      script(src=url_for(item))
-    include ./additional-js.pug
-    include ./search/index.pug
-    
+        !=partial('includes/footer', {}, {cache:theme.fragment_cache})
 
-    
+    include ./rightside.pug
+    !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache})
+    include ./additional-js.pug

layout/includes/loading/loading-js.pug

@@ -0,0 +1,6 @@
+script.
+  var endLoading = function () {
+    document.body.style.overflow = 'auto';
+    document.getElementById('loading-box').classList.add("loaded")
+  }
+  window.addEventListener('load',endLoading)

layout/includes/loading/loading.pug

@@ -0,0 +1,9 @@
+#loading-box
+  .loading-left-bg
+  .loading-right-bg
+  .spinner-box
+    .configure-border-1
+      .configure-core
+    .configure-border-2
+      .configure-core
+    .loading-word= _p('loading')

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/menu_item.pug

@@ -1,18 +0,0 @@
-each value, label in theme.menu
-  if !Array.isArray(value)
-    .menus_item
-      a.site-page(href=url_for(trim(value.split('||')[0])))
-        i.fa-fw(class=trim(value.split('||')[1]))
-        span=' '+label
-  else
-    .menus_item
-      a.site-page
-        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])))
-              i.fa-fw(class=trim(i.split('||')[2]))
-              span=' '+trim(i.split('||')[0])

layout/includes/mixins/UI.pug

@@ -1,41 +0,0 @@
-mixin UI_NEW(posts)
-  - posts.each(function(article,index){
-    .recent-post-item.article-container
-      - var link = article.link || article.path
-        if index%2 == 0
-          .post_cover.left_radius
-            a(href=url_for(link) title=article.title || _p('no_title'))
-              - var post_cover = article.cover
-              if theme.lazyload.enable
-                img.post_bg.lazyload(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-              else
-                img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-        else
-          .post_cover.right_radius
-            a(href=url_for(link) title=article.title || _p('no_title'))
-              - var post_cover = article.cover
-              if theme.lazyload.enable
-                img.post_bg.lazyload(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-              else
-                img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)            
-      .recent-post-info   
-        a.article-title(href=url_for(link) title= article.title || _p('no_title'))= article.title || _p('no_title')
-        if (theme.post_meta.date_type)
-          - var date_type = theme.post_meta.date_type == 'updated' ? 'updated' : 'date'
-          time.post-meta__date #[i.fa.fa-calendar(aria-hidden="true")] #[=date(article[date_type], config.date_format)]
-        if (theme.post_meta.categories && article.categories.data.length > 0)
-          span.article-meta
-            span.article-meta__separator |
-            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")
-        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
-          .content!= article.description
-  - })

layout/includes/mixins/article-sort.pug

@@ -2,17 +2,22 @@ mixin articleSort(posts)
   .article-sort
     - var year
     - posts.each(function (article) {
-      - var tempYear = date(article.date, 'YYYY')
+      - 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
-        .article-sort-img
-          a.article-sort-item__img(href=url_for(article.path))
-            img(src=article.cover alt=article.title || 'No Title')
-        .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= date(article.date)
-            .article-sort-item__title= article.title || 'No Title'
+      .article-sort-item(class=no_cover)
+        if article.cover && theme.cover.archives_enable
+          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

@@ -0,0 +1,78 @@
+mixin postUI(posts)
+  each article , index in page.posts.data
+    .recent-post-item
+      - 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.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.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.fas.fa-thumbtack.article-meta__icon.sticky
+              span.sticky= _p('sticky')
+              span.article-meta__separator |
+          if (theme.post_meta.page.date_type)
+            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 |
+                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
+                a(href=url_for(item.path)).article-meta__categories #[=item.name]
+                if (index < article.categories.data.length - 1)
+                  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
+                a(href=url_for(item.path)).article-meta__tags #[=item.name]
+                if (index < article.tags.data.length - 1)
+                  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
+        .recent-post-item.ad_height!=theme.ad.index

layout/includes/mobile-sidebar.pug

@@ -1,46 +0,0 @@
-#mobile-sidebar
-  #menu_mask
-  #mobile-sidebar-menus
-    .mobile_author_icon
-      img.avatar-img(src=url_for(theme.avatar) onerror=`onerror=null;src='${theme.lodding_bg.flink}'` alt="avatar")
-    .mobile_post_data
-      if site.posts.length
-        .mobile_data_item.is-center
-          .mobile_data_link
-            a(href=url_for(config.archive_dir) + '/')
-              .headline= _p('aside.articles') 
-              .length_num= site.posts.length
-
-      if site.tags.length
-        .mobile_data_item.is-center       
-          .mobile_data_link
-            a(href=url_for(config.tag_dir) + '/' )
-              .headline= _p('aside.tags')
-              .length_num= site.tags.length
-
-      if site.categories.length
-        .mobile_data_item.is-center      
-          .mobile_data_link
-            a(href=url_for(config.category_dir) + '/')
-              .headline= _p('aside.categories') 
-              .length_num= site.categories.length
-    hr
-    .menus_items
-      include menu_item.pug
-
-
-  
-  - const showToc = is_post() && page.toc != false && theme.toc.enable
-  -
-    let tocNumber
-    if (page.toc_number !== undefined) tocNumber = page.toc_number
-    else if (theme.toc.number !== undefined) tocNumber = theme.toc.number
-    else tocNumber = true
-  -
-  if (showToc)
-    #mobile-sidebar-toc
-      .toc_mobile_headline= _p('sidebar.catalog')
-      if (page.encrypt == true)
-        .sidebar-toc__content.toc-div-class(style="display:none")!=toc(page.origin,{"class":"toc_mobile_items",list_number:tocNumber})
-      else 
-        .sidebar-toc__content!=toc(page.content,{"class":"toc_mobile_items",list_number:tocNumber})

layout/includes/mobile-sidebar/index.pug

@@ -0,0 +1,3 @@
+#mobile-sidebar
+  #menu_mask
+  include ../mobile-sidebar/mobile-menus.pug

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

@@ -0,0 +1,29 @@
+#mobile-sidebar-menus
+  .mobile_author_icon
+    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
+        .mobile_data_link
+          a(href=url_for(config.archive_dir) + '/')
+            .headline= _p('aside.articles') 
+            .length_num= site.posts.length
+
+    if site.tags.length
+      .mobile_data_item.is-center       
+        .mobile_data_link
+          a(href=url_for(config.tag_dir) + '/' )
+            .headline= _p('aside.tags')
+            .length_num= site.tags.length
+
+    if site.categories.length
+      .mobile_data_item.is-center      
+        .mobile_data_link
+          a(href=url_for(config.category_dir) + '/')
+            .headline= _p('aside.categories') 
+            .length_num= site.categories.length
+  hr
+  !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})

layout/includes/nav.pug

@@ -1,29 +0,0 @@
-
-- var bg_img = top_img && top_img !== true ? `background-image: url(${top_img})` : ''
-
-
-if is_home()
-  nav#nav.full_page(style=bg_img)
-    #site-info
-      #site-title
-        span.blogtitle= page.title || page.tag || page.category || config.title
-      #site-sub-title
-        span.subtitle
-        
-      if(theme.social)
-        #site-social-icons
-          each url, icon in theme.social
-            a.social-icon(href=url target="_blank")
-              i(class=icon aria-hidden="true")
-      
-    .scroll-down
-      i.fa.fa-angle-down.scroll-down-effects
-
-else
-  nav#nav.not_index_bg(style=bg_img)
-    #page_site-info
-      #site-title
-          if (is_archive()) 
-            span.blogtitle= _p('archives')
-          else
-            span.blogtitle= page.title || page.tag || page.category || config.title

layout/includes/page_tag.pug

@@ -1,6 +0,0 @@
-- site.tags.sort('path').each(function (tags){
-  - var fontSize = Math.floor(Math.random() * 15 + 15) + "px"; //15 ~ 30
-  - var color = "rgb(" + Math.floor(Math.random() * 201) + ", " + Math.floor(Math.random() * 201) +", " + Math.floor(Math.random() * 201) +")"; // 0,0,0 -> 200,200,200
-
-  a(href=url_for(tags.path) style='font-size:' + fontSize + ';color:' + color)=tags.name
--})

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,53 +11,29 @@ if(!is_post())
     div.pagination
       !=paginator(options)
 else
-  nav#pagination.pagination_post
+  nav#pagination.pagination-post
     if(page.prev)
-      if(page.next)
-        .prev-post.pull_left
-          - var pagination_cover = page.prev.cover
-          a(href=url_for(page.prev.path))
-            if theme.lazyload.enable
-              img.prev_cover.lazyload(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` )
-            else
-              img.prev_cover(src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` )
-
+      - 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.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.error_img.post_page)}'` )
+          .pagination-info
             .label=_p('pagination.prev')
-            .prev_info
-              span=page.prev.title
-      else
-        .prev-post.pull-full
-          - var pagination_cover = page.prev.cover
-          a(href=url_for(page.prev.path))
-            if theme.lazyload.enable
-              img.prev_cover.lazyload(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-            else
-              img.prev_cover(src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-            .label=_p('pagination.prev')
-            .prev_info
-              span=page.prev.title
+            .prev_info=page.prev.title
           
     if(page.next)
-      if(page.prev)
-        .next-post.pull_right
-          - var pagination_cover = page.next.cover
-          a(href=url_for(page.next.path))
-            if theme.lazyload.enable
-              img.next_cover.lazyload(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-            else
-              img.next_cover(src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)            
+      - 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.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.error_img.post_page)}'`)
+          .pagination-info
             .label=_p('pagination.next')
-            .next_info
-              span=page.next.title 
-      else
-        .next-post.pull-full
-          - var pagination_cover = page.next.cover
-          a(href=url_for(page.next.path))
-            if theme.lazyload.enable
-              img.next_cover.lazyload(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-            else
-              img.next_cover(src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
-            .label=_p('pagination.next')
-            .next_info
-              span=page.next.title      
-
+            .next_info=page.next.title 

layout/includes/post/post-copyright.pug

@@ -0,0 +1,17 @@
+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=authorHref)=author
+    .post-copyright__type
+      span.post-copyright-meta= _p('post.copyright.link') + ": "
+      span.post-copyright-info
+        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!= info

layout/includes/post/reward.pug

@@ -0,0 +1,16 @@
+.post-reward
+  .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
+            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/recent-posts.pug

@@ -1,47 +0,0 @@
-each article , index in page.posts.data
-  .recent-post-item.article-container
-    - var link = article.link || article.path
-    - var title = article.title || _p('no_title')
-      if index%2 == 0
-        .post_cover.left_radius
-          a(href=url_for(link) title=title)
-            - var post_cover = article.cover
-            if theme.lazyload.enable
-              img.post_bg.lazyload(data-src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
-            else
-              img.post_bg(src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
-      else
-        .post_cover.right_radius
-          a(href=url_for(link) title=title)
-            - var post_cover = article.cover
-            if theme.lazyload.enable
-              img.post_bg.lazyload(data-src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
-            else
-              img.post_bg(src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)            
-    .recent-post-info   
-      a.article-title(href=url_for(link) title=title)= title
-      if (article.top)
-        span.article-meta
-          i.fa.fa-thumb-tack.article-meta__icon.sticky
-          span.sticky= _p('sticky')
-          span.article-meta__separator(style="margin-right: 0.3rem") |
-      if (theme.post_meta.date_type)
-        - var date_type = theme.post_meta.date_type == 'updated' ? 'updated' : 'date'
-        time.post-meta__date #[i.fa.fa-calendar(aria-hidden="true")] #[=date(article[date_type], config.date_format)]
-      if (theme.post_meta.categories && article.categories.data.length > 0)
-        span.article-meta
-          span.article-meta__separator |
-          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")
-      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
-        .content!= article.description
-
-    

layout/includes/reward.pug

@@ -1,11 +0,0 @@
-.post-reward
-  a.reward-button.button--primary.button--animated 
-    i.fa.fa-qrcode
-    = ' ' + _p('donate')
-    .reward-main
-      ul.reward-all
-        each item in theme.reward.QR_code
-          li.reward-item
-            img.lazyload.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,21 +1,28 @@
-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
     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
-    if theme.darkmode && theme.darkmode.enable
-      - var display_mode = theme.display_mode == 'dark' ? 'fa fa-sun-o' : 'fa fa-moon-o'
-      i#darkmode.darkmode(class=display_mode title=_p('rightside.night_mode_title'))
+      button#translateLink(type="button" title=_p('rightside.translate_title'))= theme.translate.default
+    if theme.darkmode.enable && theme.darkmode.button
+      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 && (d || l || gt || v)
+    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
-      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= page.cover|| theme.avatar 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,15 +1,12 @@
+-
+  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' : ''
+-
 
-- var sidebar_class = theme.auto_open_sidebar.enable === true ? 'auto_open' : ''
-
-#sidebar(class=sidebar_class)
-  - const showToc = is_post() && page.toc != false && theme.toc.enable
-  -
-    let tocNumber
-    if (page.toc_number !== undefined) tocNumber = page.toc_number
-    else if (theme.toc.number !== undefined) tocNumber = theme.toc.number
-    else tocNumber = true
-  -
-  if(showToc)
+if(showToc)
+  #sidebar
+    i.fas.fa-arrow-right#toggle-sidebar(class=autoOpenSidebar)
     .sidebar-toc
       div.sidebar-toc__title= _p('sidebar.catalog')
       div.sidebar-toc__progress
@@ -21,4 +18,4 @@
         div.sidebar-toc__content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
       else 
         div.sidebar-toc__content!=toc(page.content, {list_number: tocNumber})
-      
+        

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(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.enable}) {
+        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}) btf.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}) btf.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}) btf.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}) btf.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}) btf.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}) btf.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}) btf.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,53 @@
+//- 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)
+            }
+          }, ''],
+          addClass: [200,() => {
+            document.querySelectorAll('mjx-container:not([display=\'true\']').forEach( node => {
+              const target = node.parentNode
+              if (!target.classList.contains('has-jax')) {
+                target.classList.add('mathjax-overflow')
+              }
+            })
+          }, '', false]
+        }
+      }
+    }
+    
+    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.enable} && mermaid.init()
+      })
+    }
+  }
+
+

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

@@ -0,0 +1,71 @@
+script.
+  window.addEventListener('load', () => {
+    const changeContent = (content) => {
+      if (content === '') return content
+
+      content = content.replace(/<[^>]+>/g,"") // remove html tag
+      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
+      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url
+
+      if (content.length > 150) {
+        content = content.substring(0,150) + '...'
+      }
+      return content
+    }
+
+    const getDisqusComment = () => {
+      let disqusArray = []
+      $.getJSON('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{theme.newest_comments.disqus.forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{theme.newest_comments.disqus.api_key}', function(data){
+        $.each(data.response, (i, item) => {
+          disqusArray.push({
+            'avatar': item.author.avatar.cache,
+            'content': changeContent(item.message),
+            'nick': item.author.name,
+            'url': item.url,
+            'date': item.createdAt
+          })
+        })
+        // set expiry to 10 min
+        saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24))
+        generateHtml(disqusArray)
+      })
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      for (let i = 0; i < array.length; i++) {
+        result += '<div class=\'aside-list-item\'>'
+
+        if (!{theme.newest_comments.avatar}) {
+          result += `<a href='${array[i].url}' class="thumbnail"><img src='${array[i].avatar}'></a>`
+        }
+        
+        result += `<div class='content'>
+        <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+        <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
+        </div></div>`
+      }
+
+      let $dom = document.querySelector('.card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('.card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('disqus-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getDisqusComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })
+
+
+

layout/includes/third-party/newest-comments/github-issues.pug

@@ -0,0 +1,71 @@
+script.
+  window.addEventListener('load', () => {
+    const changeContent = (content) => {
+      if (content === '') return content
+
+      content = content.replace(/<[^>]+>/g,"") // remove html tag
+      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
+      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url
+
+      if (content.length > 150) {
+        content = content.substring(0,150) + '...'
+      }
+      return content
+    }
+
+    const getGithubIssues = () => {
+      let githubArray = []
+      $.getJSON('https://api.github.com/repos/!{theme.newest_comments.github_issues.repo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1', (data) => { 
+        $.each(data, (index, item) => {
+          githubArray.push({
+            'avatar': item.user.avatar_url,
+            'content': changeContent(item.body),
+            'nick': item.user.login,
+            'url': item.html_url,
+            'date': item.updated_at
+          })
+        })
+        saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24))
+        generateHtml(githubArray)
+      })
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      for (let i = 0; i < array.length; i++) {
+        result += '<div class=\'aside-list-item\'>'
+
+        if (!{theme.newest_comments.avatar}) {
+          result += `<a href='${array[i].url}' class="thumbnail"><img src='${array[i].avatar}'></a>`
+        }
+
+        result += `<div class='content'>
+        <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+        <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
+        </div></div>`
+      }
+
+      let $dom = document.querySelector('.card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('.card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('github-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getGithubIssues()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })
+
+
+
+

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

@@ -0,0 +1,6 @@
+if theme.newest_comments.leancloud.enable
+  include ./leancloud.pug
+else if theme.newest_comments.github_issues.enable
+  include ./github-issues.pug
+else if theme.newest_comments.disqus.enable
+  include ./disqus-comment.pug

layout/includes/third-party/newest-comments/leancloud.pug

@@ -0,0 +1,98 @@
+script(src="https://cdn.jsdelivr.net/npm/blueimp-md5@2.17.0/js/md5.min.js")
+script.
+  window.addEventListener('load', () => {
+    const changeContent = (content) => {
+      if (content === '') return content
+
+      content = content.replace(/<[^>]+>/g,"") // remove html tag
+      content = content.replace(/(http(s?):)([/|.|\w|\s|-])*\.(?:jpg|jpeg|gif|png|webp)/g, '') // remove image link
+      content = content.replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi, '') // remove url
+
+      if (content.length > 150) {
+        content = content.substring(0,150) + '...'
+      }
+      return content
+    }
+
+    const getIcon = (icon, mail) => {
+      if (icon) return icon 
+      let defaultIcon = '!{ theme.newest_comments.leancloud.default_avatar ? `?d=${theme.newest_comments.leancloud.default_avatar}` : ''}'
+      let iconUrl = `https://gravatar.loli.net/avatar/${md5(mail.toLowerCase()) + defaultIcon}`
+      return iconUrl
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      for (let i = 0; i < array.length; i++) {
+        result += '<div class=\'aside-list-item\'>'
+
+        if (!{theme.newest_comments.avatar}) {
+          result += `<a href='${array[i].url}' class="thumbnail"><img src='${getIcon(array[i].avatar, array[i].mail)}'></a>`
+        }
+
+        result += `<div class='content'>
+        <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+        <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
+        </div></div>`
+      }
+
+      let $dom = document.querySelector('.card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const getValineData = () => {
+
+      if (!(AV.applicationId && (AV.applicationKey || AV.masterKey))) {
+        const dataInit = {
+          appId: '!{theme.newest_comments.leancloud.appId}',
+          appKey: '!{theme.newest_comments.leancloud.appKey}'
+        }
+
+        if (!{theme.newest_comments.leancloud.serverURL ? true : false}) {
+          dataInit.serverURL= '!{theme.newest_comments.leancloud.serverURL}'
+        }
+
+        AV.init(dataInit)
+      }
+
+      const query = new AV.Query('Comment');
+      query.descending('createdAt').limit(!{theme.newest_comments.limit})
+
+      var valineArray = []
+      query.find().then(comments => {
+        comments.forEach(comment => {
+          valineArray.push({
+            'avatar': comment.get('QQAvatar'),
+            'content': changeContent(comment.get('comment')),
+            'mail': comment.get('mail'),
+            'nick': comment.get('nick'),
+            'url': comment.get('url'),
+            'date': comment.createdAt,
+          })
+        })
+      }).then(function() {
+        saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
+        generateHtml(valineArray)
+      })
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('.card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('leancloud-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          if (typeof window.AV === 'object') {
+            getValineData()
+          } else {
+            $.getScript('https://cdn.jsdelivr.net/npm/leancloud-storage@4.6.1/dist/av-min.js', getValineData)
+          }
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })

layout/includes/third-party/pangu.pug

@@ -0,0 +1,19 @@
+script.
+  function panguFn () {
+    if (typeof pangu === 'object') pangu.spacingElementById('content-inner')
+    else {
+      $.getScript('!{url_for(theme.CDN.pangu)}', () => {
+        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,75 @@
+- var pjaxExclude = 'a:not([target="_blank"])'
+if theme.pjax.exclude
+  each val in theme.pjax.exclude
+    - pjaxExclude = pjaxExclude + `:not([href="${val}"])`
+
+script(src=url_for(theme.CDN.pjax))
+script.
+  let pjaxSelectors = [
+    'title',
+    'meta[name=description]',
+    '#config_change',
+    '#body-wrap',
+    '#rightside-config-hide',
+    '#rightside-config-show',
+    '.js-pjax'
+  ]
+
+  if (!{Boolean(theme.Open_Graph_meta && theme.comments.use && theme.comments.use.includes('Livere'))}) {
+    pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
+  }
+
+  var pjax = new Pjax({
+    elements: '!{pjaxExclude}',
+    selectors: pjaxSelectors,
+    cacheBust: false,
+    analytics: !{theme.google_analytics ? true : false},
+    scrollRestoration: false
+  })
+
+  document.addEventListener('pjax:complete', function () {
+    window.refreshFn()
+
+    $('script[data-pjax]').each(function () {
+      $(this).parent().append($(this).remove())
+    })
+
+    GLOBAL_CONFIG.islazyload && window.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()
+
+    // Analytics
+    if (!{theme.tencent_analytics ? true : false}) {
+      MtaH5.pgv()
+    }
+
+    // prismjs
+    typeof Prism === 'object' && Prism.highlightAll()
+  })
+
+
+  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')
+
+  })
+

layout/includes/third-party/prismjs.pug

@@ -0,0 +1,5 @@
+if config.prismjs && config.prismjs.enable && !config.prismjs.preprocess
+  script(src=url_for(theme.CDN.prismjs_js))
+  script(src=url_for(theme.CDN.prismjs_autoloader))
+  if config.prismjs.line_number
+    script(src=url_for(theme.CDN.prismjs_lineNumber_js))

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