fix: 修復開啟gitalk評論數後與toc衝突的bug close #462

fix: 修復jquery在一些介面仍然載入問題
fix: 修復medium zoom 報錯的 bug

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,14 +7,16 @@ 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設定去（如有）
+如果你是由舊版本升級到新版，執行時出現報錯，請首先把config裡新的內容複製到舊的butterfly設定去(如有)
 
-If you are a problem when visit the website, please open your browser 'developer tools (shortcut F12)' and check the console if there is an error, include your website address in the feedback
+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是否有報錯，反饋時附上你的網站
 -->
 
@@ -24,7 +26,7 @@ If you are a problem when visit the website, please open your browser 'developer
 <!-- 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/).
+- [] Yes, I have read [Butterfly Documentation](https://butterfly.js.org/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

.github/ISSUE_TEMPLATE/custom.md

@@ -4,7 +4,6 @@ about: Describe this issue template's purpose here.
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
 

.github/stale.yml

@@ -8,7 +8,6 @@ exemptLabels:
   - security
   - bug
   - enhancement
-  - Solved
   - documentation 
 # Label to use when marking an issue as stale
 staleLabel: wontfix

README.md

@@ -2,14 +2,13 @@
 
 ![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-4.0+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-4.2+-0e83c)
 ![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
-![nodejs version](https://img.shields.io/badge/node.js-8.0+-yellow)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-Demo: 👍 [Butterfly](https://demo.jerryc.me/)  ||   🤞 [JerryC](https://jerryc.me/)
+Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [JerryC](https://jerryc.me/)
 
-Docs: 📖 [Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/)
+Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
 Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) theme.
 
@@ -17,6 +16,8 @@ Based on [hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody) t
 
 ### GIT
 
+> If you are in Mainland China, you can download in [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)
+
 Stable branch [recommend]:
 
 ```
@@ -49,10 +50,47 @@ npm i hexo-theme-butterfly
 
 > npm install hexo-renderer-pug hexo-renderer-stylus
 
+## Features
+
+- [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/Twikoo）
+- [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)

README_CN.md

@@ -2,15 +2,14 @@
 
 ![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-4.0+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-4.2+-0e83c)
 ![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
-![nodejs version](https://img.shields.io/badge/node.js-8.0+-yellow)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
 
-預覽: 👍 [Butterfly](https://demo.jerryc.me/)  ||  🤞 [JerryC](https://jerryc.me/)
+預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [JerryC](https://jerryc.me/)
 
-文檔: 📖 [Butterfly Docs](https://demo.jerryc.me/posts/21cfbf15/)
+文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
 一款基於[hexo-theme-melody](https://github.com/Molunerfinn/hexo-theme-melody)修改的主題
 
@@ -18,6 +17,8 @@
 
 ### Git 安裝
 
+> 本倉庫同時上傳到 [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
+
 在博客根目錄裡安裝穩定版【推薦】
 
 ```powershell
@@ -49,9 +50,47 @@ theme: butterfly
 
 >如果你沒有pug以及stylus的渲染器，請下載安裝： npm install hexo-renderer-pug hexo-renderer-stylus --save
 
+## 特色
+
+- [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/Twikoo）
+- [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)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.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-2.png)

_config.yml

@@ -17,10 +17,13 @@ menu:
   # Link: /link/ || fas fa-link
   # About: /about/ || fas fa-heart
 
+# Hide the child menu items in mobile sidebar
+hide_sidebar_menu_child: false
+
 # Code Blocks (代碼相關)
 # --------------------------------------
 
-highlight_theme: light # default / darker / pale night / light / ocean / mac / mac light / false
+highlight_theme: light #  darker / pale night / light / ocean / mac / mac light / false
 highlight_copy: true # copy button
 highlight_lang: true # show the code language
 highlight_shrink: false # true: shrink the code blocks / false: expand the code blocks | none: expand code blocks and hide the button
@@ -50,17 +53,9 @@ algolia_search:
   hits:
     per_page: 6
 
-  labels:
-    input_placeholder: Search for Posts
-    hits_empty: "We didn't find any results for the search: ${query}" # if there are no result
-    hits_stats: '${hits} results found in ${time} ms'
-
 # Local search
 local_search:
   enable: false
-  labels:
-    input_placeholder: Search for Posts
-    hits_empty: "We didn't find any results for the search: ${query}" # if there are no result
 
 # Math (數學)
 # --------------------------------------
@@ -88,32 +83,35 @@ favicon: /img/favicon.png
 
 # Avatar (頭像)
 avatar:
-  img: /img/avatar.png
+  img:
   effect: false
 
-# the banner image of home page
+# The banner image of home page
 index_img:
 
-# if the banner of page not setting, it will show the top_img
+# If the banner of page not setting, it will show the top_img
-default_top_img: https://i.loli.net/2020/05/01/IuWi8QbHvzjlOPw.jpg
+default_top_img:
 
-# the banner image of archive page
+# The banner image of archive page
 archive_img:
 
-# the banner image of tag page
+# If the banner of tag page not setting, it will show the top_img
 # note: tag page, not tags page (子標籤頁面的 top_img)
 tag_img:
 
-# the banner image of category page
+# The banner image of tag page
+# format:
+#  - tag name: xxxxx
+tag_per_img:
+
+# If the banner of category page not setting, it will show the top_img
 # note: category page, not categories page (子分類頁面的 top_img)
 category_img:
 
-# If you are using hexo-douban, you can configure it (如果你有使用 hexo-douban,可配置這個)
+# The banner image of category page
-# douban:
+# format:
-#   meta: false
+#  - category name: xxxxx
-#   movies_img:
+category_per_img:
-#   books_img:
-#   games_img:
 
 cover:
   # display the cover or not (是否顯示文章封面)
@@ -125,7 +123,7 @@ cover:
   position: both
   # When cover is not set, the default cover is displayed (當沒有設置cover時，默認的封面顯示)
   default_cover:
-    - https://i.loli.net/2020/05/01/gkihqEjXxJ5UZ1C.jpg
+    # - https://i.loli.net/2020/05/01/gkihqEjXxJ5UZ1C.jpg
 
 # Replace Broken Images (替換無法顯示的圖片)
 error_img:
@@ -141,11 +139,13 @@ error_404:
 post_meta:
   page: # Home Page
     date_type: created # created or updated or both 主頁文章日期是創建日或者更新日或都顯示
+    date_format: date # date/relative 顯示日期還是相對日期
     categories: true # true or false 主頁是否顯示分類
     tags: false # true or false 主頁是否顯示標籤
     label: true # true or false 顯示描述性文字
   post:
     date_type: both # created or updated or both 文章頁日期是創建日或者更新日或都顯示
+    date_format: date # date/relative 顯示日期還是相對日期
     categories: true # true or false 文章頁是否顯示分類
     tags: true # true or false 文章頁是否顯示標籤
     label: true # true or false 顯示描述性文字
@@ -161,6 +161,7 @@ wordcount:
 # 1: description
 # 2: both (if the description exists, it will show description, or show the auto_excerpt)
 # 3: auto_excerpt (default)
+# false: do not show the article introduction
 index_post_content:
   method: 3
   length: 500 # if you set method to 2 or 3, the length need to config
@@ -172,7 +173,7 @@ index_post_content:
 toc:
   enable: true
   number: true
-  auto_open: true # auto open the sidebar
+  style_simple: false
 
 post_copyright:
   enable: true
@@ -232,21 +233,14 @@ sharejs:
 # https://www.addtoany.com/
 addtoany:
   enable: false
-  item:
+  item: facebook,twitter,wechat,sina_weibo,facebook_messenger,email,copy_link
-    - facebook
-    - twitter
-    - wechat
-    - sina_weibo
-    - facebook_messenger
-    - email
-    - copy_link
 
 # Comments System
 # --------------------------------------
 
 comments:
   # Up to two comments system, the first will be shown as default
-  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments
+  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments/Twikoo
   use:
   # - Valine
   # - Disqus
@@ -308,6 +302,7 @@ valine:
   emojiCDN: # emoji CDN
   enableQQ: false # enable the Nickname box to automatically get QQ Nickname and QQ Avatar
   requiredFields: nick,mail # required fields (nick/mail)
+  option:
 
 # utterances
 # https://utteranc.es/
@@ -328,6 +323,10 @@ facebook_comments:
   order_by: social # social/time/reverse_time
   lang: en_US # Language en_US/zh_CN/zh_TW and so on
 
+# Twikoo
+# https://github.com/imaegoo/twikoo
+twikoo:
+
 # Chat Services
 # --------------------------------------
 
@@ -376,24 +375,26 @@ footer:
     since: 2020
   custom_text:
   copyright: true # Copyright of theme and framework
-  ICP: # Chinese ICP License
-    enable: false
-    url:
-    text:
-    icon: /img/icp.png
 
 # Analysis
 # --------------------------------------
 
 # Baidu Analytics
+# https://tongji.baidu.com/web/welcome/login
 baidu_analytics:
 
 # Google Analytics
+# https://analytics.google.com/analytics/web/
 google_analytics:
 
 # Tencent Analytics ID
+# https://mta.qq.com
 tencent_analytics:
 
+# CNZZ Analytics
+# https://www.umeng.com/
+cnzz_analytics:
+
 # Advertisement
 # --------------------------------------
 
@@ -470,17 +471,18 @@ tag_ui: # 留空或 index
 
 # Website Background (設置網站背景)
 # can set it to color or image (可設置圖片 或者 顔色)
-# The formal of color: '#49B202'
 # The formal of image: url(http://xxxxxx.com/xxx.jpg)
-# White color will be shown as default
 background:
 
-# Show the footer background image (same as top_img)
+# Footer Background
 footer_bg: false
 
 # the position of bottom right button/default unit: px (右下角按鈕距離底部的距離/默認單位為px)
 rightside-bottom:
 
+# Enter transitions (開啓網頁進入效果)
+enter_transitions: true
+
 # Background effects (背景特效)
 # --------------------------------------
 
@@ -494,8 +496,8 @@ canvas_ribbon:
   click_to_change: false
   mobile: false
 
-# Dynamic ribbon (動態彩帶)
+# Fluttering Ribbon (動態彩帶)
-canvas_ribbon_piao:
+canvas_fluttering_ribbon:
   enable: false
   mobile: false
 
@@ -515,23 +517,29 @@ activate_power_mode:
   enable: false
   colorful: true # open particle animation (冒光特效)
   shake: true #  open shake (抖動特效)
+  mobile: false
 
 # Mouse click effects: fireworks (鼠標點擊效果: 煙火特效)
 fireworks:
   enable: false
   zIndex: 9999 # -1 or 9999
+  mobile: false
 
 # Mouse click effects: Heart symbol (鼠標點擊效果: 愛心)
-click_heart: false
+click_heart:
+  enable: false
+  mobile: false
 
 # Mouse click effects: words (鼠標點擊效果: 文字)
 ClickShowText:
   enable: false
   text:
-    - I
+    # - I
-    - LOVE
+    # - LOVE
-    - YOU
+    # - YOU
   fontSize: 15px
+  random: false
+  mobile: false
 
 # Default display mode (網站默認的顯示模式)
 # light (default) / dark
@@ -547,14 +555,16 @@ beautify:
 # Global font settings
 # Don't modify the following settings unless you know how they work (非必要不要修改)
 font:
+  global-font-size:
+  code-font-size:
   font-family:
-  code-font:
+  code-font-family:
 
 # Font settings for the site title and site subtitle
 # 左上角網站名字 主頁居中網站名字
 blog_title_font:
-  font_link: https://fonts.googleapis.com/css?family=Titillium+Web&display=swap
+  font_link:
-  font-family: Titillium Web, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif
+  font-family:
 
 # The setting of divider icon (水平分隔線圖標設置)
 hr_icon:
@@ -591,6 +601,8 @@ preloader: false
 
 aside:
   enable: true
+  hide: false
+  button: true
   mobile: true # display on mobile
   position: right # left or right
   card_author:
@@ -621,7 +633,10 @@ aside:
     format: MMMM YYYY # eg: YYYY年MM月
     order: -1 # Sort of order. 1, asc for ascending; -1, desc for descending
     limit: 8 # if set 0 will show all
-  card_webinfo: true
+  card_webinfo:
+    enable: true
+    post_count: true
+    last_push_date: true
 
 # busuanzi count for PV / UV in site
 # 訪問人數
@@ -636,9 +651,32 @@ runtimeshow:
   enable: false
   publish_date:
 
+# Aside widget - Newest Comments
+newest_comments:
+  enable: false
+  limit: 6
+  avatar: true
+  leancloud:
+    enable: false
+    appId: # leancloud application app id
+    appKey: # leancloud application app key
+    serverURL: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in)
+    default_avatar: # mp/identicon/monsterid/wavatar/retro/robohash/blank
+  github_issues:
+    enable: false
+    repo:
+  disqus:
+    enable: false
+    forum:
+    api_key:
+  twikoo: false
+
 # Bottom right button (右下角按鈕)
 # --------------------------------------
 
+# Change font size
+change_font_size: false
+
 # Conversion between Traditional and Simplified Chinese (簡繁轉換)
 translate:
   enable: false
@@ -706,10 +744,21 @@ note:
 # other
 # --------------------------------------
 
+# Artitalk
+# see https://artitalk.js.org/
+artitalk:
+  appId:
+  appKey:
+  option:
+
 # Pjax [Beta]
 # It may contain bugs and unstable, give feedback when you find the bugs.
 # https://github.com/MoOx/pjax
-pjax: false
+pjax:
+  enable: false
+  exclude:
+    # - xxxx
+    # - xxxx
 
 # Inject the css and script (aplayer/meting)
 aplayerInject:
@@ -731,7 +780,7 @@ baidu_push: false
 
 # https://instant.page/
 # prefetch (預加載)
-instantpage: true
+instantpage: false
 
 # https://github.com/vinta/pangu.js
 # Insert a space between Chinese character and English character (中英文之間添加空格)
@@ -742,7 +791,7 @@ pangu:
 # Lazyload (圖片懶加載)
 # https://github.com/verlok/lazyload
 lazyload:
-  enable: true
+  enable: false
   post: /img/loading.gif
 
 # PWA
@@ -751,7 +800,6 @@ lazyload:
 # pwa:
 #   enable: false
 #   manifest: /image/pwa/manifest.json
-#   theme_color: "#fff"
 #   apple_touch_icon: /image/pwa/apple-touch-icon.png
 #   favicon_32_32: /image/pwa/32.png
 #   favicon_16_16: /image/pwa/16.png
@@ -767,12 +815,15 @@ Open_Graph_meta: true
 # Caches the contents in a fragment, speed up the generation (開啟hexo自帶的緩存,加快生成速度)
 fragment_cache: true
 
+# Add the vendor prefixes to ensure compatibility
+css_prefix: true
+
 # Inject
 # Insert the code to head (before '</head>' tag) and the bottom (before '</body>' tag)
 # 插入代码到头部 </head> 之前 和 底部 </body> 之前
 inject:
   head:
-  # - <link rel="stylesheet" href="/xxx.css">
+    # - <link rel="stylesheet" href="/xxx.css">
   bottom:
     # - <script src="xxxx"></script>
 
@@ -796,6 +847,7 @@ CDN:
   disqusjs: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js
   disqusjs_css: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css
   utterances: https://utteranc.es/client.js
+  twikoo: https://cdn.jsdelivr.net/npm/twikoo/dist/twikoo.all.min.js
 
   # share
   addtoany: https://static.addtoany.com/menu/page.js
@@ -819,9 +871,9 @@ CDN:
   busuanzi: //busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js
 
   # background effect
-  canvas_ribbon: /js/third-party/canvas-ribbon.js
+  canvas_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-ribbon.min.js
-  canvas_ribbon_piao: /js/third-party/piao.js
+  canvas_fluttering_ribbon: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-fluttering-ribbon.min.js
-  canvas_nest: /js/third-party/canvas-nest.js
+  canvas_nest: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-nest.min.js
 
   lazyload: https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js
   instantpage: https://cdn.jsdelivr.net/npm/instant.page/instantpage.min.js
@@ -838,11 +890,10 @@ CDN:
   snackbar: https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.js
 
   # effect
-  anime: https://cdn.jsdelivr.net/npm/animejs@latest/anime.min.js
+  activate_power_mode: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/activate-power-mode.min.js
-  activate_power_mode: /js/third-party/activate-power-mode.js
+  fireworks: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/fireworks.min.js
-  fireworks: /js/third-party/fireworks.js
+  click_heart: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-heart.min.js
-  click_heart: /js/third-party/click_heart.js
+  ClickShowText: https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-show-text.min.js
-  ClickShowText: /js/third-party/ClickShowText.js
 
   # fontawesome
   fontawesome: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css
@@ -858,3 +909,10 @@ CDN:
   aplayer_css: https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css
   aplayer_js: https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.js
   meting_js: https://cdn.jsdelivr.net/gh/metowolf/MetingJS@1.2/dist/Meting.min.js
+
+  # Prism.js
+  prismjs_js: https://cdn.jsdelivr.net/npm/prismjs/prism.min.js
+  prismjs_lineNumber_js: https://cdn.jsdelivr.net/npm/prismjs/plugins/line-numbers/prism-line-numbers.min.js
+  prismjs_autoloader: https://cdn.jsdelivr.net/npm/prismjs/plugins/autoloader/prism-autoloader.min.js
+
+  artitalk: https://cdn.jsdelivr.net/npm/artitalk

languages/default.yml

@@ -1,7 +1,3 @@
-sidebar:
-  catalog: Catalog
-  have_read: You've read
-
 footer:
   framework: Framework
   theme: Theme
@@ -45,7 +41,6 @@ local_search:
   label: Local search
   input_placeholder: Search for Posts
   hits_empty: "We didn't find any results for the search: ${query}"
-  powered_by: Powered by
 
 pagination:
   prev: Previous Post
@@ -65,29 +60,43 @@ aside:
   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:
+    headline: Newest Comments
+    loading_text: loading...
+    error: Unable to get the data, please make sure the settings are correct.
+    zero: No Comment
+  card_toc: Catalog
+
+date_suffix:
+  just: Just
+  min: minutes ago
+  hour: hours ago
+  day: days ago
+  month: months ago
 
 donate: Donate
 share: Share
-bookmark:
-  title: Bookmark
 
 rightside:
   readmode_title: Read Mode
-  font_plus_title: Increase Font Size
+  font_plus_title: Increase font size
-  font_minus_title: Decrease Font Size
+  font_minus_title: Decrease font size
-  translate_title: Switch Between Traditional Chinese And Simplified Chinese
+  translate_title: Toggle Between Traditional Chinese And Simplified Chinese
-  night_mode_title: Switch Between Light And Dark Mode
+  night_mode_title: Toggle Between Light And Dark Mode
   back_to_top: Back To Top
   toc: Table Of Contents
   scroll_to_comment: Scroll To Comments
   setting: Setting
-
+  aside: Toggle between single-column and double-column
-runtime_unit: days
 
 copy_copyright:
   author: Author
@@ -96,9 +105,6 @@ copy_copyright:
   info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
 
 Snackbar:
-  bookmark:
-    message_prev: Press
-    message_next: to bookmark this page
   chs_to_cht: Traditional Chinese Activated Manually
   cht_to_chs: Simplified Chinese Activated Manually
   day_to_night: Dark Mode Activated Manually

languages/en.yml

@@ -1,7 +1,3 @@
-sidebar:
-  catalog: Catalog
-  have_read: You've read
-
 footer:
   framework: Framework
   theme: Theme
@@ -45,7 +41,6 @@ local_search:
   label: Local search
   input_placeholder: Search for Posts
   hits_empty: "We didn't find any results for the search: ${query}"
-  powered_by: Powered by
 
 pagination:
   prev: Previous Post
@@ -65,29 +60,43 @@ aside:
   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:
+    headline: Newest Comments
+    loading_text: loading...
+    error: Unable to get the data, please make sure the settings are correct.
+    zero: No Comment
+  card_toc: Catalog
+
+date_suffix:
+  just: Just
+  min: minutes ago
+  hour: hours ago
+  day: days ago
+  month: months ago
 
 donate: Donate
 share: Share
-bookmark:
-  title: Bookmark
 
 rightside:
   readmode_title: Read Mode
-  font_plus_title: Increase Font Size
+  font_plus_title: Increase font size
-  font_minus_title: Decrease 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
-
+  aside: Toggle between single-column and double-column
-runtime_unit: days
 
 copy_copyright:
   author: Author
@@ -96,9 +105,6 @@ copy_copyright:
   info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
 
 Snackbar:
-  bookmark:
-    message_prev: Press
-    message_next: to bookmark this page
   chs_to_cht: Traditional Chinese Activated Manually
   cht_to_chs: Simplified Chinese Activated Manually
   day_to_night: Dark Mode Activated Manually

languages/zh-CN.yml

@@ -1,7 +1,3 @@
-sidebar:
-  catalog: 目录
-  have_read: 你已经读了
-
 footer:
   framework: 框架
   theme: 主题
@@ -46,8 +42,6 @@ local_search:
   label: 本地搜索
   input_placeholder: 搜索文章
   hits_empty: '找不到您查询的内容：${query}'
-  powered: '提供支持'
-  by: 由
 
 pagination:
   prev: 上一篇
@@ -67,16 +61,31 @@ aside:
   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:
+    headline: 最新评论
+    loading_text: 正在加载中...
+    error: 无法获取评论，请确认相关配置是否正确
+    zero: 没有评论
+  card_toc: 目录
+
+date_suffix:
+  just: 刚刚
+  min: 分钟前
+  hour: 小时前
+  day: 天前
+  month: 个月前
 
 donate: 打赏
 share: 分享
-bookmark:
-  title: 添加书签
 
 rightside:
   readmode_title: 阅读模式
@@ -88,8 +97,7 @@ rightside:
   toc: 目录
   scroll_to_comment: 直达评论
   setting: 设置
-
+  aside: 单栏和双栏切换
-runtime_unit: 天
 
 copy_copyright:
   author: 作者
@@ -98,15 +106,11 @@ copy_copyright:
   info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
 
 Snackbar:
-  bookmark:
-    message_prev: 按
-    message_next: 键将本页加入书签
   chs_to_cht: 你已切换为繁体
   cht_to_chs: 你已切换为简体
   day_to_night: 你已切换为深色模式
   night_to_day: 你已切换为浅色模式
 
-error_title: 页面没有找到
 loading: 加载中...
 
 error404:

languages/zh-TW.yml

@@ -1,7 +1,3 @@
-sidebar:
-  catalog: 目錄
-  have_read: 你已經讀了
-
 footer:
   framework: 框架
   theme: 主題
@@ -46,8 +42,6 @@ local_search:
   label: 本地搜尋
   input_placeholder: 搜尋文章
   hits_empty: '找不到您查詢的內容：${query}'
-  powered: '提供支援'
-  by: 由
 
 pagination:
   prev: 上一篇
@@ -67,16 +61,31 @@ aside:
   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:
+    headline: 最新評論
+    loading_text: 正在加載中...
+    error: 無法獲取評論，請確認相關配置是否正確
+    zero: 沒有評論
+  card_toc: 目錄
+
+date_suffix:
+  just: 剛剛
+  min: 分鐘前
+  hour: 小時前
+  day: 天前
+  month: 個月前
 
 donate: 打賞
 share: 分享
-bookmark:
-  title: 新增書籤
 
 rightside:
   readmode_title: 閱讀模式
@@ -88,8 +97,7 @@ rightside:
   toc: 目錄
   scroll_to_comment: 直達評論
   setting: 設定
-
+  aside: 單欄和雙欄切換
-runtime_unit: 天
 
 copy_copyright:
   author: 作者
@@ -98,9 +106,6 @@ copy_copyright:
   info: 著作權歸作者所有。商業轉載請聯絡作者獲得授權，非商業轉載請註明出處。
 
 Snackbar:
-  bookmark:
-    message_prev: 按
-    message_next: 鍵將本頁加入書籤
   chs_to_cht: 你已切換為繁體
   cht_to_chs: 你已切換為簡體
   day_to_night: 你已切換為深色模式

layout/404.pug

@@ -13,8 +13,7 @@ html(lang=config.language data-theme=theme.display_mode)
       canvas.fireworks
     
     if theme.background
-      - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
+      #web_bg
-      #web_bg(data-type=is_photo)
 
     #error-wrap
       .error-content
@@ -26,5 +25,4 @@ html(lang=config.language data-theme=theme.display_mode)
             i.fas.fa-rocket
             = _p('error404.back_button')
           
-    !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache})
     include includes/additional-js.pug

