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

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,7 @@ If you are a problem when visiting the website, please open your browser 'develo
 <!-- 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

README.md

@@ -6,9 +6,9 @@
 ![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-Demo: 👍 [Butterfly](https://demo.jerryc.me/)  ||   🤞 [JerryC](https://jerryc.me/)
+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.
 
@@ -16,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]:
 
 ```
@@ -69,7 +71,7 @@ npm i hexo-theme-butterfly
 - [x] Related articles
 - [x] Displays outdated notice for a post
 - [x] Share (AddThis/Sharejs/Addtoany)
-- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments)
+- [X] 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)
@@ -92,5 +94,3 @@ npm i hexo-theme-butterfly
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)

README_CN.md

@@ -7,9 +7,9 @@
 ![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)修改的主題
 
@@ -17,6 +17,8 @@
 
 ### Git 安裝
 
+> 本倉庫同時上傳到 [Gitee](https://gitee.com/iamjerryw/hexo-theme-butterfly)，如果你訪問 Github 緩慢，可從 Gitee 中下載。
+
 在博客根目錄裡安裝穩定版【推薦】
 
 ```powershell
@@ -69,7 +71,7 @@ theme: butterfly
 - [x] 顯示相關文章
 - [x] 過期文章提醒
 - [x] 多種分享系統（AddThis/Sharejs/Addtoany）
-- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments）
+- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments/Twikoo）
 - [x] 支持雙評論部署
 - [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
 - [x] 多種分析系統（百度分析/谷歌分析/騰訊分析/CNZZ分析）
@@ -92,5 +94,3 @@ theme: butterfly
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)

_config.yml

@@ -53,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 (數學)
 # --------------------------------------
@@ -94,29 +86,32 @@ avatar:
   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:
 
-# 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 (是否顯示文章封面)
@@ -144,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 顯示描述性文字
@@ -164,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
@@ -175,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
@@ -242,7 +240,7 @@ addtoany:
 
 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
@@ -304,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/
@@ -324,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
 # --------------------------------------
 
@@ -372,11 +375,6 @@ 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
 # --------------------------------------
@@ -473,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 (背景特效)
 # --------------------------------------
 
@@ -497,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
 
@@ -518,14 +517,18 @@ 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:
@@ -535,6 +538,8 @@ ClickShowText:
     # - LOVE
     # - YOU
   fontSize: 15px
+  random: false
+  mobile: false
 
 # Default display mode (網站默認的顯示模式)
 # light (default) / dark
@@ -557,9 +562,9 @@ font:
 
 # Font settings for the site title and site subtitle
 # 左上角網站名字 主頁居中網站名字
-# blog_title_font:
+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:
@@ -596,6 +601,8 @@ preloader: false
 
 aside:
   enable: true
+  hide: false
+  button: true
   mobile: true # display on mobile
   position: right # left or right
   card_author:
@@ -662,10 +669,14 @@ newest_comments:
     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
@@ -733,6 +744,13 @@ 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
@@ -797,6 +815,9 @@ 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> 之前
@@ -826,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
@@ -849,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
@@ -868,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
@@ -893,3 +914,5 @@ CDN:
   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
@@ -75,31 +70,33 @@ aside:
     site_pv_name: PV
   more_button: More
   card_newest_comments:
-    heading: Newest Comments
+    headline: Newest Comments
     loading_text: loading...
-    zero_day: Today
+    error: Unable to get the data, please make sure the settings are correct.
-    day: days ago
+    zero: No Comment
+  card_toc: Catalog
 
 date_suffix:
-  one_hour: Just
+  just: Just
-  hours: hours ago
+  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
 
 copy_copyright:
   author: Author
@@ -108,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
@@ -75,31 +70,33 @@ aside:
     site_pv_name: PV
   more_button: More
   card_newest_comments:
-    heading: Newest Comments
+    headline: Newest Comments
     loading_text: loading...
-    zero_day: Today
+    error: Unable to get the data, please make sure the settings are correct.
-    day: days ago
+    zero: No Comment
+  card_toc: Catalog
 
 date_suffix:
-  one_hour: Just
+  just: Just
-  hours: hours ago
+  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
 
 copy_copyright:
   author: Author
@@ -108,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: 上一篇
@@ -77,20 +71,21 @@ aside:
     site_pv_name: 本站总访问量
   more_button: 查看更多
   card_newest_comments:
-    heading: 最新评论
+    headline: 最新评论
     loading_text: 正在加载中...
-    zero_day: 今天
+    error: 无法获取评论，请确认相关配置是否正确
-    day: 天前
+    zero: 没有评论
+  card_toc: 目录
 
 date_suffix:
-  one_hour: 刚刚
+  just: 刚刚
-  hours: 小时前
+  min: 分钟前
+  hour: 小时前
   day: 天前
+  month: 个月前
 
 donate: 打赏
 share: 分享
-bookmark:
-  title: 添加书签
 
 rightside:
   readmode_title: 阅读模式
@@ -102,6 +97,7 @@ rightside:
   toc: 目录
   scroll_to_comment: 直达评论
   setting: 设置
+  aside: 单栏和双栏切换
 
 copy_copyright:
   author: 作者
@@ -110,9 +106,6 @@ copy_copyright:
   info: 著作权归作者所有。商业转载请联系作者获得授权，非商业转载请注明出处。
 
 Snackbar:
-  bookmark:
-    message_prev: 按
-    message_next: 键将本页加入书签
   chs_to_cht: 你已切换为繁体
   cht_to_chs: 你已切换为简体
   day_to_night: 你已切换为深色模式

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: 上一篇
@@ -77,20 +71,21 @@ aside:
     site_pv_name: 本站總訪問量
   more_button: 檢視更多
   card_newest_comments:
-    heading: 最新評論
+    headline: 最新評論
     loading_text: 正在加載中...
-    zero_day: 今天
+    error: 無法獲取評論，請確認相關配置是否正確
-    day: 天前
+    zero: 沒有評論
+  card_toc: 目錄
 
 date_suffix:
-  one_hour: 剛剛
+  just: 剛剛
-  hours: 小時前
+  min: 分鐘前
+  hour: 小時前
   day: 天前
+  month: 個月前
 
 donate: 打賞
 share: 分享
-bookmark:
-  title: 新增書籤
 
 rightside:
   readmode_title: 閱讀模式
@@ -102,6 +97,7 @@ rightside:
   toc: 目錄
   scroll_to_comment: 直達評論
   setting: 設定
+  aside: 單欄和雙欄切換
 
 copy_copyright:
   author: 作者
@@ -110,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,11 +7,9 @@ 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))
@@ -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
@@ -60,9 +57,12 @@ div
   
   if theme.aplayerInject && theme.aplayerInject.enable
     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.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,7 +10,6 @@
 - 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(',')
@@ -23,7 +22,6 @@ 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)
@@ -35,6 +33,9 @@ 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())
 
@@ -44,30 +45,19 @@ link(rel="canonical" href=urlNoIndex())
 //- 網站驗證
 !=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})
 
 //- 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
@@ -78,7 +68,7 @@ if theme.algolia_search.enable
 
 //- font
 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,7 +76,6 @@ if theme.blog_title_font &&　theme.blog_title_font.font_link
 include ./head/config_site.pug
 include ./head/noscript.pug
 
-!=partial('includes/head/darkmode', {}, {cache:theme.fragment_cache})
+!=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/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

@@ -50,21 +50,9 @@
     })
   }
 