layout/flink.pug

@@ -1,24 +0,0 @@
-#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,5 +1,4 @@
 div
-  script(src=url_for(theme.CDN.jquery))
   script(src=url_for(theme.CDN.utils))
   script(src=url_for(theme.CDN.main))
 
@@ -8,14 +7,12 @@ div
 
   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.instantpage
-    script(src=url_for(theme.CDN.instantpage) type="module" defer)
+    script(src=url_for(theme.CDN.instantpage) type="module")
 
   if theme.lazyload.enable
-    script(src=url_for(theme.CDN.lazyload) async)
+    script(src=url_for(theme.CDN.lazyload))
 
   if (theme.snackbar && theme.snackbar.enable)
     script(src=url_for(theme.CDN.snackbar))
@@ -33,7 +30,7 @@ div
     !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
 
   .js-pjax
-    if is_home() && theme.subtitle.enable
+    if theme.subtitle.enable && is_home() && theme.index_img !== false
       include ./third-party/subtitle.pug
 
     include ./third-party/math/index.pug
@@ -44,6 +41,14 @@ div
     if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
       script(async src=url_for(theme.CDN.busuanzi))
 
+  !=partial('includes/third-party/prismjs', {}, {cache:theme.fragment_cache})
+
+  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})
+
   !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
   !=partial('includes/third-party/effect', {}, {cache:theme.fragment_cache})
@@ -51,11 +56,13 @@ div
   !=partial('includes/third-party/chat/index', {}, {cache:theme.fragment_cache})
   
   if theme.aplayerInject && theme.aplayerInject.enable
-    if theme.pjax || theme.aplayerInject.per_page
+    if theme.pjax.enable || theme.aplayerInject.per_page
-      include ./head/aplayer.pug
+      include ./third-party/aplayer.pug
     else if page.aplayer
-      include ./head/aplayer.pug
+      include ./third-party/aplayer.pug
 
-  if theme.pjax
+  if theme.pjax.enable
     !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache})
   
+  !=partial('includes/third-party/baidu_push', {}, {cache:theme.fragment_cache})
+  

layout/includes/footer.pug

@@ -15,9 +15,3 @@
       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.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

@@ -10,64 +10,54 @@
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
 - var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
 
-- 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'
 
 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")
-!=favicon_tag(theme.favicon || config.favicon)
+meta(name="theme-color" content=themeColor)
-link(rel="canonical" href=urlNoIndex())
 
 if theme.disable_baidu_transformation
   meta(http-equiv="Cache-Control" content="no-transform")
   meta(http-equiv="Cache-Control" content="no-siteapp")
 
+//- Open_Graph
+include ./head/Open_Graph.pug
+
+!=favicon_tag(theme.favicon || config.favicon)
+link(rel="canonical" href=urlNoIndex())
+
 //- 預解析
 !=partial('includes/head/preconnect', {}, {cache:theme.fragment_cache})
 
 //- 網站驗證
 !=partial('includes/head/site_verification', {}, {cache:theme.fragment_cache})
 
-//- Open_Graph
-include ./head/Open_Graph.pug
-
-if theme.facebook_comments.app_id
-  meta(property="fb:app_id" content=theme.facebook_comments.app_id )
-if theme.facebook_comments.user_id
-  meta(property="fb:admins" content=theme.facebook_comments.user_id)
-
 //- PWA
 if (theme.pwa && theme.pwa.enable)
   !=partial('includes/head/pwa', {}, {cache:theme.fragment_cache})
 
-if theme.darkmode.enable
-  !=partial('includes/head/darkmode', {}, {cache:theme.fragment_cache})
-
 //- main css
 link(rel='stylesheet', href=url_for(theme.CDN.main_css))
-link(rel='stylesheet', href=url_for(theme.CDN.fontawesome))
+link(rel='stylesheet', href=url_for(theme.CDN.fontawesome) media="print" onload="this.media='all'")
-
-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))
+  link(rel='stylesheet', href=url_for(theme.CDN.snackbar_css) media="print" onload="this.media='all'")
 
 if theme.algolia_search.enable
-  link(rel='stylesheet' href=url_for(theme.CDN.algolia_search_css))
+  link(rel='stylesheet' href=url_for(theme.CDN.algolia_search_css) media="print" onload="this.media='all'")
   script(src=url_for(theme.CDN.algolia_search) defer)
 
 //- google_adsense
@@ -77,8 +67,8 @@ if theme.algolia_search.enable
 !=partial('includes/head/analytics', {}, {cache:theme.fragment_cache})
 
 //- font
-if theme.blog_title_font.font_link
+if theme.blog_title_font &&　theme.blog_title_font.font_link
-  link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link))
+  link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")
 
 //- global config
 !=partial('includes/head/config', {}, {cache:theme.fragment_cache})
@@ -86,5 +76,6 @@ if theme.blog_title_font.font_link
 include ./head/config_site.pug
 include ./head/noscript.pug
 
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
+!=partial('includes/head/js', {}, {cache:theme.fragment_cache})
 
+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})

layout/includes/head/Open_Graph.pug

@@ -1,12 +1,11 @@
-- var contentType = is_post() ? 'article' : 'website'
-
 if theme.Open_Graph_meta
-  meta(property="og:type" content=contentType)
+  - let contentType = is_post() ? 'article' : 'website'
-  meta(property="og:title" content=pageTitle)
+  - let metaImage = full_url_for(page.cover || theme.avatar.img)
-  meta(property="og:url" content=urlNoIndex())
+  - let fb_appId = theme.facebook_comments.app_id || ''
-  meta(property="og:site_name" content=config.title)
+  - let fb_admins = theme.facebook_comments.user_id || ''
-  meta(property="og:description" content!=pageDescription)
+
-  meta(property="og:image" content=full_url_for(page.cover || theme.avatar.img))
+  != open_graph({type: contentType, image: metaImage, fb_admins: fb_admins, fb_app_id: fb_appId})
-  meta(property="article:published_time" content=date_xml(page.date))
+
-  meta(property="article:modified_time" content=date_xml(page.updated))
+else
-  meta(name="twitter:card" content="summary")
+  meta(name="description" content=page_description())
+

layout/includes/head/analytics.pug

@@ -17,4 +17,16 @@ if theme.google_analytics
     gtag('config', '!{theme.google_analytics}');
 
 if theme.tencent_analytics
-  script(src=`https://tajs.qq.com/stats?sId=${theme.tencent_analytics}` charset="UTF-8" data-pjax)
+  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

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

@@ -1,6 +1,6 @@
 -
-  var algolia = 'undefined';
+  let algolia = 'undefined';
-  var env = process.env;
+  let env = process.env;
   if (theme.algolia_search.enable) {
     algolia = JSON.stringify({
       appId: env.ALGOLIA_APP_ID || config.algolia.appId || config.algolia.applicationID,
@@ -16,7 +16,7 @@
     })
   }
 
-  var localSearch = 'undefined';
+  let localSearch = 'undefined';
   if (theme.local_search && theme.local_search.enable) {
     localSearch = JSON.stringify({
       path: config.search.path,
@@ -26,7 +26,8 @@
       }
     })
   }
-  var translate = 'undefined';
+
+  let translate = 'undefined';
   if (theme.translate && theme.translate.enable){
     translate = JSON.stringify({
       defaultEncoding: theme.translate.defaultEncoding,
@@ -36,7 +37,7 @@
     })
   }
 
-  var copyright = 'undefined';
+  let copyright = 'undefined';
   if (theme.copy.enable && theme.copy.copyright.enable){
     copyright = JSON.stringify({
       limitCount: theme.copy.copyright.limit_count,
@@ -49,33 +50,20 @@
     })
   }
 
-  var ClickShowText = 'undefined';
+  let Snackbar = '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({
+    Snackbar = JSON.stringify({
-    bookmark: {
+      chs_to_cht: _p("Snackbar.chs_to_cht"),
-      message_prev: _p("Snackbar.bookmark.message_prev"),
+      cht_to_chs: _p("Snackbar.cht_to_chs"),
-      message_next: _p("Snackbar.bookmark.message_next")
+      day_to_night: _p("Snackbar.day_to_night"),
-    },
+      night_to_day: _p("Snackbar.night_to_day"),
-    chs_to_cht: _p("Snackbar.chs_to_cht"),
+      bgLight: theme.snackbar.bg_light,
-    cht_to_chs: _p("Snackbar.cht_to_chs"),
+      bgDark: theme.snackbar.bg_dark,
-    day_to_night: _p("Snackbar.day_to_night"),
+      position: theme.snackbar.position,
-    night_to_day: _p("Snackbar.night_to_day"),
-    bgLight: theme.snackbar.bg_light,
-    bgDark: theme.snackbar.bg_dark,
-    position: theme.snackbar.position,
     })
   }
 
-  var noticeOutdate = 'undefined';
+  let noticeOutdate = 'undefined';
   if (theme.noticeOutdate && theme.noticeOutdate.enable) {
     noticeOutdate = JSON.stringify({
       limitDay: theme.noticeOutdate.limit_day,
@@ -85,6 +73,15 @@
     })
   }
 
+  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
+    })
+  }
+
 script.
   var GLOBAL_CONFIG = { 
     root: '!{config.root}',
@@ -92,31 +89,82 @@ script.
     localSearch: !{localSearch},
     translate: !{translate},
     noticeOutdate: !{noticeOutdate},
+    highlight: !{highlight},
     copy: {
       success: '!{_p("copy.success")}',
       error: '!{_p("copy.error")}',
       noSupport: '!{_p("copy.noSupport")}'
     },
-    bookmark: {
+    relativeDate: {
-      message_prev: '!{_p("Snackbar.bookmark.message_prev")}',
+      homepage: !{theme.post_meta.page.date_format === 'relative'},
-      message_next: '!{_p("Snackbar.bookmark.message_next")}'
+      post: !{theme.post_meta.post.date_format === 'relative'}
+    },
+    runtime: '!{theme.runtimeshow.enable ? _p("aside.card_webinfo.runtime.unit") : ""}',
+    date_suffix: {
+      just: '!{_p("date_suffix.just")}',
+      min: '!{_p("date_suffix.min")}',
+      hour: '!{_p("date_suffix.hour")}',
+      day: '!{_p("date_suffix.day")}',
+      month: '!{_p("date_suffix.month")}'
     },
-    runtime_unit: '!{_p("runtime_unit")}',
-    runtime: !{theme.runtimeshow.enable},
     copyright: !{copyright},
-    ClickShowText: !{ClickShowText},
+    lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
-    medium_zoom: !{theme.medium_zoom},
-    fancybox: !{theme.fancybox},
     Snackbar: !{Snackbar},
-    justifiedGallery: {
+    source: {
-      js: '!{theme.CDN.justifiedGallery_js}',
+      jQuery: '!{url_for(theme.CDN.jquery)}',
-      css: '!{theme.CDN.justifiedGallery_css}'
+      justifiedGallery: {
+        js: '!{url_for(theme.CDN.justifiedGallery_js)}',
+        css: '!{url_for(theme.CDN.justifiedGallery_css)}'
+      },
+      fancybox: {
+        js: '!{url_for(theme.CDN.fancybox)}',
+        css: '!{url_for(theme.CDN.fancybox_css)}'
+      }
     },
-    baiduPush: !{theme.baidu_push},
-    highlightCopy: !{theme.highlight_copy},
-    highlightLang: !{theme.highlight_lang},
     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
+    }
   }
 
+  // https://stackoverflow.com/questions/16839698/jquery-getscript-alternative-in-native-javascript
+  const getScript = url => new Promise((resolve, reject) => {
+    const script = document.createElement('script')
+    script.src = url
+    script.async = true
+    script.onerror = reject
+    script.onload = script.onreadystatechange = function() {
+      const loadState = this.readyState
+      if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+      script.onload = script.onreadystatechange = null
+      resolve()
+    }
+    document.head.appendChild(script)
+  })

layout/includes/head/config_site.pug

@@ -4,8 +4,8 @@
   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
+  var pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
-  const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true )
+  var showToc = is_post() && theme.aside.enable && pageToc && (toc(page.content) !== '' || page.encrypt == true )
 -
 
 script#config_change
@@ -14,6 +14,6 @@ script#config_change
       isPost: !{is_post()},
       isHome: !{is_home()},
       isHighlightShrink: !{isHighlightShrink},
-      isSidebar: !{showToc},
+      isToc: !{showToc},
       postUpdate: '!{full_date(page.updated)}'
     }

layout/includes/head/darkmode.pug