-  let ClickShowText = 'undefined';
-  if (theme.ClickShowText && theme.ClickShowText.enable) {
-    ClickShowText = JSON.stringify({
-    text: theme.ClickShowText.text.join(","),
-      fontSize: theme.ClickShowText.fontSize
-    })
-  }
-
   let Snackbar = 'undefined';
   if (theme.snackbar && theme.snackbar.enable) {
     Snackbar = JSON.stringify({
-      bookmark: {
-        message_prev: _p("Snackbar.bookmark.message_prev"),
-        message_next: _p("Snackbar.bookmark.message_next")
-      },
       chs_to_cht: _p("Snackbar.chs_to_cht"),
       cht_to_chs: _p("Snackbar.cht_to_chs"),
       day_to_night: _p("Snackbar.day_to_night"),
@@ -94,16 +82,9 @@
     })
   }
 
-  let date_suffix = JSON.stringify({
-    one_hour: _p("date_suffix.one_hour"),
-    hours: _p("date_suffix.hours"),
-    day: _p('date_suffix.day')
-  })
-
 script.
   var GLOBAL_CONFIG = { 
     root: '!{config.root}',
-    hexoversion: '!{get_hexo_version()}',
     algolia: !{algolia},
     localSearch: !{localSearch},
     translate: !{translate},
@@ -114,22 +95,32 @@ script.
       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: !{date_suffix},
+    date_suffix: {
-    copyright: !{copyright},
+      just: '!{_p("date_suffix.just")}',
-    ClickShowText: !{ClickShowText},
+      min: '!{_p("date_suffix.min")}',
-    medium_zoom: !{theme.medium_zoom},
+      hour: '!{_p("date_suffix.hour")}',
-    fancybox: !{theme.fancybox},
+      day: '!{_p("date_suffix.day")}',
-    Snackbar: !{Snackbar},
+      month: '!{_p("date_suffix.month")}'
-    justifiedGallery: {
+    },
-      js: '!{theme.CDN.justifiedGallery_js}',
+    copyright: !{copyright},
-      css: '!{theme.CDN.justifiedGallery_css}'
+    lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
+    Snackbar: !{Snackbar},
+    source: {
+      jQuery: '!{url_for(theme.CDN.jquery)}',
+      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},
     isPhotoFigcaption: !{theme.photofigcaption},
     islazyload: !{theme.lazyload.enable},
     isanchor: !{theme.anchor}
@@ -163,5 +154,17 @@ script.
     }
   }
 
-
+  // 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,50 +0,0 @@
-if theme.darkmode.enable
-  script.
-    var activateDarkMode = function () {
-      document.documentElement.setAttribute('data-theme', 'dark')
-      if (document.querySelector('meta[name="theme-color"]') !== null) {
-        document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
-      }
-    }
-    var activateLightMode = function () {
-      document.documentElement.setAttribute('data-theme', 'light')
-      if (document.querySelector('meta[name="theme-color"]') !== null) {
-        document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
-      }
-    }
-
-    var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-    var t = saveToLocal.get('theme')
-    if (autoChangeMode === '1') {
-      var isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-      var isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
-      var isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
-      var hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-
-      if (t === undefined) {
-        if (isLightMode) activateLightMode()
-        else if (isDarkMode) activateDarkMode()
-        else if (isNotSpecified || hasNoSupport) {
-          var now = new Date()
-          var hour = now.getHours()
-          var isNight = hour <= 6 || hour >= 18
-          isNight ? activateDarkMode() : activateLightMode()
-        }
-        window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
-          if (saveToLocal.get('theme') === undefined) {
-            e.matches ? activateDarkMode() : activateLightMode()
-          }
-        })
-      } else if (t === 'light') activateLightMode()
-      else activateDarkMode()
-    } else if (autoChangeMode === '2') {
-      now = new Date()
-      hour = now.getHours()
-      isNight = hour <= 6 || hour >= 18
-      if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
-      else if (t === 'light') activateLightMode()
-      else activateDarkMode()
-    } else {
-      if (t === 'dark') activateDarkMode()
-      else if (t === 'light') activateLightMode()
-    }

layout/includes/head/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

@@ -6,4 +6,9 @@ noscript.
     .justified-gallery img {
       opacity: 1
     }
+
+    #recent-posts time,
+    #post-meta time {
+      display: inline !important
+    }
   </style>

layout/includes/head/preconnect.pug

@@ -1,7 +1,7 @@
 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")
@@ -13,7 +13,7 @@ if theme.cnzz_analytics
   link(rel="preconnect" href="//s4.cnzz.com")
 
 if theme.blog_title_font && theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
-  link(rel="preconnect" href="//fonts.googleapis.com" crossorigin)
+  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/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
-else if is_archive()
+  else if is_page()
-  - var top_img = theme.archive_img || theme.default_top_img
+    - var top_img = page.top_img || theme.default_top_img
   else if is_tag()
-  - var top_img = theme.tag_img || theme.default_top_img
+    - var top_img = theme.tag_per_img && theme.tag_per_img[page.tag] 
+    - top_img = top_img ? top_img : (theme.tag_img !== false ? theme.tag_img || theme.default_top_img : false)
   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 theme.douban