@@ -1,56 +0,0 @@
-script.
-  var activateDarkMode = function () {
-    document.documentElement.setAttribute('data-theme', 'dark')
-    if (document.querySelector('meta[name="theme-color"]') !== null) {
-      document.querySelector('meta[name="theme-color"]').setAttribute('content', '#000')
-    }
-  }
-  var activateLightMode = function () {
-    document.documentElement.setAttribute('data-theme', 'light')
-    if (document.querySelector('meta[name="theme-color"]') !== null) {
-      document.querySelector('meta[name="theme-color"]').setAttribute('content', '#fff')
-    }
-  }
-
-  var getCookies = function (name) {
-    const value = `; ${document.cookie}`
-    const parts = value.split(`; ${name}=`)
-    if (parts.length === 2) return parts.pop().split(';').shift()
-  }
-
-  var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-  var t = getCookies('theme')
-  if (autoChangeMode === '1') {
-    var isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-    var isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
-    var isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
-    var hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-
-    if (t === undefined) {
-      if (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.')
-        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 (Cookies.get('theme') === undefined) {
-          e.matches ? activateDarkMode() : activateLightMode()
-        }
-      })
-    } else if (t === 'light') activateLightMode()
-    else activateDarkMode()
-  } else if (autoChangeMode === '2') {
-    now = new Date()
-    hour = now.getHours()
-    isNight = hour <= 6 || hour >= 18
-    if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
-    else if (t === 'light') activateLightMode()
-    else activateDarkMode()
-  } else {
-    if (t === 'dark') activateDarkMode()
-    else if (t === 'light') activateLightMode()
-  }

layout/includes/head/js.pug

@@ -0,0 +1,71 @@
+script
+  | (function () {
+    
+  if theme.darkmode.enable
+    |   window.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')
+    |     }
+    |   }
+    |   window.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')
+    |     }
+    |   }
+
+    |   const autoChangeMode = '#{theme.darkmode.autoChangeMode}'
+    |   const t = saveToLocal.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) {
+    |         const now = new Date()
+    |         const hour = now.getHours()
+    |         const 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') {
+    |     const now = new Date()
+    |     const hour = now.getHours()
+    |     const 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()
+    |   }
+
+  if theme.aside.enable && theme.aside.button
+    | const asideStatus = saveToLocal.get('aside-status')
+    | if (asideStatus !== undefined) {
+    |    if (asideStatus === 'hide') {
+    |      document.documentElement.classList.add('hide-aside')
+    |    } else {
+    |      document.documentElement.classList.remove('hide-aside')
+    |    }
+    | }
+  
+  if theme.change_font_size
+    | const fontSizeVal = saveToLocal.get('global-font-size')
+    | if (fontSizeVal !== undefined) {
+    |   document.documentElement.style.setProperty('--global-font-size', fontSizeVal + 'px')
+    | }
+
+  | })()
+

layout/includes/head/noscript.pug

@@ -1,9 +1,14 @@
 noscript. 
-  <style>
+  <style type="text/css">
-  #nav {
+    #nav {
-    opacity: 1
+      opacity: 1
-  }
+    }
-  .justified-gallery img {
+    .justified-gallery img {
-    opacity: 1
+      opacity: 1
-  }
+    }
+
+    #recent-posts time,
+    #post-meta time {
+      display: inline !important
+    }
   </style>

layout/includes/head/preconnect.pug

@@ -1,16 +1,19 @@
 link(rel="preconnect" href="//cdn.jsdelivr.net")
 
 if theme.google_analytics
-  link(rel="preconnect" href="//www.google-analytics.com" crossorigin)
+  link(rel="preconnect" href="//www.google-analytics.com" crossorigin='')
 
 if theme.baidu_analytics
   link(rel="preconnect" href="//hm.baidu.com")
 
 if theme.tencent_analytics
-  link(rel="preconnect" href="//ta.qq.com")
+  link(rel="preconnect" href="//pingjs.qq.com")
 
-if theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
+if theme.cnzz_analytics
-  link(rel="preconnect" href="//fonts.googleapis.com" crossorigin)
+  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")

layout/includes/head/pwa.pug

@@ -1,6 +1,4 @@
 link(rel="manifest" href=url_for(theme.pwa.manifest))
-if(theme.pwa.theme_color) 
-  meta(name="theme-color" content=theme.pwa.theme_color)
 if(theme.pwa.theme_color) 
   meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
 if(theme.pwa.apple_touch_icon) 

layout/includes/header/index.pug

@@ -1,43 +1,48 @@
-if is_home()
+if page.top_img !== false
-  - var top_img = theme.index_img || theme.default_top_img
+  if is_post()
-else if is_post()
+    - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
-  - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
+  else if is_page()
-else if is_archive()
+    - var top_img = page.top_img || theme.default_top_img
-  - var top_img = theme.archive_img || theme.default_top_img
+  else if is_tag()
-else if is_tag()
+    - var top_img = theme.tag_per_img && theme.tag_per_img[page.tag] 
-  - var top_img = theme.tag_img || theme.default_top_img
+    - top_img = top_img ? top_img : (theme.tag_img !== false ? theme.tag_img || theme.default_top_img : false)
-else if is_category()
+  else if is_category()
-  - var top_img = theme.category_img || theme.default_top_img
+    - var top_img = theme.category_per_img && theme.category_per_img[page.category]
+    - top_img = top_img ? top_img : (theme.category_img !== false ? theme.category_img || theme.default_top_img : false)
+  else if is_home()
+    - var top_img = theme.index_img !== false ? theme.index_img || theme.default_top_img : false
+  else if is_archive()
+    - var top_img = theme.archive_img !== false ? theme.archive_img || theme.default_top_img : false
+  else
+    - var top_img = page.top_img || theme.default_top_img
+
+  if top_img !== false
+    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url(${url_for(top_img)})` : `background: ${top_img}`
+    - var bg_img = top_img ? imgSource : ''
+    - 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
+  else
+    - var isHomeClass = 'no-top-img'
 else
-  - var top_img = page.top_img || theme.default_top_img
+  - var top_img = false
-
+  - var isHomeClass = 'no-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()
+  if top_img !== false
-    #site-info
+    if is_post()
-      h1#site_title=site_title
+      include ./post-info.pug
-      #site_subtitle
+    else if is_home() 
-        span#subtitle
+      #site-info
-      if(theme.social)
+        h1#site-title=site_title
-        #site_social_icons
+        #site-subtitle
-          !=fragment_cache('social', function(){return partial('includes/header/social')})
+          span#subtitle
-    #scroll_down
+        if(theme.social)
-      i.fas.fa-angle-down.scroll-down-effects
+          #site_social_icons
-  else if is_post()
+            !=fragment_cache('social', function(){return partial('includes/header/social')})
-    include ./post-info.pug 
+      #scroll-down
-  else
+        i.fas.fa-angle-down.scroll-down-effects
-    #page_site-info
+    else
-      h1#site_title=site_title
+      #page-site-info
+        h1#site-title=site_title

layout/includes/header/menu_item.pug

@@ -1,4 +1,7 @@
 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)
@@ -13,7 +16,7 @@ if theme.menu
             if label.split('||')[1]
               i.fa-fw(class=trim(label.split('||')[1]))
             span=' '+ trim(label.split('||')[0])
-            i.fas.fa-chevron-down.expand
+            i.fas.fa-chevron-down.expand(class=sidebarChildHide)
           ul.menus_item_child
             each i in value
               li

layout/includes/header/nav.pug

@@ -1,16 +1,16 @@
 nav#nav
-  span#blog_name.pull-left
+  span#blog_name
-    a#site-name.blog_title(href=url_for('/')) #[=config.title]
+    a#site-name(href=url_for('/')) #[=config.title]
     
-  span.pull-right.menus
+  #menus
     if (theme.algolia_search.enable || theme.local_search.enable)
-      #search_button
+      #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
+    #toggle-menu
       a.site-page
         i.fas.fa-bars.fa-fw
 

layout/includes/header/post-info.pug

@@ -1,6 +1,5 @@
 #post-info
-  #post-title
+  h1.post-title= page.title || _p('no_title')
-    .posttitle= page.title || _p('no_title')
     
   #post-meta
     .meta-firstline
@@ -58,26 +57,32 @@
 
       if !theme.comments.lazyload && page.comments !== false && theme.comments.use && theme.comments.count
         - var whichCount = theme.comments.use[0]
-        if whichCount !== 'Livere' && whichCount !== 'Utterances'
+
+        mixin countBlock
           span.post-meta-separator |
           span.post-meta-commentcount
-            if whichCount === 'Disqus' || whichCount === 'Disqusjs'
+            i.far.fa-comments.fa-fw.post-meta-icon
-              i.far.fa-comments.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.comments') + ':'
-              span.post-meta-label= _p('post.comments') + ':'
+            if block
-              span.disqus-comment-count.comment-count
+              block
-                a(href=full_url_for(page.path) + '#disqus_thread')
+
-            else if whichCount === 'Valine'
+        if whichCount === 'Disqus' || whichCount === 'Disqusjs'
-              i.far.fa-comments.fa-fw.post-meta-icon
+          +countBlock
-              span.post-meta-label= _p('post.comments') + ':'
+            span.disqus-comment-count
-              a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
+              a(href=full_url_for(page.path) + '#disqus_thread')
-                span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+        else if whichCount === 'Valine'
-            else if whichCount === 'Gitalk'
+          +countBlock
-              i.far.fa-comments.fa-fw.post-meta-icon
+            a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
-              span.post-meta-label= _p('post.comments') + ':'
+              span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-              a(href=url_for(page.path) + '#post-comment')
+        else if whichCount === 'Gitalk'
-                span.gitalk-comment-count.comment-count
+          +countBlock
-            else if whichCount === 'Facebook Comments'
+            a(href=url_for(page.path) + '#post-comment')
-              i.far.fa-comments.fa-fw.post-meta-icon
+              span.gitalk-comment-count
-              span.post-meta-label= _p('post.comments') + ':'
+        else if whichCount === 'Twikoo'
-              a.comment-count(href=url_for(page.path) + '#post-comment')
+          +countBlock
-                span.fb-comments-count(data-href=urlNoIndex())
+            a(href=url_for(page.path) + '#post-comment')
+              span#twikoo-count
+        else if whichCount === 'Facebook Comments'
+          +countBlock
+            a(href=url_for(page.path) + '#post-comment')
+              span.fb-comments-count(data-href=urlNoIndex())

layout/includes/layout.pug

@@ -1,40 +1,40 @@
+- var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
 
 doctype html
-html(lang=config.language data-theme=theme.display_mode)
+html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside)
   head
     include ./head.pug
   body
     if theme.preloader
       !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
 
-    !=partial('includes/mobile-sidebar/index', {}, {cache:theme.fragment_cache})
+    if theme.background
+      #web_bg
+      
+    !=partial('includes/sidebar', {}, {cache:theme.fragment_cache})
 
     #body-wrap
-      if theme.background
-        - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
-        #web_bg(data-type=is_photo)
-
-      include ./sidebar.pug
       include ./header/index.pug
 
-      if (!is_post())
+      main#content-inner.layout(class=hideAside)
-        main#content-inner.layout_page(class=hideAside)
+        if body
-          if body
+          div!= body
-            div!= body
+        else
-          else
+          block content
-            block content
+          if theme.aside.enable && page.aside !== false
             include widget/index.pug
-      else
-        main#content-inner.layout_post
-          if body
-            div!= body
-          else
-            block content
 
-      - var footer_bg = theme.footer_bg == false ? '' : bg_img
+      - var footerBg = theme.footer_bg
-      - var is_bg = theme.footer_bg == false ? 'color' : 'photo'
+      if (footerBg)
-      footer#footer(style=footer_bg data-type=is_bg)
+        if (footerBg === true)
+          - var footer_bg = bg_img
+        else
+          - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url(${url_for(footerBg)})` : `background: ${footerBg}`
+      else
+        - var footer_bg = ''
+
+      footer#footer(style=footer_bg)
         !=partial('includes/footer', {}, {cache:theme.fragment_cache})
 
     include ./rightside.pug

layout/includes/loading/loading-js.pug

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

layout/includes/mixins/post-ui.pug

@@ -57,22 +57,25 @@ mixin postUI(posts)
                   span.article-meta__link #[='•']
 
         //- Display the article introduction on homepage
-        if theme.index_post_content.method == 1
+        case theme.index_post_content.method
-          .content!= article.description
+          when false
-        else if theme.index_post_content.method == 2
+            - break
-          if article.description
+          when 1
             .content!= article.description
-          else
+          when 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
+          default
             - 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
+        .recent-post-item.ads-wrap!=theme.ad.index

layout/includes/mobile-sidebar/index.pug

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

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

@@ -1,29 +0,0 @@
-#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/page/artitalk.pug

@@ -0,0 +1,28 @@
+- let option = theme.artitalk.option ? JSON.stringify(theme.artitalk.option) : false
+
+if top_img === false
+  h1.page-title= page.title
+
+#artitalk_main
+script.
+  (()=>{
+    let setting = {
+      appId: '!{theme.artitalk.appId}',
+      appKey: '!{theme.artitalk.appKey}',
+    }
+
+    if (!{Boolean(option)}) {
+      const otherSetting = !{option}
+      setting = Object.assign({}, setting, otherSetting)
+    }
+
+    const init = () => {
+      new Artitalk(setting)
+    }
+
+    if (typeof Artitalk === 'function') {
+      init()
+    } else {
+      getScript('!{theme.CDN.artitalk}').then(init)
+    }
+  })()

layout/includes/page/categories.pug

@@ -0,0 +1,5 @@
+.category-lists
+  .category-title.is-center= _p('page.category')
+    |  - 
+    span.category-amount= site.categories.length
+  div!= list_categories()

layout/includes/page/default-page.pug

@@ -0,0 +1,4 @@
+#article-container
+  if top_img === false
+    h1.page-title= page.title
+  != page.content

layout/includes/page/flink.pug

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

layout/includes/page/tags.pug

@@ -0,0 +1,5 @@
+.tag-cloud-title.is-center= _p('page.tag')
+  |  - 
+  span.tag-cloud-amount= site.tags.length
+.tag-cloud-list.is-center
+  !=cloudTags({source: site.tags, minfontsize: 1.2, maxfontsize: 2.1, limit: 0, unit: 'em'})

layout/includes/pagination.pug

@@ -18,9 +18,9 @@ else
         - 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)}'` )
+            img.prev-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
           else
-            img.prev-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` )
+            img.prev-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of previous post')
           .pagination-info
             .label=_p('pagination.prev')
             .prev_info=page.prev.title
@@ -31,9 +31,9 @@ else
       .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)}'`)
+            img.next-cover(data-lazy-src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of next post')
           else
-            img.next-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'`)
+            img.next-cover(src=url_for(pagination_cover) onerror=`onerror=null;src='${url_for(theme.error_img.post_page)}'` alt='cover of next post')
           .pagination-info
             .label=_p('pagination.next')
             .next_info=page.next.title 

layout/includes/rightside.pug

@@ -1,32 +1,38 @@
-section#rightside
+#rightside
   #rightside-config-hide
-    if is_post()
+    if is_post() && theme.readmode
-      if theme.readmode
+      button#readmode(type="button" title=_p('rightside.readmode_title'))
-        button#readmode(type="button" title=_p('rightside.readmode_title'))
+        i.fas.fa-book-open
-          i.fas.fa-book-open
+    if theme.change_font_size
-      button#font_plus(type="button" title=_p('rightside.font_plus_title'))
+      button#font-plus(type="button" title=_p('rightside.font_plus_title'))
         i.fas.fa-plus
-      button#font_minus(type="button" title=_p('rightside.font_minus_title'))
+      button#font-minus(type="button" title=_p('rightside.font_minus_title'))
         i.fas.fa-minus
-    if theme.translate && theme.translate.enable
+    if theme.translate.enable
       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
+    if theme.aside.enable && theme.aside.button && page.aside !== false
+      button#hide-aside-btn(type="button" title=_p('rightside.aside'))
+        i.fas.fa-arrows-alt-h
   #rightside-config-show
-    button#rightside_config(type="button" title=_p("rightside.setting"))
+    if is_post()
-      i.fas.fa-cog
+      if (theme.readmode || theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size)
-    if is_post() && page.comments !== false && theme.comments.use
+        button#rightside_config(type="button" title=_p("rightside.setting"))
-      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
+          i.fas.fa-cog.fa-spin
-        i.fas.fa-comments
+      if showToc
-    if showToc
+        button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
-      button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
+          i.fas.fa-list-ul
-        i.fas.fa-list-ul
+    else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button) || theme.change_font_size
+      button#rightside_config(type="button" title=_p("rightside.setting"))
+        i.fas.fa-cog.fa-spin
+
     if theme.chat_btn
       button#chat_btn(type="button" title=_p("rightside.chat_btn"))
         i.fas.fa-sms
-
+    if commentsJsLoad
+      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
+        i.fas.fa-comments
     button#go-up(type="button" title=_p("rightside.back_to_top"))
       i.fas.fa-arrow-up
-
-

layout/includes/sidebar.pug

@@ -1,21 +1,31 @@
--
+#sidebar
-  let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
+  #menu-mask
-  let autoOpenPostSet = page.auto_open == undefined ? theme.toc.auto_open : page.auto_open
+  #sidebar-menus
-  let autoOpenSidebar = autoOpenPostSet ? 'on' : ''
+    .author-avatar
--
+      if theme.lazyload.enable
-
+        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
-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
-        span.progress-notice= _p('sidebar.have_read')
-        span.progress-num 0
-        span.progress-percentage %
-        div.sidebar-toc__progress-bar      
-      if (page.encrypt == true)
-        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})
+        img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+    .site-data
+      if site.posts.length
+        .data-item.is-center
+          .data-item-link
+            a(href=url_for(config.archive_dir) + '/')
+              .headline= _p('aside.articles') 
+              .length-num= site.posts.length
 
+      if site.tags.length
+        .data-item.is-center
+          .data-item-link
+            a(href=url_for(config.tag_dir) + '/' )
+              .headline= _p('aside.tags')
+              .length-num= site.tags.length
+
+      if site.categories.length
+        .data-item.is-center
+          .data-item-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/third-party/aplayer.pug

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

layout/includes/third-party/baidu_push.pug

@@ -0,0 +1,15 @@
+if theme.baidu_push
+  script.
+    (function(){
+      const bp = document.createElement('script');
+      const curProtocol = window.location.protocol.split(':')[0];
+      if (curProtocol === 'https') {
+        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
+      }
+      else{
+        bp.src = 'http://push.zhanzhang.baidu.com/push.js';
+      }
+      bp.dataset.pjax = ''
+      const s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(bp, s);
+    })()

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

@@ -16,7 +16,7 @@ if theme.chat_btn
 
       initGitter()
 
-      if (!{theme.pjax}) {
+      if (!{theme.pjax.enable}) {
         document.addEventListener('pjax:complete', () => {
           chat.destroy()
           initGitter()

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

@@ -25,7 +25,7 @@ script.
   }
 
   if ('!{theme.comments.use[0]}' === 'Disqus' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) loadComment(document.getElementById('disqus_thread'), loadDisqus)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqus)
     else loadDisqus()
   } else {
     function loadOtherComment () {

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

@@ -1,3 +1,4 @@
+- let disqusjsApi = theme.disqusjs.api || 'https://disqus.skk.moe/disqus/'
 script.
   function loadDisqusjs () {
     function addDisqusjsCSS () {
@@ -15,7 +16,7 @@ script.
         identifier: '!{ page.path }',
         url: '!{ page.permalink }',
         title: '!{ page.title }',
-        api: '!{theme.disqusjs.api}',
+        api: '!{disqusjsApi}',
         apikey: '!{theme.disqusjs.apikey}',
         nocomment: '!{theme.disqusjs.nocomment}',
         admin: '!{theme.disqusjs.admin}',
@@ -28,13 +29,13 @@ script.
     if (window.disqusJsLoad) initDisqusjs()
     else {
       addDisqusjsCSS()
-      $.getScript('!{url_for(theme.CDN.disqusjs)}', initDisqusjs)
+      getScript('!{url_for(theme.CDN.disqusjs)}').then(initDisqusjs)
       window.disqusJsLoad = true
     }
   }
 
   if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) loadComment(document.getElementById('disqus_thread'), loadDisqusjs)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqusjs)
     else loadDisqusjs()
   }
   else {

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

@@ -16,7 +16,7 @@ script.
   }
 
   if ('!{theme.comments.use[0]}' === 'Facebook Comments' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) loadComment(document.querySelector('#post-comment .fb-comments'), loadFBComment)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#post-comment .fb-comments'), loadFBComment)
     else loadFBComment()
   } else {
     function loadOtherComment () {

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

@@ -28,7 +28,7 @@ script.
     if (typeof Gitalk === 'function') initGitalk()
     else {
       addGitalkSource()
-      $.getScript('!{url_for(theme.CDN.gitalk)}', initGitalk)
+      getScript('!{url_for(theme.CDN.gitalk)}').then(initGitalk)
     }
   }
   
@@ -40,7 +40,7 @@ script.
   }
 
   if ('!{theme.comments.use[0]}' === 'Gitalk' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) loadComment(document.getElementById('gitalk-container'), loadGitalk)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('gitalk-container'), loadGitalk)
     else loadGitalk()
   } else {
     function loadOtherComment () {

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

@@ -7,11 +7,9 @@ hr
       span= ' ' + _p('comment')
     
     if theme.comments.use.length > 1
-      .comment-switch
+      #comment-switch
         span.first-comment=defaultComment
-        label
+        span.switch-btn
-          input#switch-comments-btn(type="checkbox")
-          span.slider
         span.second-comment=theme.comments.use[1]
 
 
@@ -31,6 +29,8 @@ hr
             #gitalk-container
           when 'Utterances'
             #utterances-wrap
+          when 'Twikoo'
+            #twikoo-wrap
           when 'Facebook Comments'
             .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
                         data-numposts= theme.facebook_comments.pageSize || 10

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

@@ -12,5 +12,7 @@ each name in theme.comments.use
       include ./gitalk.pug
     when 'Utterances'
       !=partial('includes/third-party/comments/utterances', {}, {cache:theme.fragment_cache})
+    when 'Twikoo'
+      !=partial('includes/third-party/comments/twikoo', {}, {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

@@ -16,7 +16,7 @@ script.
   }
 
   if ('!{theme.comments.use[0]}' === 'Livere' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) loadComment(document.getElementById('lv-container'), loadLivere)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('lv-container'), loadLivere)
     else loadLivere()
   }
   else {

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

@@ -0,0 +1,43 @@
+script.
+  (()=>{
+    const $countDom = document.getElementById('twikoo-count')
+    const init = () => {
+      twikoo.init({
+        envId: '!{theme.twikoo}',
+        el: '#twikoo-wrap'
+      })
+    }
+
+    const getCount = () => {
+      twikoo.getCommentsCount({
+        envId: '!{theme.twikoo}',
+        urls: [window.location.pathname],
+        includeReply: false
+      }).then(function (res) {
+        $countDom.innerText = res[0].count
+      }).catch(function (err) {
+        console.error(err);
+      });
+    }
+
+    const loadTwikoo = (bool = false) => {
+      if (typeof twikoo === 'object') {
+        init()
+        bool && $countDom && setTimeout(getCount,0)
+      } else {
+        getScript('!{theme.CDN.twikoo}').then(()=> {
+          init()
+          bool && $countDom && setTimeout(getCount,0)
+        })
+      }
+    }
+
+    if ('!{theme.comments.use[0]}' === 'Twikoo' || !!{theme.comments.lazyload}) {
+      if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('twikoo-wrap'), loadTwikoo)
+      else loadTwikoo(true)
+    } else {
+      window.loadOtherComment = () => {
+        loadTwikoo()
+      }
+    }
+  })()

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

@@ -25,7 +25,7 @@ script.
   }
 
   if ('!{theme.comments.use[0]}' === 'Utterances' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) loadComment(document.getElementById('utterances-wrap'), loadUtterances)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('utterances-wrap'), loadUtterances)
     else loadUtterances()
   } else {
     function loadOtherComment () {

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

@@ -1,3 +1,4 @@
+- let option = theme.valine.option ? JSON.stringify(theme.valine.option) : false
 - let emojiMaps = '""'
 if site.data.valine
   - emojiMaps = JSON.stringify(site.data.valine)
@@ -5,7 +6,7 @@ if site.data.valine
 script.
   function loadValine () {
     function initValine () {
-      window.valine = new Valine({
+      let initData = {
         el: '#vcomment',
         appId: '#{theme.valine.appId}',
         appKey: '#{theme.valine.appKey}',
@@ -20,17 +21,27 @@ script.
         emojiMaps: !{emojiMaps},
         enableQQ: #{theme.valine.enableQQ},
         path: window.location.pathname,
-      });
+      }
-      if ('#{theme.valine.requiredFields}') { valine.config.requiredFields= '#{theme.valine.requiredFields}'.split(',') }
+
+      if (!{Boolean(theme.valine.requiredFields)}) { 
+        initData.requiredFields= ('!{theme.valine.requiredFields}'.split(','))
+      }
+      
+      if (!{Boolean(option)}) {
+        const otherData = !{option}
+        initData = Object.assign({}, initData, otherData)
+      }
+      
+      const valine = new Valine(initData)
     }
 
     if (typeof Valine === 'function') initValine() 
-    else $.getScript('!{url_for(theme.CDN.valine)}', initValine)
+    else getScript('!{url_for(theme.CDN.valine)}').then(initValine)
   }
 
   if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) loadComment(document.querySelector('#vcomment'),loadValine)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#vcomment'),loadValine)
-    else setTimeout(() => loadValine(), 0)
+    else setTimeout(loadValine, 0)
   } else {
     function loadOtherComment () {
       loadValine()

layout/includes/third-party/effect.pug

@@ -1,14 +1,13 @@
 if theme.fireworks && theme.fireworks.enable
-  canvas.fireworks
+  canvas.fireworks(mobile=`${theme.fireworks.mobile}`)
-  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)
+if (theme.canvas_fluttering_ribbon && theme.canvas_fluttering_ribbon.enable)
-  script(defer id="ribbon_piao" mobile=`${theme.canvas_ribbon_piao.mobile}` src=url_for(theme.CDN.canvas_ribbon_piao))
+  script(defer id="fluttering_ribbon" mobile=`${theme.canvas_fluttering_ribbon.mobile}` src=url_for(theme.CDN.canvas_fluttering_ribbon))
 
 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))