+  if top_img !== false
-  if is_current('/movies/', [strict])
+    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url(${url_for(top_img)})` : `background: ${top_img}`
-    - var top_img = theme.douban.movies_img || theme.default_top_img
+    - var bg_img = top_img ? imgSource : ''
-  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
+  else
+    - var isHomeClass = 'no-top-img'
+else
+  - var top_img = false
+  - var isHomeClass = 'no-top-img'
 
 header#page-header(class=isHomeClass style=bg_img)
   !=partial('includes/header/nav', {}, {cache:theme.fragment_cache})
-  if is_home()
+  if top_img !== false
+    if is_post()
+      include ./post-info.pug
+    else if is_home() 
       #site-info
-      h1#site_title=site_title
+        h1#site-title=site_title
-      #site_subtitle
+        #site-subtitle
           span#subtitle
         if(theme.social)
           #site_social_icons
             !=fragment_cache('social', function(){return partial('includes/header/social')})
-    #scroll_down
+      #scroll-down
         i.fas.fa-angle-down.scroll-down-effects
-  else if is_post()
-    include ./post-info.pug 
     else
-    #page_site-info
+      #page-site-info
-      h1#site_title=site_title
+        h1#site-title=site_title

layout/includes/header/nav.pug

@@ -2,15 +2,15 @@ nav#nav
   span#blog_name
     a#site-name(href=url_for('/')) #[=config.title]
     
-  span#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
             span.post-meta-label= _p('post.comments') + ':'
-              span.disqus-comment-count.comment-count
+            if block
+              block
+
+        if whichCount === 'Disqus' || whichCount === 'Disqusjs'
+          +countBlock
+            span.disqus-comment-count
               a(href=full_url_for(page.path) + '#disqus_thread')
         else if whichCount === 'Valine'
-              i.far.fa-comments.fa-fw.post-meta-icon
+          +countBlock
-              span.post-meta-label= _p('post.comments') + ':'
             a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
-                span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+              span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
         else if whichCount === 'Gitalk'
-              i.far.fa-comments.fa-fw.post-meta-icon
+          +countBlock
-              span.post-meta-label= _p('post.comments') + ':'
             a(href=url_for(page.path) + '#post-comment')
-                span.gitalk-comment-count.comment-count
+              span.gitalk-comment-count
+        else if whichCount === 'Twikoo'
+          +countBlock
+            a(href=url_for(page.path) + '#post-comment')
+              span#twikoo-count
         else if whichCount === 'Facebook Comments'
-              i.far.fa-comments.fa-fw.post-meta-icon
+          +countBlock
-              span.post-meta-label= _p('post.comments') + ':'
+            a(href=url_for(page.path) + '#post-comment')
-              a.comment-count(href=url_for(page.path) + '#post-comment')
               span.fb-comments-count(data-href=urlNoIndex())

layout/includes/layout.pug

@@ -1,41 +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
           div!= body
         else
           block content
           if theme.aside.enable && page.aside !== false
-              !=partial('includes/widget/index', {}, {cache:theme.fragment_cache})
+            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 = {
+    endLoading: () => {
       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,9 +57,12 @@ 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
+          when false
+            - break
+          when 1
             .content!= article.description
-        else if theme.index_post_content.method == 2
+          when 2
             if article.description
               .content!= article.description
             else
@@ -67,7 +70,7 @@ mixin postUI(posts)
               - let expert = content.substring(0, theme.index_post_content.length) 
               - content.length > theme.index_post_content.length ? expert += ' ...' : ''
               .content!= expert
-        else
+          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 += ' ...' : ''
@@ -75,4 +78,4 @@ mixin postUI(posts)
 
     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,28 +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'))
         i.fas.fa-book-open
-    if theme.translate && theme.translate.enable
+    if theme.change_font_size
+      button#font-plus(type="button" title=_p('rightside.font_plus_title'))
+        i.fas.fa-plus
+      button#font-minus(type="button" title=_p('rightside.font_minus_title'))
+        i.fas.fa-minus
+    if theme.translate.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
+    if is_post()
+      if (theme.readmode || 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
+          i.fas.fa-cog.fa-spin
-    if is_post() && page.comments !== false && theme.comments.use
-      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
-        i.fas.fa-comments
       if showToc
         button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
           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 @@
--
-  let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
-  let autoOpenPostSet = page.auto_open == undefined ? theme.toc.auto_open : page.auto_open
-  let autoOpenSidebar = autoOpenPostSet ? 'on' : ''
--
-
-if(showToc)
 #sidebar
-    i.fas.fa-arrow-right#toggle-sidebar(class=autoOpenSidebar)
+  #menu-mask
-    .sidebar-toc
+  #sidebar-menus
-      div.sidebar-toc__title= _p('sidebar.catalog')
+    .author-avatar
-      div.sidebar-toc__progress
+      if theme.lazyload.enable
-        span.progress-notice= _p('sidebar.have_read')
+        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
-        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/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,7 +29,7 @@ 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
     }
   }

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)
     }
   }
   

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/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/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}) 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))
@@ -18,11 +17,19 @@ if theme.activate_power_mode.enable
   script.
     POWERMODE.colorful = !{theme.activate_power_mode.colorful};
     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

@@ -41,7 +41,7 @@ script.
       }
     }
     
-    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,7 +2,7 @@ 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}',

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

@@ -13,32 +13,41 @@ script.
       return content
     }
 
-    const getDisqusComment = () => {
+    const getComment = () => {
-      let disqusArray = []
+      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}')
-      $.getJSON('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{theme.newest_comments.disqus.forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{theme.newest_comments.disqus.api_key}', function(data){
+        .then(response => response.json())
-        $.each(data.response, (i, item) => {
+        .then(data => {
-          disqusArray.push({
+          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}) {
-          result += `<a href='${array[i].url}' class="thumbnail"><img src='${array[i].avatar}'></a>`
+            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'>
@@ -46,19 +55,23 @@ script.
           <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')
+      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')) {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
         const data = saveToLocal.get('disqus-newest-comments')
         if (data) {
           generateHtml(JSON.parse(data))
         } else {
-          getDisqusComment()
+          getComment()
         }
       }
     }

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

@@ -13,31 +13,40 @@ script.
       return content
     }
 
-    const getGithubIssues = () => {
+    const getComment = () => {
-      let githubArray = []
+      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')
-      $.getJSON('https://api.github.com/repos/!{theme.newest_comments.github_issues.repo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1', (data) => { 
+        .then(response => response.json())
-        $.each(data, (index, item) => {
+        .then(data => {
-          githubArray.push({
+          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}) {
-          result += `<a href='${array[i].url}' class="thumbnail"><img src='${array[i].avatar}'></a>`
+            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'>
@@ -45,19 +54,23 @@ script.
           <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')
+      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')) {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
         const data = saveToLocal.get('github-newest-comments')
         if (data) {
           generateHtml(JSON.parse(data))
         } else {
-          getGithubIssues()
+          getComment()
         }
       }
     }

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

@@ -4,3 +4,5 @@ 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

@@ -16,6 +16,7 @@ script.
 
     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
@@ -24,11 +25,16 @@ script.
     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}) {
-          result += `<a href='${array[i].url}' class="thumbnail"><img src='${getIcon(array[i].avatar, array[i].mail)}'></a>`
+            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'>
@@ -36,59 +42,61 @@ script.
           <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')
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
       $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
       window.pjax && window.pjax.refresh($dom)
     }
 
-    const getValineData = () => {
+    const getComment = () => {
-
+        let serverURL = ''
-      if (!(AV.applicationId && (AV.applicationKey || AV.masterKey))) {
+        if (!{Boolean(theme.newest_comments.leancloud.serverURL)}) {
-        const dataInit = {
+          serverURL = '!{theme.newest_comments.leancloud.serverURL}'
-          appId: '!{theme.newest_comments.leancloud.appId}',
+        } else {
-          appKey: '!{theme.newest_comments.leancloud.appKey}'
+          serverURL = 'https://!{theme.newest_comments.leancloud.appId.substring(0,8)}.api.lncldglobal.com'
         }
 
-        if (!{theme.newest_comments.leancloud.serverURL ? true : false}) {
+      var settings = {
-          dataInit.serverURL= '!{theme.newest_comments.leancloud.serverURL}'
+        "method": "GET",
+        "headers": {
+          "X-LC-Id": '!{theme.newest_comments.leancloud.appId}',
+          "X-LC-Key": '!{theme.newest_comments.leancloud.appKey}',
+          "Content-Type": "application/json"
+        },
       }
 
-        AV.init(dataInit)
+      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,
             }
-
-      const query = new AV.Query('Comment');
-      query.descending('createdAt').limit(!{theme.newest_comments.limit})
-
-      var valineArray = []
-      query.find().then(comments => {
-        comments.forEach(comment => {
-          valineArray.push({
-            'avatar': comment.get('QQAvatar'),
-            'content': changeContent(comment.get('comment')),
-            'mail': comment.get('mail'),
-            'nick': comment.get('nick'),
-            'url': comment.get('url'),
-            'date': comment.createdAt,
           })
-        })
-      }).then(function() {
           saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
           generateHtml(valineArray)
+        }).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')) {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
         const data = saveToLocal.get('leancloud-newest-comments')
         if (data) {
           generateHtml(JSON.parse(data))
         } else {
-          if (typeof window.AV === 'object') {
+          getComment()
-            getValineData()
-          } else {
-            $.getScript('https://cdn.jsdelivr.net/npm/leancloud-storage@4.6.1/dist/av-min.js', getValineData)
-          }
         }
       }
     }

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

layout/includes/third-party/pjax.pug

@@ -7,7 +7,6 @@ script(src=url_for(theme.CDN.pjax))
 script.
   let pjaxSelectors = [
     'title',
-    'meta[name=description]',
     '#config_change',
     '#body-wrap',
     '#rightside-config-hide',
@@ -30,8 +29,12 @@ script.
   document.addEventListener('pjax:complete', function () {
     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 && window.lazyLoadInstance.update()
@@ -52,10 +55,14 @@ script.
 
     // 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) {
@@ -66,10 +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')
 
   })
-

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

@@ -1,4 +1,5 @@
-#algolia-search.search-dialog
+#algolia-search
+  .search-dialog
     #algolia-search-title.search-dialog__title Algolia
     #algolia-input-panel
       #algolia-search-input

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

@@ -1,4 +1,5 @@
-#local-search.search-dialog
+#local-search
+  .search-dialog
     #local-search-title.search-dialog__title=_p("local_search.label")
     #local-input-panel
       #local-search-input
@@ -6,18 +7,6 @@
           input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
     hr
     #local-search-results
-    #local-hits
-    #local-stats
-      #hr.local-search-stats__hr
-        case config.language
-          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/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,8 +1,12 @@
-- var source = theme.subtitle.source
+- let source = theme.subtitle.source
-if source == '1'
+
+case source
+  when 1
     script.
       function subtitleType () {
-      $.getJSON('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',function (data) {
+        fetch('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json')
+          .then(response => response.json())
+          .then(data => {
             if (!{theme.subtitle.effect}) {
               var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
               var both = sub.unshift(data.text)
@@ -20,16 +24,21 @@ if source == '1'
       }
 
       if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
+        if (typeof Typed === 'function') {
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
       } else {
         subtitleType()
       }
 
-else if source == '2'
+  when 2
     script.
       function subtitleType () {
-      $.getJSON('https://v1.hitokoto.cn', function (data) {
+        fetch('https://v1.hitokoto.cn')
+          .then(response => response.json())
+          .then(data => {
             if (!{theme.subtitle.effect}) {
               var from = '出自 ' + data.from
               var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
@@ -48,16 +57,19 @@ else if source == '2'
       }
 
       if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
+        if (typeof Typed === 'function') {
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
       } else {
         subtitleType()
       }
 
-else if source == '3'
+  when 3
     script.
       function subtitleType () {
-      $.getScript('http://yijuzhan.com/api/word.php?m=js', function () {
+        getScript('http://yijuzhan.com/api/word.php?m=js').then(() => {
           var con = str[0]
           if (!{theme.subtitle.effect}) {
             var from = '出自 ' + str[1]
@@ -77,16 +89,19 @@ else if source == '3'
       }
 
       if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
+        if (typeof Typed === 'function') {
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
       } else {
         subtitleType()
       }
 
-else if source == '4'
+  when 4
     script.
       function subtitleType () {
-      $.getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
+        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(',')
@@ -107,13 +122,16 @@ else if source == '4'
       }
 
       if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
+        if (typeof Typed === 'function') {
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
       } else {
         subtitleType()
       }
 
-else
+  default
     script.
       function subtitleType () {
         if (!{theme.subtitle.effect}) { 
@@ -130,8 +148,11 @@ else
       }
 
       if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
+        if (typeof Typed === 'function') {
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+          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
+  .card-widget.ads-wrap
     != theme.ad.aside

layout/includes/widget/card_announcement.pug

@@ -1,3 +1,4 @@
+if theme.aside.card_announcement.enable
   .card-widget.card-announcement
     .card-content
       .item-headline

layout/includes/widget/card_archives.pug

@@ -1,3 +1,4 @@
+if theme.aside.card_archives.enable
   .card-widget.card-archives
     .card-content
       .item-headline

layout/includes/widget/card_author.pug

@@ -1,3 +1,4 @@
+if theme.aside.card_author.enable
   .card-widget.card-info
     .card-content
       .card-info-avatar.is-center
@@ -13,19 +14,19 @@
           .card-info-data-item.is-center
             a(href=url_for(config.archive_dir) + '/')
               .headline= _p('aside.articles') 
-            .length_num= site.posts.length
+              .length-num= site.posts.length
 
         if site.tags.length
           .card-info-data-item.is-center
             a(href=url_for(config.tag_dir) + '/')
               .headline= _p('aside.tags')
-            .length_num= site.tags.length
+              .length-num= site.tags.length
 
         if site.categories.length
           .card-info-data-item.is-center
             a(href=url_for(config.category_dir) + '/')
               .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)
         i(class=theme.aside.card_author.button.icon)

layout/includes/widget/card_categories.pug

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

layout/includes/widget/card_newest_comment.pug

@@ -1,7 +1,8 @@
-.card-widget.card-newest-comments
+if theme.newest_comments.enable
+  .card-widget#card-newest-comments
     .card-content
       .item-headline
         i.fas.fa-bolt
-      span= _p('aside.card_newest_comments.heading')
+        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,3 +1,4 @@
+if theme.aside.card_recent_post.enable
   .card-widget.card-recent-post
     .card-content
       .item-headline
@@ -7,18 +8,18 @@
         - let postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5
         - let sort = theme.aside.card_recent_post.sort === 'updated' ? 'updated' : 'date'
         - site.posts.sort(sort, -1).limit(postLimit).each(function(article){
-        .aside-list-item
           - 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
+          .aside-list-item(class=no_cover)
             if post_cover && theme.cover.aside_enable
               a.thumbnail(href=url_for(link) title=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(class=no_cover)
+            .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)]

layout/includes/widget/card_tags.pug

@@ -1,3 +1,4 @@
+if theme.aside.card_tags.enable
   if site.tags.length
     .card-widget.card-tags
       .card-content

layout/includes/widget/card_webinfo.pug

@@ -1,3 +1,4 @@
+if theme.aside.card_webinfo.enable
   .card-widget.card-webinfo
     .card-content
       .item-headline

layout/includes/widget/index.pug

@@ -1,20 +1,26 @@
 #aside_content.aside_content
-  if theme.aside.card_author.enable
+  //- post
-    include ./card_author.pug
+  if is_post()
+    if showToc && theme.toc.style_simple
       .sticky_layout
-    if theme.aside.card_announcement.enable
+        include ./card_post_toc.pug
-      include ./card_announcement.pug
+    else
-    if theme.aside.card_recent_post.enable
+      !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
-      include ./card_recent_post.pug
+      !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
-    if theme.newest_comments.enable
+      .sticky_layout
-      include ./card_newest_comment.pug
+        if showToc
-    if theme.ad && theme.ad.aside
+          include ./card_post_toc.pug
-      include ./card_ad.pug
+        !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
-    if theme.aside.card_categories.enable
+        !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
-      include ./card_categories.pug
+  else
-    if theme.aside.card_tags.enable
+    //- page
-      include ./card_tags.pug
+    !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
-    if theme.aside.card_archives.enable
+    !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
-      include ./card_archives.pug
+    .sticky_layout
-    if theme.aside.card_webinfo.enable
+      !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
-      include ./card_webinfo.pug
+      !=partial('includes/widget/card_ad', {}, {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'
-    .tag-cloud
-      .tag-cloud__title= _p('page.tag')
-        |  - 
-        span.tag-cloud__amount= site.tags.length
-      .tag-cloud-tags
-        !=cloudTags({source: site.tags, minfontsize: 1, maxfontsize: 2.1, limit: 0, unit: 'em'})
-      if page.comments !== false && theme.comments && theme.comments.use
-        - var commentsJsLoad = true
-        !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
-  else if page.type === 'link'
-    include flink.pug
-  else if page.type === 'categories'    
-    .category-content
-      .category-lists
-        .category__title= _p('page.category')
-          |  - 
-          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
+    case page.type
-        if (is_current('/movies/', [strict]) || is_current('/books/', [strict]) || is_current('/games/', [strict]))
+      when 'tags'
-          meta(name="referrer" content="no-referrer")
+        include includes/page/tags.pug
-      #article-container!= page.content
+      when 'link'
+        include includes/page/flink.pug
+      when 'categories'
+        include includes/page/categories.pug
+      when 'artitalk'
+        include includes/page/artitalk.pug
+      default
+        include includes/page/default-page.pug
+
     if page.comments !== false && theme.comments && theme.comments.use
       - var commentsJsLoad = true
       !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})

layout/post.pug

@@ -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.1.1",
+  "version": "3.4.2",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -26,7 +26,7 @@
     "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/check_hexo.js

@@ -1,12 +0,0 @@
-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 < 4.2) {
-    logger.error('Please update Hexo to V4.2.0 or higher!')
-    logger.error('請把 Hexo 升級到 V4.2.0 或更高的版本！')
-    process.exit(-1)
-  }
-})

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,18 +0,0 @@
-/**
- * Note: configs in _data/butterfly.yml will merge configs with hexo.theme.config.
- */
-
-'use strict'
-
-const { deepMerge } = require('hexo-util')
-
-hexo.on('generateBefore', function () {
-  const rootConfig = hexo.config
-  if (hexo.locals.get) {
-    const data = hexo.locals.get('data')
-    if (data && data.butterfly) {
-      hexo.theme.config = deepMerge(hexo.theme.config, data.butterfly)
-    }
-  }
-  hexo.theme.config.rootConfig = rootConfig
-})

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_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>'
         }
       })
     }

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,39 +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
-  const unit = options.unit || 'px'
-
-  let result = ''
-  const tagLimit = limit === 0 ? source.length : limit
-  source.sort('name').limit(tagLimit).forEach(function (tags) {
-    const fontSizeRD = Math.random() * (maxfontsize - minfontsize) + minfontsize
-    const fontSize = fontSizeRD.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
-    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')
-})
-
-hexo.extend.helper.register('get_hexo_version', function () {
-  return hexo.version
-})

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
@@ -71,7 +71,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
         lazySrc +
         '="' +
         this.url_for(cover) +
-        '">'
+        '" alt="cover">'
       if (dateType === 'created') {
         result +=
           '<div class="content is-center"><div class="date"><i class="far fa-calendar-alt fa-fw"></i>' +

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' })}</span></div>`
+    </button><div class="hide-content">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div></div>`
 }
 
 function hideToggle (args, content) {

scripts/tag/mermaid.js

@@ -6,8 +6,10 @@
 
 'use strict'
 
+const { escapeHTML } = require('hexo-util')
+
 function mermaid (args, content) {
-  return `<div class="mermaid">${content}</div>`
+  return `<div class="mermaid">${escapeHTML(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"><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>`

scripts/tags/note.js

@@ -1,13 +0,0 @@
-/**
- * note.js
- * transplant from hexo-theme-next
- */
-
-'use strict'
-
-function postNote (args, content) {
-  return `<div class="note ${args.join(' ')}">${hexo.render.renderSync({ text: content, engine: 'markdown' })}</div>`
-}
-
-hexo.extend.tag.register('note', postNote, { ends: true })
-hexo.extend.tag.register('subnote', postNote, { ends: true })

source/css/_global/function.styl

@@ -37,6 +37,10 @@ maxWidth900()
   @media screen and (max-width: 900px)
     {block}
 
+minWidth901()
+  @media screen and (min-width: 901px)
+    {block}
+
 minWidth900()
   @media screen and (min-width: 900px)
     {block}
@@ -45,31 +49,162 @@ minWidth2000()
   @media screen and (min-width: 2000px)
     {block}
 
-[data-theme='light']
+// animation
-  --global-bg: $body-bg
+if hexo-config('enter_transitions')
-  --font-color: $font-black
+  #content-inner,
-  --hr-border: lighten($theme-hr-color, 50%)
+  #footer
-  --hr-before-color: lighten($theme-hr-color, 30%)
+    animation: main 1s
-  --search-bg: $search-bg
+
-  --search-input-color: $search-input-color
+  #page-header
-  --search-result-title: $search-result-title
+    animation: header-effect 1s
-  --preloader-bg: $preloader-bg
+
-  --preloader-color: $preloader-word-color
+  #site-title,
-  --tab-border-color: $tab-border-color
+  #site-subtitle
-  --tab-botton-bg: $tab-botton-bg
+    animation: titlescale 1s
-  --tab-botton-color: $tab-botton-color
+
-  --tab-button-hover-bg: $tab-button-hover-bg
+  #nav.show
-  --tab-button-active-bg: $tab-button-active-bg
+    animation: headerNoOpacity 1s
-  --card-bg: $card-bg
+
-  --sidebar-bg: $sidebar-background
+  canvas:not(#ribbon-canvas),
-  --btn-hover-color: $button-hover-color
+  #web_bg
-  --btn-color: $button-color
+    animation: to_show 4s
-  --btn-bg: $button-bg
+
-  --text-bg-hover: $text-bg-hover
+  #ribbon-canvas
-  --light-grey: $light-grey
+    animation: ribbon_to_show 4s
-  --white: $white
+
-  --text-highlight-color: $text-highlight-color
+  #sidebar-menus
-  --blockquote-color: $blockquote-color
+    &.open
-  --blockquote-bg: $blockquote-background-color
+      for i in 1 2 3 4
-  --reward-pop: $reward-pop-up-bg
+        > :nth-child({i})
-  --sidebar-icon-color: $sidebar-icon-color
+          animation: sidebarItem (i / 5)s
+
+.card-announcement-animation
+  color: #FF0000
+  animation: announ_animation .8s linear infinite
+
+.scroll-down-effects
+  animation: scroll-down-effect 1.5s infinite
+
+if hexo-config('avatar.effect') == true
+  .avatar-img
+    animation: avatar_turn_around 2s linear infinite
+
+.reward-main
+  animation: donate_effcet .3s .1s ease both
+
+@keyframes scroll-down-effect
+  0%
+    top: 0
+    opacity: .4
+
+  50%
+    top: -16px
+    opacity: 1
+
+  100%
+    top: 0
+    opacity: .4
+
+@keyframes header-effect
+  0%
+    opacity: 0
+    transform: translateY(-50px)
+
+  100%
+    opacity: 1
+    transform: translateY(0)
+
+@keyframes headerNoOpacity
+  0%
+    transform: translateY(-50px)
+
+  100%
+    transform: translateY(0)
+
+@keyframes main
+  0%
+    opacity: 0
+    transform: translateY(50px)
+
+  100%
+    opacity: 1
+    transform: translateY(0)
+
+@keyframes titlescale
+  0%
+    opacity: 0
+    transform: scale(.7)
+
+  100%
+    opacity: 1
+    transform: scale(1)
+
+@keyframes search_close
+  0%
+    opacity: 1
+    transform: scale(1)
+
+  100%
+    opacity: 0
+    transform: scale(.7)
+
+@keyframes to_show
+  0%
+    opacity: 0
+
+  100%
+    opacity: 1
+
+@keyframes to_hide
+  0%
+    opacity: 1
+
+  100%
+    opacity: 0
+
+@keyframes ribbon_to_show
+  0%
+    opacity: 0
+
+  100%
+    opacity: hexo-config('canvas_ribbon.alpha')
+
+@keyframes avatar_turn_around
+  from
+    transform: rotate(0)
+
+  to
+    transform: rotate(360deg)
+
+@keyframes sub_menus
+  0%
+    opacity: 0
+    transform: translateY(10px)
+
+  100%
+    opacity: 1
+    transform: translateY(0)
+
+@keyframes donate_effcet
+  0%
+    opacity: 0
+    transform: translateY(-20px)
+
+  100%
+    opacity: 1
+    transform: translateY(0)
+
+@keyframes announ_animation
+  0%,
+  to
+    transform: scale(1)
+
+  50%
+    transform: scale(1.2)
+
+@keyframes sidebarItem
+  0%
+    transform: translateX(200px)
+
+  100%
+    transform: translateX(0)

source/css/_global/index.styl

@@ -1,3 +1,33 @@
+:root
+  --global-font-size: $font-size
+  --global-bg: $body-bg
+  --font-color: $font-black
+  --hr-border: lighten($theme-hr-color, 50%)
+  --hr-before-color: lighten($theme-hr-color, 30%)
+  --search-bg: $search-bg
+  --search-input-color: $search-input-color
+  --search-result-title: $search-result-title
+  --preloader-bg: $preloader-bg
+  --preloader-color: $preloader-word-color
+  --tab-border-color: $tab-border-color
+  --tab-botton-bg: $tab-botton-bg
+  --tab-botton-color: $tab-botton-color
+  --tab-button-hover-bg: $tab-button-hover-bg
+  --tab-button-active-bg: $tab-button-active-bg
+  --card-bg: $card-bg
+  --sidebar-bg: $sidebar-background
+  --btn-hover-color: $button-hover-color
+  --btn-color: $button-color
+  --btn-bg: $button-bg
+  --text-bg-hover: $text-bg-hover
+  --light-grey: $light-grey
+  --white: $white
+  --text-highlight-color: $text-highlight-color
+  --blockquote-color: $blockquote-color
+  --blockquote-bg: $blockquote-background-color
+  --reward-pop: $reward-pop-up-bg
+  --toc-link-color: $toc-link-color
+
 html
   height: 100%
   font-size: 20px
@@ -7,7 +37,7 @@ body
   min-height: 100%
   background: var(--global-bg)
   color: var(--font-color)
-  font-size: $font-size
+  font-size: var(--global-font-size)
   font-family: $font-family
   line-height: $text-line-height
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0)
@@ -28,6 +58,7 @@ body
 input::placeholder
   color: var(--font-color)
 
+if $web-bg
   #web_bg
     position: fixed
     z-index: -999
@@ -111,9 +142,20 @@ button
   background: none
   cursor: pointer
 
+a
+  color: $a-link-color
+  text-decoration: none
+  word-wrap: break-word
+  transition: all .2s
+  overflow-wrap: break-word
+
+  &:hover
+    color: $light-blue
+
 // font
-#page-header #site_title,
+if $site-name-font
-#page-header #site_subtitle,
+  #site-title,
+  #site-subtitle,
   #site-name,
   #aside_content .author-info__name,
   #aside_content .author-info__description
@@ -154,8 +196,12 @@ button
       transition-timing-function: cubic-bezier(.45, 1.64, .47, .66)
       transform: scaleX(1)
 
-img[src=''],
+img
-img:not([src])
+  max-width: 100%
+  transition: all .2s
+
+  &[src=''],
+  &:not([src])
     opacity: 0
 
 .img-alt
@@ -164,195 +210,3 @@ img:not([src])
 
   &:hover
     text-decoration: none !important
-
-.post-ad
-  margin: 2rem 0
-
-.ad_height
-  display: block !important
-  height: auto !important
-
-// animation
-#content-inner,
-#footer
-  animation: main 1s
-
-#page-header
-  animation: header-effect 1s
-
-#site_title,
-#site_subtitle
-  animation: titlescale 1s
-
-canvas:not(#ribbon-canvas),
-#web_bg
-  animation: to_show 4s
-
-#ribbon-canvas
-  animation: ribbon_to_show 4s
-
-.card-announcement-animation
-  color: #FF0000
-  animation: announ_animation .8s linear infinite
-
-.scroll-down-effects
-  animation: scroll-down-effect 1.5s infinite
-
-if hexo-config('avatar.effect') == true
-  .avatar-img
-    animation: avatar_turn_around 2s linear infinite
-
-.reward-main
-  animation: donate_effcet .3s .1s ease both
-
-.tocOpenPc
-  .sidebar-toc__title
-    animation: tocsidebarLtoR .5s
-
-  .sidebar-toc__progress
-    animation: tocsidebarLtoR .7s
-
-  .sidebar-toc__content
-    animation: tocsidebarLtoR .9s
-
-.tocOpenMobile
-  .sidebar-toc__title
-    animation: tocsidebarRtoL .4s
-
-  .sidebar-toc__progress
-    animation: tocsidebarRtoL .6s
-
-  .sidebar-toc__content
-    animation: tocsidebarRtoL .7s
-
-#mobile-sidebar-menus
-  &.open
-    transform: translate3d(-100%, 0, 0)
-
-    for i in 1 2 3 4
-      > :nth-child({i})
-        animation: sidebarItem (i / 5)s
-
-@keyframes scroll-down-effect
-  0%
-    top: 0
-    opacity: .4
-
-  50%
-    top: -16px
-    opacity: 1
-
-  100%
-    top: 0
-    opacity: .4
-
-@keyframes header-effect
-  0%
-    opacity: 0
-    transform: translateY(-50px)
-
-  100%
-    opacity: 1
-    transform: translateY(0)
-
-@keyframes headerNoOpacity
-  0%
-    transform: translateY(-50px)
-
-  100%
-    transform: translateY(0)
-
-@keyframes main
-  0%
-    opacity: 0
-    transform: translateY(50px)
-
-  100%
-    opacity: 1
-    transform: translateY(0)
-
-@keyframes titlescale
-  0%
-    opacity: 0
-    transform: scale(.7)
-
-  100%
-    opacity: 1
-    transform: scale(1)
-
-@keyframes search_close
-  0%
-    opacity: 1
-    transform: scale(1)
-
-  100%
-    opacity: 0
-    transform: scale(.7)
-
-@keyframes to_show
-  0%
-    opacity: 0
-
-  100%
-    opacity: 1
-
-@keyframes ribbon_to_show
-  0%
-    opacity: 0
-
-  100%
-    opacity: hexo-config('canvas_ribbon.alpha')
-
-@keyframes avatar_turn_around
-  from
-    transform: rotate(0)
-
-  to
-    transform: rotate(360deg)
-
-@keyframes sub_menus
-  0%
-    opacity: 0
-    transform: translateY(10px)
-
-  100%
-    opacity: 1
-    transform: translateY(0)
-
-@keyframes donate_effcet
-  0%
-    opacity: 0
-    transform: translateY(-20px)
-
-  100%
-    opacity: 1
-    transform: translateY(0)
-
-@keyframes announ_animation
-  0%,
-  to
-    transform: scale(1)
-
-  50%
-    transform: scale(1.2)
-
-@keyframes sidebarItem
-  0%
-    transform: translateX(200px)
-
-  100%
-    transform: translateX(0)
-
-@keyframes tocsidebarRtoL
-  0%
-    transform: translateX(200px)
-
-  100%
-    transform: translateX(0)
-
-@keyframes tocsidebarLtoR
-  0%
-    transform: translateX(-200px)
-
-  100%
-    transform: translateX(0)

source/css/_highlight/highlight.styl

@@ -1,8 +1,8 @@
 // https://github.com/equinusocio/vsc-material-theme
 $highlight_theme = hexo-config('highlight_theme')
-$highlighEnable = hexo-config('rootConfig.highlight') && hexo-config('rootConfig.highlight.enable')
+$highlighEnable = hexo-config('highlight_settings') && hexo-config('highlight_settings.enable')
-$prismjsEnable = hexo-config('rootConfig.prismjs') && hexo-config('rootConfig.prismjs.enable')
+$prismjsEnable = hexo-config('prismjs_settings') && hexo-config('prismjs_settings.enable')
-wordWrap = !hexo-config('rootConfig.highlight.line_number') && hexo-config('code_word_wrap')
+wordWrap = !hexo-config('highlight_settings.line_number') && hexo-config('code_word_wrap')
 
 @require 'theme'
 
@@ -126,11 +126,13 @@ blockquote
       text-transform: uppercase
       font-weight: bold
       font-size: 1.15em
+      user-select: none
 
     .copy-notice
       position: absolute
       right: 1.7rem
       opacity: 0
+      transition: opacity .4s
 
     .copy-button
       position: absolute

source/css/_highlight/prismjs/index.styl

@@ -1,4 +1,4 @@
-if hexo-fonfig('rootConfig.prismjs.line_number')
+if hexo-fonfig('prismjs_settings.line_number')
   @require 'line-number'
 
 if $highlight_theme != false

source/css/_layout/404.styl

@@ -45,6 +45,7 @@ if hexo-config('error_404.enable')
         padding: .5rem
         text-align: center
         font-size: 14px
+        if $site-name-font
           font-family: $site-name-font
 
         +maxWidth768()

source/css/_layout/aside.styl

@@ -1,20 +1,38 @@
 #aside_content
   width: 25%
 
+  +minWidth900()
+    if hexo-config('aside.position') == 'right'
+      padding-left: 15px
+    else
+      padding-right: 15px
+
+  +maxWidth900()
+    width: 100%
+
   > .card-widget:first-child
     margin-top: 0
 
+    +maxWidth900()
+      margin-top: 1rem
+
   .card-widget
+    position: relative
     overflow: hidden
     margin-top: 1rem
     border-radius: 8px
     background: var(--card-bg)
     box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
-    transition: all .3s
+    transition: box-shadow .3s
 
     &:hover
       box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
 
+    if hexo-config('aside.mobile') == false
+      +maxWidth768()
+        &:not(#card-toc)
+          display: none
+
   .card-info
     img
       width: 110px
@@ -48,7 +66,7 @@
             color: var(--font-color)
             font-size: 1em
 
-          .length_num
+          .length-num
             margin-top: -.3rem
             color: var(--text-highlight-color)
             font-size: 1.4em
@@ -82,15 +100,12 @@
     padding: 1rem 1.2rem
 
   .item-headline
+    padding-bottom: .3rem
     font-size: 1.2em
 
     span
       margin-left: .5rem
 
-    & + div,
-    & + ul
-      padding: .3rem 0 0
-
   .sticky_layout
     +minWidth900()
       position: sticky
@@ -150,6 +165,7 @@
 
         & > time,
         & > .name
+          display: block
           color: $theme-meta-color
           font-size: 85%
 
@@ -164,17 +180,13 @@
           &:hover
             color: $text-hover
 
-  .card-recent-post
+      &.no-cover
-    .thumbnail
+        min-height: 4.4em
-      border-radius: 0 !important
-
-    .no-aside-cover
-      title
-        height: auto
 
   .card-archives ul.card-archive-list,
   .card-categories ul.card-category-list
     margin: 0
+    padding: 0
     list-style: none
 
   .card-archives ul.card-archive-list > .card-archive-list-item,
@@ -218,6 +230,7 @@
         padding: 0 0 0 .8rem
 
       > .parent
+        > a
           .card-category-list
             &-name
               width: 70% !important
@@ -237,7 +250,7 @@
             transform: rotate(-90deg)
 
         if hexo-config('aside.card_categories.expand') == false
-          + .child
+          > .child
             display: none
 
   .card-webinfo
@@ -252,23 +265,96 @@
             flex: 1
             padding-right: 1rem
 
-+maxWidth900()
+  // toc
-  #aside_content
+  #card-toc
-    width: 100% !important
+    +minWidth901()
+      right: 0 !important
 
-  #aside_content
+    +maxWidth900()
-    .card-widget:first-child
+      position: fixed
-      margin-top: 1rem
+      right: -100%
+      bottom: 30px
+      z-index: 100
+      max-height: calc(100% - 60px)
+      width: $toc-mobile-width
+      opacity: 0
+      transform-origin: right bottom
+
+    .toc-content
+      overflow-y: auto
+      max-height: calc(100vh - 120px)
+
+      +maxWidth900()
+        max-height: calc(100vh - 140px)
+
+      .toc-child
+        display: none
+
+        +maxWidth900()
+          display: block !important
+
+      .toc-item
+        &.active
+          .toc-child
+            display: block
+
+      ol,
+      li
+        list-style: none
+
+      > ol
+        padding: 0 !important
+
+      ol
+        margin: 0
+        padding-left: .4rem
+
+      .toc-link
+        display: block
+        padding-left: .3rem
+        border-left: 3px solid transparent
+        color: var(--toc-link-color)
+        transition: all .2s ease-in-out
+
+        &.active
+          border-left-color: darken($theme-toc-color, 20%)
+          background: $theme-toc-color
+          color: $toc-active-color
+
+      &:before
+        position: absolute
+        top: .6rem
+        right: 1.2rem
+        color: #a9a9a9
+        content: attr(progress-percentage)
+        font-style: italic
+        font-size: 1.2rem
+
+  :only-child
+    > .card-widget
+      margin-top: 0
+
+@keyframes toc-open
+  0%
+    transform: scale(.7)
+
+  100%
+    transform: scale(1)
+
+@keyframes toc-close
+  0%
+    transform: scale(1)
+
+  100%
+    transform: scale(.7)
 
 +minWidth900()
-  #aside_content
+  html.hide-aside
-    .card-widget
+    .layout
-      if hexo-config('aside.position') == 'right'
+      justify-content: center
-        margin-left: 15px
-      else
-        margin-right: 15px
 
-if hexo-config('aside.mobile') == false
+      > .aside_content
-  +maxWidth768()
-    #aside_content
         display: none
+
+      > div:first-child
+        width: 80%

source/css/_layout/comments.styl

@@ -8,7 +8,7 @@
       font-weight: 700
       font-size: 1.43em
 
-    .comment-switch
+    #comment-switch
       display: inline-block
 
       if hexo-config('comments.text')
@@ -30,33 +30,15 @@
       .second-comment
         color: $comments-switch-second-text
 
-      label
+      .switch-btn
         position: relative
         display: inline-block
         margin: -4px .4rem 0
         width: 42px
         height: 22px
-        vertical-align: middle
-
-        input#switch-comments-btn
-          width: 0
-          height: 0
-          opacity: 0
-
-          &:checked + .slider
-            background-color: $comments-switch-second-text
-
-          &:checked + .slider:before
-            transform: translateX(20px)
-
-        .slider
-          position: absolute
-          top: 0
-          right: 0
-          bottom: 0
-          left: 0
         border-radius: 34px
         background-color: $comments-switch-first-text
+        vertical-align: middle
         cursor: pointer
         transition: .4s
 
@@ -71,6 +53,12 @@
           content: ''
           transition: .4s
 
+        &.move
+          background-color: $comments-switch-second-text
+
+          &:before
+            transform: translateX(20px)
+
   .comment-wrap
     > div:nth-child(2)
       display: none

source/css/_layout/footer.styl

@@ -31,3 +31,5 @@
   .icp-icon
     padding: 0 4px
     vertical-align: text-bottom
+    max-height: 1.4em
+    width auto

source/css/_layout/head.styl

@@ -2,7 +2,6 @@
   position: relative
   width: 100%
   background-color: $light-blue
-  background-attachment: scroll
   background-position: center center
   background-size: cover
   background-repeat: no-repeat
@@ -19,14 +18,14 @@
       padding: 0 .5rem
       width: 100%
 
-  #site_title,
+  #site-title,
-  #site_subtitle,
+  #site-subtitle,
-  #scroll_down .scroll-down-effects
+  #scroll-down .scroll-down-effects
     text-align: center
     text-shadow: .1rem .1rem .2rem rgba(0, 0, 0, .15)
     line-height: 1.5
 
-  #site_title
+  #site-title
     margin: 0
     color: var(--white)
     font-size: 1.85em
@@ -34,7 +33,7 @@
     +minWidth768()
       font-size: 2.85em
 
-  #site_subtitle
+  #site-subtitle
     color: var(--light-grey)
     font-size: 1.15em
 
@@ -57,7 +56,7 @@
       font-size: 1.43em
       cursor: pointer
 
-  #scroll_down
+  #scroll-down
     position: absolute
     bottom: 0
     width: 100%
@@ -76,7 +75,7 @@
     +maxWidth768()
       height: 14rem
 
-  #page_site-info
+  #page-site-info
     position: absolute
     top: 10rem
     padding: 0 .5rem
@@ -102,30 +101,47 @@
       background-color: alpha($dark-black, .5)
       content: ''
 
+  &.no-top-img
+    margin-bottom: .5rem
+    height: 60px
+    background: 0
+
+    #nav
+      background: rgba(255, 255, 255, .8)
+      box-shadow: 0 5px 6px -5px rgba(133, 133, 133, .6)
+
+      a
+        color: var(--font-color)
+        text-shadow: none
+
   #post-info
     position: absolute
-      bottom: 1.5rem
+    bottom: 5rem
     padding: 0 8%
     width: 100%
+    text-align: center
+
+    +maxWidth900()
+      bottom: 1.5rem
       text-align: left
 
     +maxWidth768()
       bottom: 1.1rem
       padding: 0 1.1rem
 
-      #post-title
+#post-info
+  .post-title
+    @extend .limit-more-line
     margin-bottom: .4rem
-        font-size: 2.15em
+    color: var(--white)
+    font-weight: normal
+    font-size: 2.5em
+    line-height: 1.5
+    -webkit-line-clamp: 3
 
     +maxWidth768()
       font-size: 1.72em
 
-        .posttitle
-          @extend .limit-more-line
-          color: var(--white)
-          line-height: 1.5
-          -webkit-line-clamp: 3
-
   #post-meta
     color: var(--light-grey)
     font-size: 95%
@@ -163,6 +179,24 @@
         color: $text-hover
         text-decoration: underline
 
+    if hexo-config('post_meta.post.date_format') == 'relative'
+      time
+        display: none
+
+// for not top_img
+#post
+  & > #post-info
+    margin-bottom: 1.5rem
+
+    .post-title
+      padding-bottom: .2rem
+      border-bottom: 1px solid var(--light-grey)
+      color: var(--text-highlight-color)
+
+    #post-meta,
+    #post-meta a
+      color: #78818a
+
 // css hack
 // all browser in ios and safari in all apple device
 _::-webkit-full-page-media,
@@ -191,6 +225,9 @@ _:future,
     #menus
       padding-right: 0 !important
 
+  &.show
+    opacity: 1
+
   #blog_name
     flex: 1
 
@@ -210,7 +247,7 @@ _:future,
 
   &.fixed
     position: fixed
-    top: -62px
+    top: -60px
     z-index: 91
     background: rgba(255, 255, 255, .8)
     box-shadow: 0 5px 6px -5px alpha($grey, .6)
@@ -309,12 +346,15 @@ _:future,
         font-size: inherit
 
     .menus_items
+      position: absolute
+      left: 0
+      visibility: hidden
+      opacity: 0
+
+    #search-button span
       display: none !important
 
-    #search_button span
+  #search-button
-      display: none !important
-
-  #search_button
     display: inline
     padding: 0 0 0 .7rem
 

source/css/_layout/loading.styl

@@ -5,7 +5,6 @@ if hexo-config('preloader')
     width: 50%
     height: 100%
     background-color: var(--preloader-bg)
-    transition: all .5s
 
   #loading-box
     .loading-left-bg
@@ -53,9 +52,11 @@ if hexo-config('preloader')
 
     &.loaded
       .loading-left-bg
+        transition: all .5s
         transform: translate(-100%, 0)
 
       .loading-right-bg
+        transition: all .5s
         transform: translate(100%, 0)
 
       .spinner-box

source/css/_layout/mobile-sidebar.styl

@@ -1,94 +0,0 @@
-#mobile-sidebar
-  #menu_mask
-    position: fixed
-    z-index: 102
-    display: none
-    width: 100%
-    height: 100%
-    background: alpha($dark-black, .8)
-
-  #mobile-sidebar-menus
-    position: fixed
-    top: 0
-    right: -250px
-    z-index: 103
-    overflow-x: hidden
-    overflow-y: auto
-    width: 250px
-    height: 100%
-    background: var(--sidebar-bg)
-    transition: all .5s
-
-    & > .mobile_author_icon
-      padding: 1.3rem 1.5rem 0
-      text-align: center
-
-      img
-        width: 110px
-        height: 110px
-        border-radius: 70px
-        transition: all .5s
-
-        &:hover
-          transform: rotate(360deg)
-
-    .mobile_post_data
-      display: table
-      padding: .6rem .5rem 0
-      width: 100%
-      table-layout: fixed
-
-      .mobile_data_item
-        display: table-cell
-
-        .mobile_data_link
-          & > a > div
-            @extend .limit-one-line
-
-          .length_num
-            color: var(--text-highlight-color)
-            font-size: 1.28em
-
-          .headline
-            color: var(--font-color)
-
-    hr
-      margin: 1rem auto
-
-    .menus_items
-      padding: 0 .5rem 2rem
-
-      .site-page
-        @extend .limit-one-line
-        position: relative
-        display: block
-        padding: .3rem 1.5rem
-        color: var(--font-color)
-        font-size: 1.15em
-        cursor: pointer
-
-        i:first-child
-          width: 30%
-          text-align: left
-
-        span
-          width: 70%
-
-          &:hover
-            color: $light-blue
-
-      .expand
-        position: absolute
-        top: .78em
-        right: .4rem
-        transition: transform .3s
-
-        &.hide
-          transform: rotate(90deg) !important
-
-      .menus_item_child
-        margin: 0
-        list-style: none
-
-        if hexo-config('hide_sidebar_menu_child')
-          display: none

source/css/_layout/pagination.styl

@@ -59,6 +59,9 @@
   .next-post
     width: 50%
 
+    +maxWidth768()
+      width: 100%
+
     a
       position: relative
       display: block
@@ -74,8 +77,3 @@
   &.pagination-post
     margin: 2rem 0 !important
     background: $dark-black
-
-+maxWidth768()
-  .prev-post,
-  .next-post
-    width: 100% !important