@@ -16,13 +15,21 @@ if (theme.canvas_nest && theme.canvas_nest.enable)
 if theme.activate_power_mode.enable
   script(src=url_for(theme.CDN.activate_power_mode))
   script.
-    POWERMODE.colorful = #{theme.activate_power_mode.colorful};
+    POWERMODE.colorful = !{theme.activate_power_mode.colorful};
-    POWERMODE.shake = #{theme.activate_power_mode.shake};
+    POWERMODE.shake = !{theme.activate_power_mode.shake};
+    POWERMODE.mobile = !{theme.activate_power_mode.mobile};
     document.body.addEventListener('input', POWERMODE);
 
 //- 鼠標特效
-if theme.click_heart
+if theme.click_heart && theme.click_heart.enable
-  script(src=url_for(theme.CDN.click_heart) async)
+  script#click-heart(src=url_for(theme.CDN.click_heart) async mobile=`${theme.click_heart.mobile}`)
 
 if theme.ClickShowText && theme.ClickShowText.enable
-  script(src=url_for(theme.CDN.ClickShowText) async)
+  script#click-show-text(
+    src= url_for(theme.CDN.ClickShowText)
+    data-mobile= `${theme.ClickShowText.mobile}`
+    data-text= theme.ClickShowText.text.join(",")
+    data-fontsize= theme.ClickShowText.fontSize
+    data-random= `${theme.ClickShowText.random}`
+    async
+  )

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

@@ -2,6 +2,9 @@ link(rel="stylesheet" type="text/css" href=theme.CDN.katex)
 script(src=url_for(theme.CDN.katex_copytex))
 link(rel="stylesheet" type="text/css" href=theme.CDN.katex_copytex_css)
 script.
-  $(function () {
+  (() => {
-    $('span.katex-display').wrap('<div class="katex-wrap"></div>')
+    document.querySelectorAll('#article-container span.katex-display').forEach(item => {
-  })
+      btf.wrap(item, 'div', '', 'katex-wrap')
+    })
+  })()
+  

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

@@ -28,12 +28,20 @@ script.
               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')
+    const script = document.createElement('script')
     script.src = '!{theme.CDN.mathjax}'
     script.id = 'MathJax-script'
     script.async = true

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

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

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

@@ -0,0 +1,84 @@
+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 getComment = () => {
+      fetch('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}')
+        .then(response => response.json())
+        .then(data => {
+          const disqusArray = data.response.map(item => {
+            return {
+              '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)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        })
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            let name = 'src'
+            if(!{theme.lazyload.enable}) {
+              name = 'data-lazy-src'
+            }
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></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>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      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 {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })
+
+
+

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

@@ -0,0 +1,84 @@
+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 getComment = () => {
+      fetch('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')
+        .then(response => response.json())
+        .then(data => {
+          const githubArray = data.map(item => {
+            return {
+              '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)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        })
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            let name = 'src'
+            if(!{theme.lazyload.enable}) {
+              name = 'data-lazy-src'
+            }
+            result += `<a href='${array[i].url}' class="thumbnail"><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></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>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      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 {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })
+
+
+
+

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

@@ -0,0 +1,8 @@
+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
+else if theme.newest_comments.twikoo
+  include ./twikoo-comment.pug

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

@@ -0,0 +1,106 @@
+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 = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            let name = 'src'
+            if(!{theme.lazyload.enable}) {
+              name = 'data-lazy-src'
+            }
+            result += `<a href='${array[i].url}' class="thumbnail"><img ${name}='${getIcon(array[i].avatar, array[i].mail)}' alt='${array[i].nick}'></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>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const getComment = () => {
+        let serverURL = ''
+        if (!{Boolean(theme.newest_comments.leancloud.serverURL)}) {
+          serverURL = '!{theme.newest_comments.leancloud.serverURL}'
+        } else {
+          serverURL = 'https://!{theme.newest_comments.leancloud.appId.substring(0,8)}.api.lncldglobal.com'
+        }
+
+      var settings = {
+        "method": "GET",
+        "headers": {
+          "X-LC-Id": '!{theme.newest_comments.leancloud.appId}',
+          "X-LC-Key": '!{theme.newest_comments.leancloud.appKey}',
+          "Content-Type": "application/json"
+        },
+      }
+
+      fetch(`${serverURL}/1.1/classes/Comment?limit=!{theme.newest_comments.limit}&order=-createdAt`,settings)
+        .then(response => response.json())
+        .then(data => {
+          const valineArray = data.results.map(function (e) {
+            return {
+              'avatar': e.QQAvatar,
+              'content': changeContent(e.comment),
+              'mail': e.mail,
+              'nick': e.nick,
+              'url': e.url,
+              'date': e.createdAt,
+            }
+          })
+          saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
+          generateHtml(valineArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        }) 
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('leancloud-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })

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

@@ -0,0 +1,84 @@
+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 getComment = () => {
+      const runTwikoo = () => {
+        twikoo.getRecentComments({
+          envId: '!{theme.twikoo}',
+          pageSize: !{theme.newest_comments.limit},
+          includeReply: true
+        }).then(function (res) {
+          saveToLocal.set('twikoo-newest-comments', JSON.stringify(res), 10/(60*24))
+          generateHtml(res)
+        }).catch(function (err) {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        })
+      }
+
+      if (typeof twikoo === 'object') {
+        runTwikoo()
+      } else {
+        getScript('!{theme.CDN.twikoo}').then(runTwikoo)
+      }
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            let name = 'src'
+            if(!{theme.lazyload.enable}) {
+              name = 'data-lazy-src'
+            }
+            result += `<a href='${array[i].url + '#' + array[i].id}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+          
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url + '#' + array[i].id}'>${changeContent(array[i].commentText)}</a>
+          <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].created, true)}</time></div>
+          </div></div>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('twikoo-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })
+
+
+

layout/includes/third-party/pangu.pug

@@ -2,9 +2,10 @@ script.
   function panguFn () {
     if (typeof pangu === 'object') pangu.spacingElementById('content-inner')
     else {
-      $.getScript('!{url_for(theme.CDN.pangu)}', () => {
+      getScript('!{url_for(theme.CDN.pangu)}')
-        pangu.spacingElementById('content-inner')
+        .then(() => {
-      })
+          pangu.spacingElementById('content-inner')
+        })
     }
   }
 
@@ -16,4 +17,4 @@ script.
     }
   }
 
-  document.addEventListener('DOMContentLoaded', panguFn)
+  document.addEventListener('DOMContentLoaded', panguInit)

layout/includes/third-party/pjax.pug

@@ -1,27 +1,43 @@
+- 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',
+    '#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: 'a:not([target="_blank"])',
+    elements: '!{pjaxExclude}',
-    selectors: [
+    selectors: pjaxSelectors,
-      'title',
-      'meta[name=description]',
-      '#config_change',
-      '#body-wrap',
-      '#rightside-config-hide',
-      '#rightside-config-show',
-      '.js-pjax'
-    ],
     cacheBust: false,
+    analytics: !{theme.google_analytics ? true : false},
+    scrollRestoration: false
   })
 
   document.addEventListener('pjax:complete', function () {
-    refreshFn()
+    window.refreshFn()
 
-    $('script[data-pjax]').each(function () {
+    document.querySelectorAll('script[data-pjax]').forEach(item => {
-      $(this).parent().append($(this).remove())
+      const newScript = document.createElement('script')
+      const content = item.text || item.textContent || item.innerHTML || ""
+      Array.from(item.attributes).forEach(attr => newScript.setAttribute(attr.name, attr.value))
+      newScript.appendChild(document.createTextNode(content))
+      item.parentNode.replaceChild(newScript, item)
     })
 
-    GLOBAL_CONFIG.islazyload && lazyLoadInstance.update()
+    GLOBAL_CONFIG.islazyload && window.lazyLoadInstance.update()
 
     typeof chatBtnFn === 'function' && chatBtnFn()
     typeof panguInit === 'function' && panguInit()
@@ -32,9 +48,21 @@ script.
 
     typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()
 
+    // Analytics
+    if (!{theme.tencent_analytics ? true : false}) {
+      MtaH5.pgv()
+    }
+
+    // prismjs
+    typeof Prism === 'object' && Prism.highlightAll()
+
+    typeof preloader === 'object' && preloader.endLoading()
   })
 
+
   document.addEventListener('pjax:send', function () {
+    typeof preloader === 'object' && preloader.initLoading()
+    
     if (window.aplayers) {
       for (let i = 0; i < window.aplayers.length; i++) {
         if (!window.aplayers[i].options.fixed) {
@@ -45,12 +73,8 @@ script.
 
     typeof typed === 'object' && typed.destroy()
 
-    $(window).off('scroll')
-
     //reset readmode
-    $('body').hasClass('read-mode') && $('body').removeClass('read-mode')
+    const $bodyClassList = document.body.classList
+    $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')
 
-    //reset font-size
-    $('body').css('font-size') !== originFontSize && $('body').css('font-size', parseFloat(originFontSize))
   })
-

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

@@ -1,12 +1,13 @@
-#algolia-search.search-dialog
+#algolia-search
-  #algolia-search-title.search-dialog__title Algolia
+  .search-dialog
-  #algolia-input-panel
+    #algolia-search-title.search-dialog__title Algolia
-    #algolia-search-input
+    #algolia-input-panel
-  hr
+      #algolia-search-input
-  #algolia-search-results
+    hr
-    #algolia-hits
+    #algolia-search-results
-    #algolia-pagination
+      #algolia-hits
-    #algolia-stats
+      #algolia-pagination
-  span.search-close-button
+      #algolia-stats
-    i.fas.fa-times
+    span.search-close-button
-#search-mask
+      i.fas.fa-times
+  #search-mask

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

@@ -1,23 +1,12 @@
-#local-search.search-dialog
+#local-search
-  #local-search-title.search-dialog__title=_p("local_search.label")
+  .search-dialog
-  #local-input-panel
+    #local-search-title.search-dialog__title=_p("local_search.label")
-    #local-search-input
+    #local-input-panel
-      .local-search-box
+      #local-search-input
-        input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
+        .local-search-box
-  hr
+          input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
-  #local-search-results
+    hr
-    #local-hits
+    #local-search-results
-    #local-stats
+    span.search-close-button
-      #hr.local-search-stats__hr
+      i.fas.fa-times
-        case config.language
+  #search-mask
-          when "zh-CN"
-            span=_p("local_search.by")
-            |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
-            |  #[span=_p("local_search.powered")]
-          when "en"
-          default
-            span=_p("local_search.powered_by")
-            |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
-  span.search-close-button
-    i.fas.fa-times
-#search-mask

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

@@ -1,6 +1,7 @@
 .addtoany
   .a2a_kit.a2a_kit_size_32.a2a_default_style
-    each name in theme.addtoany.item
+    - let addtoanyItem = theme.addtoany.item.split(',')
+    each name in addtoanyItem
       a(class="a2a_button_" + name)
 
     a.a2a_dd(href="https://www.addtoany.com/share")

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

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

layout/includes/third-party/subtitle.pug

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

layout/includes/widget/card_ad.pug

@@ -1,2 +1,3 @@
-.card-widget.card-ad
+if theme.ad && theme.ad.aside
-  != theme.ad.aside
+  .card-widget.ads-wrap
+    != theme.ad.aside

layout/includes/widget/card_announcement.pug

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

layout/includes/widget/card_archives.pug

@@ -1,11 +1,12 @@
-.card-widget.card-archives
+if theme.aside.card_archives.enable
-  .card-content
+  .card-widget.card-archives
-    .item-headline
+    .card-content
-      i.fas.fa-archive
+      .item-headline
-      span= _p('aside.card_archives')
+        i.fas.fa-archive
+        span= _p('aside.card_archives')
       
-    - let type = theme.aside.card_archives.type || 'monthly'
+      - let type = theme.aside.card_archives.type || 'monthly'
-    - let format = theme.aside.card_archives.format || 'MMMM YYYY'
+      - let format = theme.aside.card_archives.format || 'MMMM YYYY'
-    - let order = theme.aside.card_archives.order || -1
+      - let order = theme.aside.card_archives.order || -1
-    - let limit = theme.aside.card_archives.limit === 0 ? 0 : theme.aside.card_archives.limit || 8
+      - let limit = theme.aside.card_archives.limit === 0 ? 0 : theme.aside.card_archives.limit || 8
-    != aside_archives({ type:type, format: format, order: order, limit: limit })
+      != aside_archives({ type:type, format: format, order: order, limit: limit })

layout/includes/widget/card_author.pug

@@ -1,36 +1,37 @@
-.card-widget.card-info
+if theme.aside.card_author.enable
-  .card-content
+  .card-widget.card-info
-    .card-info-avatar.is-center
+    .card-content
-      if theme.lazyload.enable
+      .card-info-avatar.is-center
-        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
+        if theme.lazyload.enable
-      else
+          img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
-        img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")      
+        else
-      .author-info__name= config.author
+          img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")      
-      .author-info__description!= theme.aside.card_author.description || config.description
+        .author-info__name= config.author
+        .author-info__description!= theme.aside.card_author.description || config.description
 
-    .card-info-data
+      .card-info-data
-      if site.posts.length
+        if site.posts.length
-        .card-info-data-item.is-center
+          .card-info-data-item.is-center
-          a(href=url_for(config.archive_dir))
+            a(href=url_for(config.archive_dir) + '/')
-            .headline= _p('aside.articles') 
+              .headline= _p('aside.articles') 
-            .length_num= site.posts.length
+              .length-num= site.posts.length
 
-      if site.tags.length
+        if site.tags.length
-        .card-info-data-item.is-center       
+          .card-info-data-item.is-center
-          a(href=url_for(config.tag_dir))
+            a(href=url_for(config.tag_dir) + '/')
-            .headline= _p('aside.tags')
+              .headline= _p('aside.tags')
-            .length_num= site.tags.length
+              .length-num= site.tags.length
 
-      if site.categories.length
+        if site.categories.length
-        .card-info-data-item.is-center
+          .card-info-data-item.is-center
-          a(href=url_for(config.category_dir))
+            a(href=url_for(config.category_dir) + '/')
-            .headline= _p('aside.categories') 
+              .headline= _p('aside.categories') 
-            .length_num= site.categories.length
+              .length-num= site.categories.length
 
-    a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
+      a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
-      i(class=theme.aside.card_author.button.icon)
+        i(class=theme.aside.card_author.button.icon)
-      span=theme.aside.card_author.button.text
+        span=theme.aside.card_author.button.text
     
-    if(theme.social)
+      if(theme.social)
-        .card-info-social-icons.is-center
+          .card-info-social-icons.is-center
-          !=fragment_cache('social', function(){return partial('includes/header/social')}) 
+            !=fragment_cache('social', function(){return partial('includes/header/social')}) 

layout/includes/widget/card_categories.pug

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

layout/includes/widget/card_newest_comment.pug

@@ -0,0 +1,8 @@
+if theme.newest_comments.enable
+  .card-widget#card-newest-comments
+    .card-content
+      .item-headline
+        i.fas.fa-bolt
+        span= _p('aside.card_newest_comments.headline')
+      .aside-list
+        span= _p('aside.card_newest_comments.loading_text')

layout/includes/widget/card_post_toc.pug

@@ -0,0 +1,13 @@
+- let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
+
+#card-toc.card-widget
+  .card-content
+    .item-headline
+      i.fas.fa-stream
+      span= _p('aside.card_toc')
+
+    if (page.encrypt == true)
+      .toc-content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
+    else 
+      .toc-content!=toc(page.content, {list_number: tocNumber})
+      

layout/includes/widget/card_recent_post.pug

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

layout/includes/widget/card_tags.pug

@@ -1,12 +1,13 @@
-if site.tags.length
+if theme.aside.card_tags.enable
-  .card-widget.card-tags
+  if site.tags.length
-    .card-content
+    .card-widget.card-tags
-      .item-headline
+      .card-content
-        i.fas.fa-tags
+        .item-headline
-        span= _p('aside.card_tags')
+          i.fas.fa-tags
+          span= _p('aside.card_tags')
 
-      - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40
+        - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40
-      if theme.aside.card_tags.color
+        if theme.aside.card_tags.color
-        .card-tag-cloud!=cloudTags({source: site.tags, minfontsize: 16, maxfontsize: 22, limit: tagLimit})
+          .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.1, maxfontsize: 1.5, limit: tagLimit, unit: 'em'})
-      else
+        else
-        .card-tag-cloud!= tagcloud({min_font: 16, max_font: 22, amount: tagLimit , color: true, start_color: '#999', end_color: '#99a9bf'})
+          .card-tag-cloud!= tagcloud({min_font: 1.1, max_font: 1.5, amount: tagLimit , color: true, start_color: '#999', end_color: '#99a9bf', unit: 'em'})

layout/includes/widget/card_webinfo.pug

@@ -1,26 +1,32 @@
-.card-widget.card-webinfo
+if theme.aside.card_webinfo.enable
-  .card-content
+  .card-widget.card-webinfo
-    .item-headline
+    .card-content
+      .item-headline
         i.fas.fa-chart-line
         span= _p('aside.card_webinfo.headline')
-    .webinfo
+      .webinfo
-      .webinfo-item
+        if theme.aside.card_webinfo.post_count
-        .webinfo-article-name= _p('aside.card_webinfo.article_name') + " :"
+          .webinfo-item
-        .webinfo-article-count= site.posts.length      
+            .item-name= _p('aside.card_webinfo.article_name') + " :"
-      if theme.runtimeshow.enable
+            .item-count= site.posts.length
-        .webinfo-item
+        if theme.runtimeshow.enable
-          .webinfo-runtime-name= _p('aside.card_webinfo.runtime_name') + " :"
+          .webinfo-item
-          #webinfo-runtime-count.webinfo-runtime-count(publish_date=theme.runtimeshow.publish_date)      
+            .item-name= _p('aside.card_webinfo.runtime.name') + " :"
-      if theme.wordcount.enable && theme.wordcount.total_wordcount
+            .item-count#runtimeshow(data-publishDate=date_xml(theme.runtimeshow.publish_date))
-        .webinfo-item
+        if theme.wordcount.enable && theme.wordcount.total_wordcount
-          .webinfo-site-wordcount-name=_p('aside.card_webinfo.site_wordcount') + " :"
+          .webinfo-item
-          .webinfo-site-wordcount=totalcount(site)
+            .item-name=_p('aside.card_webinfo.site_wordcount') + " :"
-      if theme.busuanzi.site_uv 
+            .item-count=totalcount(site)
-        .webinfo-item       
+        if theme.busuanzi.site_uv 
-          .webinfo-site-uv-name= _p('aside.card_webinfo.site_uv_name') + " :"
+          .webinfo-item
-          .webinfo-site-uv-count#busuanzi_value_site_uv
+            .item-name= _p('aside.card_webinfo.site_uv_name') + " :"
-      if theme.busuanzi.site_pv
+            .item-count#busuanzi_value_site_uv
-        .webinfo-item
+        if theme.busuanzi.site_pv
-          .webinfo-site-name= _p('aside.card_webinfo.site_pv_name') + " :"
+          .webinfo-item
-          .webinfo-site-pv-count#busuanzi_value_site_pv
+            .item-name= _p('aside.card_webinfo.site_pv_name') + " :"
+            .item-count#busuanzi_value_site_pv
+        if theme.aside.card_webinfo.last_push_date
+          .webinfo-item
+            .item-name= _p('aside.card_webinfo.last_push_date.name') + " :"
+            .item-count#last-push-date(data-lastPushDate=date_xml(Date.now()))
 

layout/includes/widget/index.pug

@@ -1,19 +1,26 @@
-if theme.aside.enable 
+#aside_content.aside_content
-  if page.aside !== false
+  //- post
-    #aside_content.aside_content
+  if is_post()
-      if theme.aside.card_author.enable
+    if showToc && theme.toc.style_simple
-        !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
+      .sticky_layout
-      if theme.aside.card_announcement.enable
+        include ./card_post_toc.pug
-        !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
+    else
-      if theme.aside.card_recent_post.enable
+      !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
+      .sticky_layout
+        if showToc
+          include ./card_post_toc.pug
         !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
-      if theme.ad && theme.ad.aside
         !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
-      if theme.aside.card_categories.enable
+  else
-        !=partial('includes/widget/card_categories', {}, {cache:theme.fragment_cache})
+    //- page
-      if theme.aside.card_tags.enable
+    !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
-        !=partial('includes/widget/card_tags', {}, {cache:theme.fragment_cache})
+    !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
-      if theme.aside.card_archives.enable
+    .sticky_layout
-        !=partial('includes/widget/card_archives', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
-      if theme.aside.card_webinfo
+      !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
-        !=partial('includes/widget/card_webinfo', {}, {cache:theme.fragment_cache})  
+      !=partial('includes/widget/card_newest_comment', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_categories', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_tags', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_archives', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_webinfo', {}, {cache:theme.fragment_cache})

layout/page.pug

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

layout/post.pug

@@ -1,8 +1,11 @@
 extends includes/layout.pug
 
 block content
-  article#post(class="")
+  #post
-    #article-container.post-content!=page.content
+    if top_img === false
+      include includes/header/post-info.pug
+
+    article#article-container.post-content!=page.content
     include includes/post/post-copyright.pug
     .tag_share
       if (theme.post_meta.post.tags)
@@ -16,7 +19,7 @@ block content
 
     //- ad
     if theme.ad && theme.ad.post
-      .post-ad!=theme.ad.post
+      .ads-wrap!=theme.ad.post
 
     include includes/pagination.pug
     if theme.related_post && theme.related_post.enable

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "3.0.0",
+  "version": "3.4.2",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -23,10 +23,10 @@
     "email": "wong@jerryc.me"
   },
   "dependencies": {
-    "hexo-renderer-stylus": "^1.1.0",
+    "hexo-renderer-stylus": "^2.0.1",
     "hexo-renderer-pug": "^1.0.0"
   },
-  "homepage": "https://demo.jerryc.me/",
+  "homepage": "https://butterfly.js.org/",
   "author": "Jerry <wong@jerryc.me>",
   "license": "Apache-2.0"
 }

scripts/events/init.js

@@ -0,0 +1,27 @@
+const logger = require('hexo-log')()
+
+hexo.extend.filter.register('before_generate', () => {
+  // Get first two digits of the Hexo version number
+  var hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
+
+  if (hexoVer < 5) {
+    logger.error('Please update Hexo to V5.0.0 or higher!')
+    logger.error('請把 Hexo 升級到 V5.0.0 或更高的版本！')
+    process.exit(-1)
+  }
+
+  if (hexo.locals.get) {
+    const data = hexo.locals.get('data')
+    if (data && data.butterfly) {
+      logger.error(" 'butterfly.yml' is deprecated. Please use '_config.butterfly.yml' ")
+      logger.error(" 'butterfly.yml' 已經棄用，請使用 '_config.butterfly.yml' ")
+      process.exit(-1)
+    }
+  }
+
+  // let stylus to get the hexo highlight config
+  const themeConfig = hexo.theme.config
+  const hexoConfig = hexo.config
+  themeConfig.highlight_settings = hexoConfig.highlight
+  themeConfig.prismjs_settings = hexoConfig.prismjs
+})

scripts/events/replace_config.js

@@ -1,14 +0,0 @@
-/**
- * Note: configs in _data/butterfly.yml will replace configs in hexo.theme.config.
- */
-
-'use strict'
-
-hexo.on('generateBefore', function () {
-  const rootConfig = hexo.config
-  if (hexo.locals.get) {
-    const data = hexo.locals.get('data')
-    data && data.butterfly && (hexo.theme.config = data.butterfly)
-  }
-  hexo.theme.config.rootConfig = rootConfig
-})

scripts/events/welcome.js

@@ -1,6 +1,8 @@
+const logger = require('hexo-log')()
+
 hexo.on('ready', () => {
   const { version } = require('../../package.json')
-  hexo.log.info(`
+  logger.info(`
   ===================================================================
                                                                      
       #####  #    # ##### ##### ###### #####  ###### #      #   #    
@@ -10,6 +12,6 @@ hexo.on('ready', () => {
       #    # #    #   #     #   #      #   #  #      #        #    
       #####   ####    #     #   ###### #    # #      ######   #  
 
-                              ${version}                       
+                            ${version}                       
   ===================================================================`)
 })

scripts/filters/random_cover.js

@@ -6,8 +6,14 @@
 'use strict'
 
 hexo.extend.filter.register('before_post_render', function (data) {
-  if (data.top_img && data.top_img.indexOf('/') === -1) data.top_img = data.path + data.top_img
+  const { config } = this
-  if (data.cover && data.cover.indexOf('/') === -1) data.cover = data.path + data.cover
+  if (config.post_asset_folder) {
+    const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/
+    const topImg = data.top_img
+    const cover = data.cover
+    if (topImg && topImg.indexOf('/') === -1 && imgTestReg.test(topImg)) data.top_img = data.path + topImg
+    if (cover && cover.indexOf('/') === -1) data.cover = data.path + cover
+  }
 
   if (data.cover === false) {
     data.randomcover = randomCover()
@@ -33,6 +39,7 @@ function randomCover () {
       return cover
     }
   } else {
-    return theme.default_top_img
+    cover = 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/img/default.jpg'
+    return cover
   }
 }

scripts/helpers/aside_archives.js

@@ -91,7 +91,7 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
 
   if (len > Judge) {
     result += '<li class="card-archive-list-item more is-center">'
-    result += `<a class="card-archive-list-link-more" href="${this.url_for(archiveDir)}">
+    result += `<a class="card-archive-list-link-more" href="${this.url_for(archiveDir)}/">
               <span>${moreButton}</span><i class="fas fa-angle-right"  ></i></a></li>`
   }
   result += '</ul>'

scripts/helpers/aside_categories.js

@@ -65,11 +65,11 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
 
           result += '</a>'
 
-          result += '</li>'
-
           if (child) {
             result += `<ul class="card-category-list child">${child}</ul>`
           }
+
+          result += '</li>'
         }
       })
     }
@@ -83,13 +83,13 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
     let moreHtml = ''
     if (categories.length <= limit) return ''
     moreHtml += '<li class="card-category-list-item more is-center">'
-    moreHtml += `<a class="card-category-list-link-more" href="${categoryDir}">
+    moreHtml += `<a class="card-category-list-link-more" href="${categoryDir}/">
                 <span>${buttonLabel}</span><i class="fas fa-angle-right"></i></a></li>`
 
     return moreHtml
   }
 
-  return `<ul class="card-category-list">
+  return `<ul class="card-category-list" id="aside-cat-list">
             ${list[0]}
             ${moreButton()}
             </ul>`

scripts/helpers/page.js

@@ -2,13 +2,12 @@
  * Butterfly
  * @example
  *  page_description()
- *  injectHtml(data)
  *  cloudTags(source, minfontsize, maxfontsize, limit)
  */
 
 'use strict'
 
-const { stripHTML, escapeHTML } = require('hexo-util')
+const { stripHTML, escapeHTML, prettyUrls } = require('hexo-util')
 const crypto = require('crypto')
 
 hexo.extend.helper.register('page_description', function () {
@@ -23,6 +22,46 @@ hexo.extend.helper.register('page_description', function () {
   }
 })
 
+hexo.extend.helper.register('cloudTags', function (options = {}) {
+  const env = this
+  let source = options.source
+  const minfontsize = options.minfontsize
+  const maxfontsize = options.maxfontsize
+  const limit = options.limit
+  const unit = options.unit || 'px'
+
+  let result = ''
+  if (limit > 0) {
+    source = source.limit(limit)
+  }
+
+  const sizes = []
+  source.sort('length').forEach(tag => {
+    const { length } = tag
+    if (sizes.includes(length)) return
+    sizes.push(length)
+  })
+
+  const length = sizes.length - 1
+  source.forEach(tag => {
+    const ratio = length ? sizes.indexOf(tag.length) / length : 0
+    const size = minfontsize + ((maxfontsize - minfontsize) * ratio)
+    let style = `font-size: ${parseFloat(size.toFixed(2))}${unit};`
+    const color = 'rgb(' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ')' // 0,0,0 -> 200,200,200
+    style += ` color: ${color}`
+    result += `<a href="${env.url_for(tag.path)}" style="${style}">${tag.name}</a>`
+  })
+  return result
+})
+
+hexo.extend.helper.register('urlNoIndex', function () {
+  return prettyUrls(this.url, { trailing_index: false, trailing_html: false })
+})
+
+hexo.extend.helper.register('md5', function (path) {
+  return crypto.createHash('md5').update(decodeURI(this.url_for(path))).digest('hex')
+})
+
 hexo.extend.helper.register('injectHtml', function (data) {
   let result = ''
   if (!data) return ''
@@ -31,33 +70,3 @@ hexo.extend.helper.register('injectHtml', function (data) {
   }
   return result
 })
-
-hexo.extend.helper.register('cloudTags', function (options = {}) {
-  const env = this
-  const source = options.source
-  const minfontsize = options.minfontsize
-  const maxfontsize = options.maxfontsize
-  const limit = options.limit
-
-  let result = ''
-  const tagLimit = limit === 0 ? source.length : limit
-  source.sort('name').limit(tagLimit).forEach(function (tags) {
-    const fontSize = Math.floor(Math.random() * (maxfontsize - minfontsize) + minfontsize) + 'px'
-    const color = 'rgb(' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ', ' + Math.floor(Math.random() * 201) + ')' // 0,0,0 -> 200,200,200
-    result += `<a href='${env.url_for(tags.path)}' style='font-size:${fontSize}; color:${color}'>${tags.name}</a>`
-  })
-  return result
-})
-
-hexo.extend.helper.register('urlNoIndex', function () {
-  const { permalink } = hexo.config
-  let url = this.url.replace(/index\.html$/, '')
-  if (!permalink.endsWith('.html')) {
-    url = url.replace(/\.html$/, '')
-  }
-  return url
-})
-
-hexo.extend.helper.register('md5', function (path) {
-  return crypto.createHash('md5').update(decodeURI(this.url_for(path))).digest('hex')
-})

scripts/helpers/related_post.js

@@ -35,7 +35,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
     return ''
   }
   let result = ''
-  const hexoConfig = hexo.theme.config.rootConfig
+  const hexoConfig = hexo.config
   const config = hexo.theme.config
 
   const limitNum = config.related_post.limit || 6
@@ -48,11 +48,11 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
   if (relatedPosts.length > 0) {
     result += '<div class="relatedPosts">'
     result +=
-      '<div class="relatedPosts_headline"><i class="fas fa-thumbs-up fa-fw"></i><span>' +
+      '<div class="headline"><i class="fas fa-thumbs-up fa-fw"></i><span>' +
       ' ' +
       headlineLang +
       '</span></div>'
-    result += '<div class="relatedPosts_list">'
+    result += '<div class="relatedPosts-list">'
 
     for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {
       const cover =
@@ -60,33 +60,33 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
           ? relatedPosts[i].randomcover
           : relatedPosts[i].cover
       result +=
-        '<div class="relatedPosts_item"><a href="' +
+        '<div><a href="' +
         hexoConfig.root +
         relatedPosts[i].path +
         '" title="' +
         relatedPosts[i].title +
         '">'
       result +=
-        '<img class="relatedPosts_cover" ' +
+        '<img class="cover" ' +
         lazySrc +
         '="' +
-        cover +
+        this.url_for(cover) +
-        '">'
+        '" alt="cover">'
       if (dateType === 'created') {
         result +=
-          '<div class="relatedPosts_main is-center"><div class="relatedPosts_date"><i class="far fa-calendar-alt fa-fw"></i>' +
+          '<div class="content is-center"><div class="date"><i class="far fa-calendar-alt fa-fw"></i>' +
           ' ' +
           this.date(relatedPosts[i].created, hexoConfig.date_format) +
           '</div>'
       } else {
         result +=
-          '<div class="relatedPosts_main is-center"><div class="relatedPosts_date"><i class="fas fa-history fa-fw"></i>' +
+          '<div class="content is-center"><div class="date"><i class="fas fa-history fa-fw"></i>' +
           ' ' +
           this.date(relatedPosts[i].updated, hexoConfig.date_format) +
           '</div>'
       }
       result +=
-        '<div class="relatedPosts_title">' + relatedPosts[i].title + '</div>'
+        '<div class="title">' + relatedPosts[i].title + '</div>'
       result += '</div></a></div>'
     }
 

scripts/tag/gallery.js

@@ -20,7 +20,7 @@ function galleryGroup (args) {
 
   return `
   <figure class="gallery-group">
-  <img class="gallery-group-img" src='${img}'>
+  <img class="gallery-group-img" src='${img}' alt="Group Image Gallery">
   <figcaption>
   <div class="gallery-group-name">${name}</div>
   <p>${desrc}</p>

scripts/tag/hide.js

@@ -44,7 +44,7 @@ function hideBlock (args, content) {
   group += '"'
 
   return `<div class="hide-block"><button type="button" class="hide-button button--animated" ${group}>${display}
-    </button><span class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}</span></div>`
+    </button><div class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></div>`
 }
 
 function hideToggle (args, content) {
@@ -63,7 +63,7 @@ function hideToggle (args, content) {
   group += '"'
 
   return `<div class="hide-toggle" ${border}><div class="hide-button toggle-title" ${group}><i class="fas fa-caret-right fa-fw"></i><span>${display}</span></div>
-    <div class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}</div></div>`
+    <div class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></div>`
 }
 
 hexo.extend.tag.register('hideInline', hideInline)

scripts/tag/mermaid.js

@@ -6,10 +6,10 @@
 
 'use strict'
 
+const { escapeHTML } = require('hexo-util')
+
 function mermaid (args, content) {
-  return `<div class="mermaid">
+  return `<div class="mermaid">${escapeHTML(content)}</div>`
-          ${content}
-          </div>`
 }
 
 hexo.extend.tag.register('mermaid', mermaid, { ends: true })

scripts/tag/note.js

@@ -0,0 +1,27 @@
+/**
+ * note.js
+ * transplant from hexo-theme-next
+ * Modify by Jerry
+ */
+
+'use strict'
+
+function postNote (args, content) {
+  const styleConfig = hexo.theme.config.note.style
+  const lastArgs = args[args.length - 1]
+  if (!(lastArgs === 'flat' || lastArgs === 'modern' || lastArgs === 'simple' || lastArgs === 'disabled')) {
+    args.push(styleConfig)
+  }
+
+  let icon = ''
+  const iconArray = args[args.length - 2]
+  if (iconArray && iconArray.startsWith('fa')) {
+    icon = `<i class="note-icon ${iconArray}"></i>`
+    args[args.length - 2] = 'icon'
+  }
+
+  return `<div class="note ${args.join(' ')}">${icon + hexo.render.renderSync({ text: content, engine: 'markdown' })}</div>`
+}
+
+hexo.extend.tag.register('note', postNote, { ends: true })
+hexo.extend.tag.register('subnote', postNote, { ends: true })

scripts/tag/tabs.js

@@ -44,7 +44,7 @@ function postTabs (args, content) {
     const icon = tabIcon.trim()
     tabIcon.length > 0 && (tabIcon = `<i class="${icon}"${isOnlyicon}></i>`)
 
-    const toTop = '<button type="button" class="tab-to-top" onclick="scrollToDest($(this).parents(\'.tabs\'),65)"><i class="fas fa-arrow-up"></i></button>'
+    const toTop = '<button type="button" class="tab-to-top" aria-label="scroll to top"><i class="fas fa-arrow-up"></i></button>'
 
     const isActive = (tabActive > 0 && tabActive === tabId) || (tabActive === 0 && tabId === 1) ? ' active' : ''
     tabNav += `<li class="tab${isActive}"><button type="button" data-href="#${tabHref}">${tabIcon + tabCaption.trim()}</button></li>`