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

fix: 修復jquery在一些介面仍然載入問題 fix: 修復medium zoom 報錯的 bug
Merge branch 'dev' into master
2026-04-10 21:17:07 +08:00 · 2020-12-27 15:51:00 +08:00 · 2020-12-15 18:54:32 +08:00 · 2020-12-15 18:52:58 +08:00 · 2020-12-13 17:02:32 +08:00 · 2020-12-13 17:00:34 +08:00
112 changed files with 2177 additions and 1954 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.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
--- a/README.md
+++ b/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.

@@ -71,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)
@@ -93,6 +93,4 @@ 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)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
--- a/README_CN.md
+++ b/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)修改的主題

@@ -71,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分析）
@@ -93,6 +93,4 @@ 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)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
--- a/_config.yml
+++ b/_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 (數學)
 # --------------------------------------
@@ -108,7 +100,7 @@ archive_img:
 tag_img:

 # The banner image of tag page
-# format: 
+# format:
 #  - tag name: xxxxx
 tag_per_img:

@@ -117,17 +109,10 @@ tag_per_img:
 category_img:

 # The banner image of category page
-# format: 
+# format:
 #  - category name: xxxxx
 category_per_img:

-# If you are using hexo-douban, you can configure it (如果你有使用 hexo-douban,可配置這個)
-# douban:
-#   meta: false
-#   movies_img:
-#   books_img:
-#   games_img:
-
 cover:
  # display the cover or not (是否顯示文章封面)
  index_enable: true
@@ -188,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
@@ -255,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
@@ -317,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/
@@ -337,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
 # --------------------------------------

@@ -385,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
 # --------------------------------------
@@ -553,6 +538,7 @@ ClickShowText:
    # - LOVE
    # - YOU
  fontSize: 15px
+  random: false
  mobile: false

 # Default display mode (網站默認的顯示模式)
@@ -576,9 +562,9 @@ font:

 # Font settings for the site title and site subtitle
 # 左上角網站名字 主頁居中網站名字
-# blog_title_font:
-  # font_link: https://fonts.googleapis.com/css?family=Titillium+Web&display=swap
-  # font-family: Titillium Web, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif
+blog_title_font:
+  font_link:
+  font-family:

 # The setting of divider icon (水平分隔線圖標設置)
 hr_icon:
@@ -615,6 +601,8 @@ preloader: false

 aside:
  enable: true
+  hide: false
+  button: true
  mobile: true # display on mobile
  position: right # left or right
  card_author:
@@ -681,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
@@ -823,12 +815,15 @@ Open_Graph_meta: true
 # Caches the contents in a fragment, speed up the generation (開啟hexo自帶的緩存,加快生成速度)
 fragment_cache: true

+# Add the vendor prefixes to ensure compatibility
+css_prefix: true
+
 # Inject
 # Insert the code to head (before '</head>' tag) and the bottom (before '</body>' tag)
 # 插入代码到头部 </head> 之前 和 底部 </body> 之前
 inject:
  head:
-  # - <link rel="stylesheet" href="/xxx.css">
+    # - <link rel="stylesheet" href="/xxx.css">
  bottom:
    # - <script src="xxxx"></script>

@@ -852,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
@@ -919,4 +915,4 @@ CDN:
  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
+  artitalk: https://cdn.jsdelivr.net/npm/artitalk
--- a/languages/default.yml
+++ b/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,9 +70,11 @@ aside:
    site_pv_name: PV
  more_button: More
  card_newest_comments:
-    heading: Newest Comments
+    headline: Newest Comments
    loading_text: loading...
    error: Unable to get the data, please make sure the settings are correct.
+    zero: No Comment
+  card_toc: Catalog

 date_suffix:
  just: Just
@@ -91,12 +88,15 @@ share: Share

 rightside:
  readmode_title: Read Mode
-  translate_title: Switch Between Traditional Chinese And Simplified Chinese
-  night_mode_title: Switch Between Light And Dark Mode
+  font_plus_title: Increase font size
+  font_minus_title: Decrease font size
+  translate_title: Toggle Between Traditional Chinese And Simplified Chinese
+  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
--- a/languages/en.yml
+++ b/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,9 +70,11 @@ aside:
    site_pv_name: PV
  more_button: More
  card_newest_comments:
-    heading: Newest Comments
+    headline: Newest Comments
    loading_text: loading...
    error: Unable to get the data, please make sure the settings are correct.
+    zero: No Comment
+  card_toc: Catalog

 date_suffix:
  just: Just
@@ -91,12 +88,15 @@ share: Share

 rightside:
  readmode_title: Read Mode
+  font_plus_title: Increase font size
+  font_minus_title: Decrease font size
  translate_title: Switch Between Traditional Chinese And Simplified Chinese
  night_mode_title: Switch Between Light And Dark Mode
  back_to_top: Back To Top
  toc: Table Of Contents
  scroll_to_comment: Scroll To Comments
  setting: Setting
+  aside: Toggle between single-column and double-column

 copy_copyright:
  author: Author
--- a/languages/zh-CN.yml
+++ b/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,9 +71,11 @@ aside:
    site_pv_name: 本站总访问量
  more_button: 查看更多
  card_newest_comments:
-    heading: 最新评论
+    headline: 最新评论
    loading_text: 正在加载中...
-    error: 无法获取资料，请确认相关配置是否正确
+    error: 无法获取评论，请确认相关配置是否正确
+    zero: 没有评论
+  card_toc: 目录

 date_suffix:
  just: 刚刚
@@ -93,12 +89,15 @@ share: 分享

 rightside:
  readmode_title: 阅读模式
+  font_plus_title: 放大字体
+  font_minus_title: 缩小字体
  translate_title: 简繁转换
  night_mode_title: 浅色和深色模式转换
  back_to_top: 回到顶部
  toc: 目录
  scroll_to_comment: 直达评论
  setting: 设置
+  aside: 单栏和双栏切换

 copy_copyright:
  author: 作者
--- a/languages/zh-TW.yml
+++ b/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,9 +71,11 @@ aside:
    site_pv_name: 本站總訪問量
  more_button: 檢視更多
  card_newest_comments:
-    heading: 最新評論
+    headline: 最新評論
    loading_text: 正在加載中...
-    error: 無法獲取資料，請確認相關配置是否正確
+    error: 無法獲取評論，請確認相關配置是否正確
+    zero: 沒有評論
+  card_toc: 目錄

 date_suffix:
  just: 剛剛
@@ -93,12 +89,15 @@ share: 分享

 rightside:
  readmode_title: 閱讀模式
+  font_plus_title: 放大字型
+  font_minus_title: 縮小字型
  translate_title: 簡繁轉換
  night_mode_title: 淺色和深色模式轉換
  back_to_top: 回到頂部
  toc: 目錄
  scroll_to_comment: 直達評論
  setting: 設定
+  aside: 單欄和雙欄切換

 copy_copyright:
  author: 作者
--- a/layout/404.pug
+++ b/layout/404.pug
@@ -25,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
--- a/layout/includes/additional-js.pug
+++ b/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))
@@ -35,9 +32,6 @@ div
  .js-pjax
    if theme.subtitle.enable && is_home() && theme.index_img !== false
      include ./third-party/subtitle.pug
-    
-    if page.type === 'artitalk'
-      include ./third-party/artitalk.pug

    include ./third-party/math/index.pug

@@ -60,12 +54,12 @@ div
  !=partial('includes/third-party/effect', {}, {cache:theme.fragment_cache})

  !=partial('includes/third-party/chat/index', {}, {cache:theme.fragment_cache})
-
+  
  if theme.aplayerInject && theme.aplayerInject.enable
    if theme.pjax.enable || theme.aplayerInject.per_page
-      include ./head/aplayer.pug
+      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})
--- a/layout/includes/footer.pug
+++ b/layout/includes/footer.pug
@@ -14,10 +14,4 @@
      span= _p('footer.theme') + ' '
      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
+    .footer_custom_text!=`${theme.footer.custom_text}`
--- a/layout/includes/head.pug
+++ b/layout/includes/head.pug
@@ -51,16 +51,13 @@ if (theme.pwa && theme.pwa.enable)

 //- main css
 link(rel='stylesheet', href=url_for(theme.CDN.main_css))
-link(rel='stylesheet', href=url_for(theme.CDN.fontawesome))
-
-if theme.fancybox
-  link(rel='stylesheet', href=url_for(theme.CDN.fancybox_css))
+link(rel='stylesheet', href=url_for(theme.CDN.fontawesome) media="print" onload="this.media='all'")

 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
@@ -71,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})
@@ -79,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})
-
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
+!=partial('includes/head/js', {}, {cache:theme.fragment_cache})

+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
--- a/layout/includes/head/aplayer.pug
+++ b/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))
--- a/layout/includes/head/config.pug
+++ b/layout/includes/head/config.pug
@@ -50,14 +50,6 @@
    })
  }

-  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({
@@ -93,7 +85,6 @@
 script.
  var GLOBAL_CONFIG = { 
    root: '!{config.root}',
-    hexoversion: '!{get_hexo_version()}',
    algolia: !{algolia},
    localSearch: !{localSearch},
    translate: !{translate},
@@ -117,12 +108,18 @@ script.
      month: '!{_p("date_suffix.month")}'
    },
    copyright: !{copyright},
-    ClickShowText: !{ClickShowText},
    lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
    Snackbar: !{Snackbar},
-    justifiedGallery: {
-      js: '!{theme.CDN.justifiedGallery_js}',
-      css: '!{theme.CDN.justifiedGallery_css}'
+    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)}'
+      }
    },
    isPhotoFigcaption: !{theme.photofigcaption},
    islazyload: !{theme.lazyload.enable},
@@ -157,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)
+  })
--- a/layout/includes/head/config_site.pug
+++ b/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
-  const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true )
+  var pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
+  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)}'
    }
--- a/layout/includes/head/darkmode.pug
+++ b/layout/includes/head/darkmode.pug
@@ -1,53 +0,0 @@
-if theme.darkmode.enable
-  script.
-    (function () {
-      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()
-      }
-    })()
-
--- a/layout/includes/head/js.pug
+++ b/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')
+    | }
+
+  | })()
+
--- a/layout/includes/head/preconnect.pug
+++ b/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")
--- a/layout/includes/header/index.pug
+++ b/layout/includes/header/index.pug
@@ -16,18 +16,6 @@ if page.top_img !== false
  else
    - var top_img = page.top_img || theme.default_top_img

-  if theme.douban
-    - var doubanExist = false
-    if is_current('/movies/', [strict])
-      - var top_img = theme.douban.movies_img !== false ? theme.douban.movies_img || theme.default_top_img : false
-      - doubanExist = true
-    else if is_current('/books/', [strict])
-      - var top_img = theme.douban.books_img !== false ? theme.douban.books_img || theme.default_top_img : false
-      - doubanExist = true
-    else if is_current('/games/', [strict])
-      - var top_img = theme.douban.games_img !== false ? theme.douban.games_img || theme.default_top_img : false
-      - doubanExist = true
-
  if top_img !== false
    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url(${url_for(top_img)})` : `background: ${top_img}`
    - var bg_img = top_img ? imgSource : ''
--- a/layout/includes/header/nav.pug
+++ b/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

--- a/layout/includes/header/post-info.pug
+++ b/layout/includes/header/post-info.pug
@@ -1,6 +1,5 @@
 #post-info
-  #post-title
-    .posttitle= page.title || _p('no_title')
+  h1.post-title= page.title || _p('no_title')
    
  #post-meta
    .meta-firstline
@@ -33,7 +32,7 @@
            if (index < page.categories.data.length - 1)
              i.fas.fa-angle-right.post-meta-separator

-    .meta-secondline  
+    .meta-secondline
      - let postWordcount = theme.wordcount.enable && (theme.wordcount.post_wordcount || theme.wordcount.min2read)
      if (postWordcount)
        span.post-meta-separator |
@@ -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
-                a(href=full_url_for(page.path) + '#disqus_thread')
-            else if whichCount === 'Valine'
-              i.far.fa-comments.fa-fw.post-meta-icon
-              span.post-meta-label= _p('post.comments') + ':'
-              a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
-                span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-            else if whichCount === 'Gitalk'
-              i.far.fa-comments.fa-fw.post-meta-icon
-              span.post-meta-label= _p('post.comments') + ':'
-              a(href=url_for(page.path) + '#post-comment')
-                span.gitalk-comment-count.comment-count
-            else if whichCount === 'Facebook Comments'
-              i.far.fa-comments.fa-fw.post-meta-icon
-              span.post-meta-label= _p('post.comments') + ':'
-              a.comment-count(href=url_for(page.path) + '#post-comment')
-                span.fb-comments-count(data-href=urlNoIndex())
+            i.far.fa-comments.fa-fw.post-meta-icon
+            span.post-meta-label= _p('post.comments') + ':'
+            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'
+          +countBlock
+            a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
+              span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+        else if whichCount === 'Gitalk'
+          +countBlock
+            a(href=url_for(page.path) + '#post-comment')
+              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'
+          +countBlock
+            a(href=url_for(page.path) + '#post-comment')
+              span.fb-comments-count(data-href=urlNoIndex())
--- a/layout/includes/layout.pug
+++ b/layout/includes/layout.pug
@@ -1,37 +1,30 @@
+- 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
-        #web_bg
-
-      include ./sidebar.pug
      include ./header/index.pug

-      if (!is_post())
-        main#content-inner.layout_page(class=hideAside)
-          if body
-            div!= body
-          else
-            block content
-            if theme.aside.enable && page.aside !== false
-              !=partial('includes/widget/index', {}, {cache:theme.fragment_cache})
-      else
-        main#content-inner.layout_post
-          if body
-            div!= body
-          else
-            block content
-      
+      main#content-inner.layout(class=hideAside)
+        if body
+          div!= body
+        else
+          block content
+          if theme.aside.enable && page.aside !== false
+            include widget/index.pug
+
      - var footerBg = theme.footer_bg
      if (footerBg)
        if (footerBg === true)
--- a/layout/includes/mixins/post-ui.pug
+++ b/layout/includes/mixins/post-ui.pug
@@ -78,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
--- a/layout/includes/mobile-sidebar/index.pug
+++ b/layout/includes/mobile-sidebar/index.pug
@@ -1,3 +0,0 @@
-#mobile-sidebar
-  #menu_mask
-  include ../mobile-sidebar/mobile-menus.pug
--- a/layout/includes/mobile-sidebar/mobile-menus.pug
+++ b/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')})
--- a/layout/includes/page/artitalk.pug
+++ b/layout/includes/page/artitalk.pug
@@ -1,4 +1,28 @@
+- let option = theme.artitalk.option ? JSON.stringify(theme.artitalk.option) : false
+
 if top_img === false
  h1.page-title= page.title

-#artitalk_main
+#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)
+    }
+  })()
--- a/layout/includes/page/default-page.pug
+++ b/layout/includes/page/default-page.pug
@@ -1,5 +1,3 @@
-if theme.douban && theme.douban.meta && doubanExist
-  meta(name="referrer" content="no-referrer")
 #article-container
  if top_img === false
    h1.page-title= page.title
--- a/layout/includes/pagination.pug
+++ b/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 
--- a/layout/includes/rightside.pug
+++ b/layout/includes/rightside.pug
@@ -1,31 +1,38 @@
-section#rightside
+#rightside
  #rightside-config-hide
    if is_post() && theme.readmode
      button#readmode(type="button" title=_p('rightside.readmode_title'))
        i.fas.fa-book-open
+    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))
+      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
-      if commentsJsLoad
-        a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
-          i.fas.fa-comments
+          i.fas.fa-cog.fa-spin
      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)
+    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
+        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
--- a/layout/includes/sidebar.pug
+++ b/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' : ''
-
+#sidebar
+  #menu-mask
+  #sidebar-menus
+    .author-avatar
+      if theme.lazyload.enable
+        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+      else
+        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(showToc)
-  #sidebar
-    i.fas.fa-arrow-right#toggle-sidebar(class=autoOpenSidebar)
-    .sidebar-toc
-      div.sidebar-toc__title= _p('sidebar.catalog')
-      div.sidebar-toc__progress
-        span.progress-notice= _p('sidebar.have_read')
-        span.progress-num 0
-        span.progress-percentage %
-        div.sidebar-toc__progress-bar      
-      if (page.encrypt == true)
-        div.sidebar-toc__content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
-      else 
-        div.sidebar-toc__content!=toc(page.content, {list_number: tocNumber})
-        
+      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')})
--- a/layout/includes/third-party/aplayer.pug
+++ b/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))
--- a/layout/includes/third-party/artitalk.pug
+++ b/layout/includes/third-party/artitalk.pug
@@ -1,24 +0,0 @@
- let option = theme.artitalk.option ? JSON.stringify(theme.artitalk.option) : false
-
-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}',init)
-    }
-  })()
--- a/layout/includes/third-party/baidu_push.pug
+++ b/layout/includes/third-party/baidu_push.pug
@@ -3,11 +3,11 @@ if theme.baidu_push
    (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';
+      if (curProtocol === 'https') {
+        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
      }
      else{
-      bp.src = 'http://push.zhanzhang.baidu.com/push.js';
+        bp.src = 'http://push.zhanzhang.baidu.com/push.js';
      }
      bp.dataset.pjax = ''
      const s = document.getElementsByTagName("script")[0];
--- a/layout/includes/third-party/comments/disqusjs.pug
+++ b/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
    }
  }
--- a/layout/includes/third-party/comments/gitalk.pug
+++ b/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)
    }
  }
  
--- a/layout/includes/third-party/comments/index.pug
+++ b/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
-          input#switch-comments-btn(type="checkbox")
-          span.slider
+        span.switch-btn
        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
--- a/layout/includes/third-party/comments/js.pug
+++ b/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})
--- a/layout/includes/third-party/comments/twikoo.pug
+++ b/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()
+      }
+    }
+  })()
--- a/layout/includes/third-party/comments/valine.pug
+++ b/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 () {
-      const initData = {
+      let initData = {
        el: '#vcomment',
        appId: '#{theme.valine.appId}',
        appKey: '#{theme.valine.appKey}',
@@ -25,17 +26,22 @@ script.
      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()
--- a/layout/includes/third-party/effect.pug
+++ b/layout/includes/third-party/effect.pug
@@ -25,4 +25,11 @@ if theme.click_heart && theme.click_heart.enable
  script#click-heart(src=url_for(theme.CDN.click_heart) async mobile=`${theme.click_heart.mobile}`)

 if theme.ClickShowText && theme.ClickShowText.enable
-  script#click-show-text(src=url_for(theme.CDN.ClickShowText) async mobile=`${theme.ClickShowText.mobile}`)
+  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
+  )
--- a/layout/includes/third-party/math/katex.pug
+++ b/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')
+    })
+  })()
+  
--- a/layout/includes/third-party/math/mathjax.pug
+++ b/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
--- a/layout/includes/third-party/math/mermaid.pug
+++ b/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}',
--- a/layout/includes/third-party/newest-comments/disqus-comment.pug
+++ b/layout/includes/third-party/newest-comments/disqus-comment.pug
@@ -13,45 +13,55 @@ script.
      return content
    }

-    const getDisqusComment = () => {
-      let disqusArray = []
-      $.getJSON('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{theme.newest_comments.disqus.forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{theme.newest_comments.disqus.api_key}', function(data){
-        $.each(data.response, (i, item) => {
-          disqusArray.push({
-            'avatar': item.author.avatar.cache,
-            'content': changeContent(item.message),
-            'nick': item.author.name,
-            'url': item.url,
-            'date': item.createdAt
+    const getComment = () => {
+      fetch('https://disqus.com/api/3.0/forums/listPosts.json?forum=!{theme.newest_comments.disqus.forum}&related=thread&limit=!{theme.newest_comments.limit}&api_key=!{theme.newest_comments.disqus.api_key}')
+        .then(response => response.json())
+        .then(data => {
+          const disqusArray = data.response.map(item => {
+            return {
+              'avatar': item.author.avatar.cache,
+              'content': changeContent(item.message),
+              'nick': item.author.name,
+              'url': item.url,
+              'date': item.createdAt
+            }
          })
+          // set expiry to 10 min
+          saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24))
+          generateHtml(disqusArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
        })
-        // set expiry to 10 min
-        saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24))
-        generateHtml(disqusArray)
-      }).fail(()=>{
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-      })
    }

    const generateHtml = array => {
      let result = ''

-      for (let i = 0; i < array.length; i++) {
-        result += '<div class=\'aside-list-item\'>'
+      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}' alt='${array[i].nick}'></a>`
+          if (!{theme.newest_comments.avatar}) {
+            let name = 'src'
+            if(!{theme.lazyload.enable}) {
+              name = 'data-lazy-src'
+            }
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+          
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
        }
-        
-        result += `<div class='content'>
-        <a class='comment' href='${array[i].url}'>${array[i].content}</a>
-        <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
-        </div></div>`
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
      }

      let $dom = document.querySelector('#card-newest-comments .aside-list')
      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
      window.pjax && window.pjax.refresh($dom)
    }

@@ -61,7 +71,7 @@ script.
        if (data) {
          generateHtml(JSON.parse(data))
        } else {
-          getDisqusComment()
+          getComment()
        }
      }
    }
--- a/layout/includes/third-party/newest-comments/github-issues.pug
+++ b/layout/includes/third-party/newest-comments/github-issues.pug
@@ -13,44 +13,54 @@ script.
      return content
    }

-    const getGithubIssues = () => {
-      let githubArray = []
-      $.getJSON('https://api.github.com/repos/!{theme.newest_comments.github_issues.repo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1', (data) => { 
-        $.each(data, (index, item) => {
-          githubArray.push({
-            'avatar': item.user.avatar_url,
-            'content': changeContent(item.body),
-            'nick': item.user.login,
-            'url': item.html_url,
-            'date': item.updated_at
+    const getComment = () => {
+      fetch('https://api.github.com/repos/!{theme.newest_comments.github_issues.repo}/issues/comments?sort=updated&direction=desc&per_page=!{theme.newest_comments.limit}&page=1')
+        .then(response => response.json())
+        .then(data => {
+          const githubArray = data.map(item => {
+            return {
+              'avatar': item.user.avatar_url,
+              'content': changeContent(item.body),
+              'nick': item.user.login,
+              'url': item.html_url,
+              'date': item.updated_at
+            }
          })
+          saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24))
+          generateHtml(githubArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
        })
-        saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24))
-        generateHtml(githubArray)
-      }).fail(()=>{
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-      })
    }

    const generateHtml = array => {
      let result = ''

-      for (let i = 0; i < array.length; i++) {
-        result += '<div class=\'aside-list-item\'>'
+      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}' alt='${array[i].nick}'></a>`
+          if (!{theme.newest_comments.avatar}) {
+            let name = 'src'
+            if(!{theme.lazyload.enable}) {
+              name = 'data-lazy-src'
+            }
+            result += `<a href='${array[i].url}' class="thumbnail"><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
        }
-
-        result += `<div class='content'>
-        <a class='comment' href='${array[i].url}'>${array[i].content}</a>
-        <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
-        </div></div>`
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
      }

      let $dom = document.querySelector('#card-newest-comments .aside-list')
      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
      window.pjax && window.pjax.refresh($dom)
    }

@@ -60,7 +70,7 @@ script.
        if (data) {
          generateHtml(JSON.parse(data))
        } else {
-          getGithubIssues()
+          getComment()
        }
      }
    }
--- a/layout/includes/third-party/newest-comments/index.pug
+++ b/layout/includes/third-party/newest-comments/index.pug
@@ -3,4 +3,6 @@ if theme.newest_comments.leancloud.enable
 else if theme.newest_comments.github_issues.enable
  include ./github-issues.pug
 else if theme.newest_comments.disqus.enable
-  include ./disqus-comment.pug
+  include ./disqus-comment.pug
+else if theme.newest_comments.twikoo
+  include ./twikoo-comment.pug
--- a/layout/includes/third-party/newest-comments/leancloud.pug
+++ b/layout/includes/third-party/newest-comments/leancloud.pug
@@ -15,7 +15,8 @@ script.
    }

    const getIcon = (icon, mail) => {
-      if (icon) return icon 
+      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,25 +25,34 @@ script.
    const generateHtml = array => {
      let result = ''

-      for (let i = 0; i < array.length; i++) {
-        result += '<div class=\'aside-list-item\'>'
+      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)}' alt='${array[i].nick}'></a>`
+          if (!{theme.newest_comments.avatar}) {
+            let name = 'src'
+            if(!{theme.lazyload.enable}) {
+              name = 'data-lazy-src'
+            }
+            result += `<a href='${array[i].url}' class="thumbnail"><img ${name}='${getIcon(array[i].avatar, array[i].mail)}' alt='${array[i].nick}'></a>`
+          }
+
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
        }
-
-        result += `<div class='content'>
-        <a class='comment' href='${array[i].url}'>${array[i].content}</a>
-        <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].date, true)}</time></div>
-        </div></div>`
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
      }

      let $dom = document.querySelector('#card-newest-comments .aside-list')
      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
      window.pjax && window.pjax.refresh($dom)
    }

-    const getValineData = () => {
+    const getComment = () => {
        let serverURL = ''
        if (!{Boolean(theme.newest_comments.leancloud.serverURL)}) {
          serverURL = '!{theme.newest_comments.leancloud.serverURL}'
@@ -51,9 +61,7 @@ script.
        }

      var settings = {
-        "url": `${serverURL}/1.1/classes/Comment?limit=!{theme.newest_comments.limit}&order=-createdAt`,
        "method": "GET",
-        "timeout": 0,
        "headers": {
          "X-LC-Id": '!{theme.newest_comments.leancloud.appId}',
          "X-LC-Key": '!{theme.newest_comments.leancloud.appKey}',
@@ -61,26 +69,25 @@ script.
        },
      }

-      $.ajax(settings).done((response) => {
-        var valineArray = []
-        response.results.forEach((e)=>{
-          valineArray.push({
-            'avatar': e.QQAvatar,
-            'content': changeContent(e.comment),
-            'mail': e.mail,
-            'nick': e.nick,
-            'url': e.url,
-            'date': e.createdAt,
+      fetch(`${serverURL}/1.1/classes/Comment?limit=!{theme.newest_comments.limit}&order=-createdAt`,settings)
+        .then(response => response.json())
+        .then(data => {
+          const valineArray = data.results.map(function (e) {
+            return {
+              'avatar': e.QQAvatar,
+              'content': changeContent(e.comment),
+              'mail': e.mail,
+              'nick': e.nick,
+              'url': e.url,
+              'date': e.createdAt,
+            }
          })
-        })
-        
-        saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
-        generateHtml(valineArray)
-
-      }).fail(()=>{
-        const $dom = document.querySelector('#card-newest-comments .aside-list')
-        $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
-      })
+          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 = () => {
@@ -89,7 +96,7 @@ script.
        if (data) {
          generateHtml(JSON.parse(data))
        } else {
-          getValineData()
+          getComment()
        }
      }
    }
--- a/layout/includes/third-party/newest-comments/twikoo-comment.pug
+++ b/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)
+  })
+
+
+
--- a/layout/includes/third-party/pangu.pug
+++ b/layout/includes/third-party/pangu.pug
@@ -2,9 +2,10 @@ script.
  function panguFn () {
    if (typeof pangu === 'object') pangu.spacingElementById('content-inner')
    else {
-      $.getScript('!{url_for(theme.CDN.pangu)}', () => {
-        pangu.spacingElementById('content-inner')
-      })
+      getScript('!{url_for(theme.CDN.pangu)}')
+        .then(() => {
+          pangu.spacingElementById('content-inner')
+        })
    }
  }

@@ -16,4 +17,4 @@ script.
    }
  }

-  document.addEventListener('DOMContentLoaded', panguFn)
+  document.addEventListener('DOMContentLoaded', panguInit)
--- a/layout/includes/third-party/pjax.pug
+++ b/layout/includes/third-party/pjax.pug
@@ -29,8 +29,12 @@ script.
  document.addEventListener('pjax:complete', function () {
    window.refreshFn()

-    $('script[data-pjax]').each(function () {
-      $(this).parent().append($(this).remove())
+    document.querySelectorAll('script[data-pjax]').forEach(item => {
+      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()
@@ -69,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')

  })
-
--- a/layout/includes/third-party/search/algolia.pug
+++ b/layout/includes/third-party/search/algolia.pug
@@ -1,12 +1,13 @@
-#algolia-search.search-dialog
-  #algolia-search-title.search-dialog__title Algolia
-  #algolia-input-panel
-    #algolia-search-input
-  hr
-  #algolia-search-results
-    #algolia-hits
-    #algolia-pagination
-    #algolia-stats
-  span.search-close-button
-    i.fas.fa-times
-#search-mask
+#algolia-search
+  .search-dialog
+    #algolia-search-title.search-dialog__title Algolia
+    #algolia-input-panel
+      #algolia-search-input
+    hr
+    #algolia-search-results
+      #algolia-hits
+      #algolia-pagination
+      #algolia-stats
+    span.search-close-button
+      i.fas.fa-times
+  #search-mask
--- a/layout/includes/third-party/search/local-search.pug
+++ b/layout/includes/third-party/search/local-search.pug
@@ -1,23 +1,12 @@
-#local-search.search-dialog
-  #local-search-title.search-dialog__title=_p("local_search.label")
-  #local-input-panel
-    #local-search-input
-      .local-search-box
-        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
+#local-search
+  .search-dialog
+    #local-search-title.search-dialog__title=_p("local_search.label")
+    #local-input-panel
+      #local-search-input
+        .local-search-box
+          input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
+    hr
+    #local-search-results
+    span.search-close-button
+      i.fas.fa-times
+  #search-mask
--- a/layout/includes/third-party/share/share-js.pug
+++ b/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)
--- a/layout/includes/third-party/subtitle.pug
+++ b/layout/includes/third-party/subtitle.pug
@@ -1,97 +1,80 @@
- var source = theme.subtitle.source
-if source == '1'
-  script.
-    function subtitleType () {
-      $.getJSON('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',function (data) {
-        if (!{theme.subtitle.effect}) {
-          var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-          var both = sub.unshift(data.text)
-          typed = new Typed('#subtitle', {
-            strings: sub,
-            startDelay: 300,
-            typeSpeed: 150,
-            loop: !{theme.subtitle.loop},
-            backSpeed: 50,
+- let source = theme.subtitle.source
+
+case source
+  when 1
+    script.
+      function subtitleType () {
+        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)
+              typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = data.text
+            }
          })
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
        } else {
-          document.getElementById('subtitle').innerHTML = data.text
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
        }
-      })
-    }
+      } else {
+        subtitleType()
+      }

-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
-
-else if source == '2'
-  script.
-    function subtitleType () {
-      $.getJSON('https://v1.hitokoto.cn', function (data) {
-        if (!{theme.subtitle.effect}) {
-          var from = '出自 ' + data.from
-          var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-          var both = sub.unshift(data.hitokoto, from)
-          var typed = new Typed('#subtitle', {
-            strings: sub,
-            startDelay: 300,
-            typeSpeed: 150,
-            loop: !{theme.subtitle.loop},
-            backSpeed: 50,
+  when 2
+    script.
+      function subtitleType () {
+        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(',')
+              var both = sub.unshift(data.hitokoto, from)
+              var typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = data.hitokoto
+            }
          })
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
        } else {
-          document.getElementById('subtitle').innerHTML = data.hitokoto
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
        }
-      })
-    }
+      } else {
+        subtitleType()
+      }

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

-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
+
+  when 4
+    script.
+      function subtitleType () {
+        getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js').then(() => {
+          jinrishici.load(function (result) {
+            if (!{theme.subtitle.effect}) {
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+              var content = result.data.content
+              var both = sub.unshift(content)
+              var typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = result.data.content
+            }
+          })
+        })
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
+
+  default
+    script.
+      function subtitleType () {
+        if (!{theme.subtitle.effect}) { 
+          var typed = new Typed("#subtitle", {
+            strings: "!{theme.subtitle.sub}".split(","),
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{theme.subtitle.loop},
+            backSpeed: 50
+          })
+        } else {
+          document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}'
+        }
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') {
+          subtitleType()
+        } else {
+          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+        }
+      } else {
+        subtitleType()
+      }
--- a/layout/includes/widget/card_ad.pug
+++ b/layout/includes/widget/card_ad.pug
@@ -1,2 +1,3 @@
-.card-widget.card-ad
-  != theme.ad.aside
+if theme.ad && theme.ad.aside
+  .card-widget.ads-wrap
+    != theme.ad.aside
--- a/layout/includes/widget/card_announcement.pug
+++ b/layout/includes/widget/card_announcement.pug
@@ -1,6 +1,7 @@
-.card-widget.card-announcement
-  .card-content
-    .item-headline
-      i.fas.fa-bullhorn.card-announcement-animation
-      span= _p('aside.card_announcement')
-    .announcement_content!= theme.aside.card_announcement.content
+if theme.aside.card_announcement.enable
+  .card-widget.card-announcement
+    .card-content
+      .item-headline
+        i.fas.fa-bullhorn.card-announcement-animation
+        span= _p('aside.card_announcement')
+      .announcement_content!= theme.aside.card_announcement.content
--- a/layout/includes/widget/card_archives.pug
+++ b/layout/includes/widget/card_archives.pug
@@ -1,11 +1,12 @@
-.card-widget.card-archives
-  .card-content
-    .item-headline
-      i.fas.fa-archive
-      span= _p('aside.card_archives')
-    
-    - let type = theme.aside.card_archives.type || 'monthly'
-    - let format = theme.aside.card_archives.format || 'MMMM YYYY'
-    - let order = theme.aside.card_archives.order || -1
-    - let limit = theme.aside.card_archives.limit === 0 ? 0 : theme.aside.card_archives.limit || 8
-    != aside_archives({ type:type, format: format, order: order, limit: limit })
+if theme.aside.card_archives.enable
+  .card-widget.card-archives
+    .card-content
+      .item-headline
+        i.fas.fa-archive
+        span= _p('aside.card_archives')
+      
+      - let type = theme.aside.card_archives.type || 'monthly'
+      - let format = theme.aside.card_archives.format || 'MMMM YYYY'
+      - let order = theme.aside.card_archives.order || -1
+      - let limit = theme.aside.card_archives.limit === 0 ? 0 : theme.aside.card_archives.limit || 8
+      != aside_archives({ type:type, format: format, order: order, limit: limit })
--- a/layout/includes/widget/card_author.pug
+++ b/layout/includes/widget/card_author.pug
@@ -1,36 +1,37 @@
-.card-widget.card-info
-  .card-content
-    .card-info-avatar.is-center
-      if theme.lazyload.enable
-        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
-      else
-        img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")      
-      .author-info__name= config.author
-      .author-info__description!= theme.aside.card_author.description || config.description
+if theme.aside.card_author.enable
+  .card-widget.card-info
+    .card-content
+      .card-info-avatar.is-center
+        if theme.lazyload.enable
+          img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
+        else
+          img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")      
+        .author-info__name= config.author
+        .author-info__description!= theme.aside.card_author.description || config.description

-    .card-info-data
-      if site.posts.length
-        .card-info-data-item.is-center
-          a(href=url_for(config.archive_dir) + '/')
-            .headline= _p('aside.articles') 
-            .length_num= site.posts.length
+      .card-info-data
+        if site.posts.length
+          .card-info-data-item.is-center
+            a(href=url_for(config.archive_dir) + '/')
+              .headline= _p('aside.articles') 
+              .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
+        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

-      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
+        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

-    a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
-      i(class=theme.aside.card_author.button.icon)
-      span=theme.aside.card_author.button.text
-  
-    if(theme.social)
-        .card-info-social-icons.is-center
-          !=fragment_cache('social', function(){return partial('includes/header/social')}) 
+      a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
+        i(class=theme.aside.card_author.button.icon)
+        span=theme.aside.card_author.button.text
+    
+      if(theme.social)
+          .card-info-social-icons.is-center
+            !=fragment_cache('social', function(){return partial('includes/header/social')}) 
--- a/layout/includes/widget/card_categories.pug
+++ b/layout/includes/widget/card_categories.pug
@@ -1,9 +1,8 @@
-if site.categories.length
-  .card-widget.card-categories
-      .card-content
-        .item-headline
-          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 })
-
-  
+if theme.aside.card_categories.enable
+  if site.categories.length
+    .card-widget.card-categories
+        .card-content
+          .item-headline
+            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 })
--- a/layout/includes/widget/card_newest_comment.pug
+++ b/layout/includes/widget/card_newest_comment.pug
@@ -1,7 +1,8 @@
-.card-widget#card-newest-comments
-  .card-content
-    .item-headline
-      i.fas.fa-bolt
-      span= _p('aside.card_newest_comments.heading')
-    .aside-list
-      span= _p('aside.card_newest_comments.loading_text')
+if theme.newest_comments.enable
+  .card-widget#card-newest-comments
+    .card-content
+      .item-headline
+        i.fas.fa-bolt
+        span= _p('aside.card_newest_comments.headline')
+      .aside-list
+        span= _p('aside.card_newest_comments.loading_text')
--- a/layout/includes/widget/card_post_toc.pug
+++ b/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})
+      
--- a/layout/includes/widget/card_recent_post.pug
+++ b/layout/includes/widget/card_recent_post.pug
@@ -1,27 +1,28 @@
-.card-widget.card-recent-post
-  .card-content
-    .item-headline
-      i.fas.fa-history
-      span= _p('aside.card_recent_post')
-    .aside-list
-      - 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){
-        - let link = article.link || article.path
-        - let title = article.title || _p('no_title')
-        - 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)
+if theme.aside.card_recent_post.enable
+  .card-widget.card-recent-post
+    .card-content
+      .item-headline
+        i.fas.fa-history
+        span= _p('aside.card_recent_post')
+      .aside-list
+        - 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){
+          - let link = article.link || article.path
+          - let title = article.title || _p('no_title')
+          - 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
+              a.title(href=url_for(link) title=title)= title
+              if theme.aside.card_recent_post.sort === 'updated'
+                time(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated)) #[=date(article.updated, config.date_format)]
              else
-                img(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-          .content
-            a.title(href=url_for(link) title=title)= title
-            if theme.aside.card_recent_post.sort === 'updated'
-              time(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated)) #[=date(article.updated, config.date_format)]
-            else
-              time(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)]
-      - })
+                time(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)]
+        - })
--- a/layout/includes/widget/card_tags.pug
+++ b/layout/includes/widget/card_tags.pug
@@ -1,12 +1,13 @@
-if site.tags.length
-  .card-widget.card-tags
-    .card-content
-      .item-headline
-        i.fas.fa-tags
-        span= _p('aside.card_tags')
+if theme.aside.card_tags.enable
+  if site.tags.length
+    .card-widget.card-tags
+      .card-content
+        .item-headline
+          i.fas.fa-tags
+          span= _p('aside.card_tags')

-      - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40
-      if theme.aside.card_tags.color
-        .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.1, maxfontsize: 1.5, limit: tagLimit, unit: 'em'})
-      else
-        .card-tag-cloud!= tagcloud({min_font: 1.1, max_font: 1.5, amount: tagLimit , color: true, start_color: '#999', end_color: '#99a9bf', unit: 'em'})
+        - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40
+        if theme.aside.card_tags.color
+          .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.1, maxfontsize: 1.5, limit: tagLimit, unit: 'em'})
+        else
+          .card-tag-cloud!= tagcloud({min_font: 1.1, max_font: 1.5, amount: tagLimit , color: true, start_color: '#999', end_color: '#99a9bf', unit: 'em'})
--- a/layout/includes/widget/card_webinfo.pug
+++ b/layout/includes/widget/card_webinfo.pug
@@ -1,31 +1,32 @@
-.card-widget.card-webinfo
-  .card-content
-    .item-headline
-      i.fas.fa-chart-line
-      span= _p('aside.card_webinfo.headline')
-    .webinfo
-      if theme.aside.card_webinfo.post_count
-        .webinfo-item
-          .item-name= _p('aside.card_webinfo.article_name') + " :"
-          .item-count= site.posts.length
-      if theme.runtimeshow.enable
-        .webinfo-item
-          .item-name= _p('aside.card_webinfo.runtime.name') + " :"
-          .item-count#runtimeshow(data-publishDate=date_xml(theme.runtimeshow.publish_date))
-      if theme.wordcount.enable && theme.wordcount.total_wordcount
-        .webinfo-item
-          .item-name=_p('aside.card_webinfo.site_wordcount') + " :"
-          .item-count=totalcount(site)
-      if theme.busuanzi.site_uv 
-        .webinfo-item
-          .item-name= _p('aside.card_webinfo.site_uv_name') + " :"
-          .item-count#busuanzi_value_site_uv
-      if theme.busuanzi.site_pv
-        .webinfo-item
-          .item-name= _p('aside.card_webinfo.site_pv_name') + " :"
-          .item-count#busuanzi_value_site_pv
-      if theme.aside.card_webinfo.last_push_date
-        .webinfo-item
-          .item-name= _p('aside.card_webinfo.last_push_date.name') + " :"
-          .item-count#last-push-date(data-lastPushDate=date_xml(Date.now()))
+if theme.aside.card_webinfo.enable
+  .card-widget.card-webinfo
+    .card-content
+      .item-headline
+        i.fas.fa-chart-line
+        span= _p('aside.card_webinfo.headline')
+      .webinfo
+        if theme.aside.card_webinfo.post_count
+          .webinfo-item
+            .item-name= _p('aside.card_webinfo.article_name') + " :"
+            .item-count= site.posts.length
+        if theme.runtimeshow.enable
+          .webinfo-item
+            .item-name= _p('aside.card_webinfo.runtime.name') + " :"
+            .item-count#runtimeshow(data-publishDate=date_xml(theme.runtimeshow.publish_date))
+        if theme.wordcount.enable && theme.wordcount.total_wordcount
+          .webinfo-item
+            .item-name=_p('aside.card_webinfo.site_wordcount') + " :"
+            .item-count=totalcount(site)
+        if theme.busuanzi.site_uv 
+          .webinfo-item
+            .item-name= _p('aside.card_webinfo.site_uv_name') + " :"
+            .item-count#busuanzi_value_site_uv
+        if theme.busuanzi.site_pv
+          .webinfo-item
+            .item-name= _p('aside.card_webinfo.site_pv_name') + " :"
+            .item-count#busuanzi_value_site_pv
+        if theme.aside.card_webinfo.last_push_date
+          .webinfo-item
+            .item-name= _p('aside.card_webinfo.last_push_date.name') + " :"
+            .item-count#last-push-date(data-lastPushDate=date_xml(Date.now()))

--- a/layout/includes/widget/index.pug
+++ b/layout/includes/widget/index.pug
@@ -1,20 +1,26 @@
 #aside_content.aside_content
-  if theme.aside.card_author.enable
-    include ./card_author.pug
-  .sticky_layout
-    if theme.aside.card_announcement.enable
-      include ./card_announcement.pug
-    if theme.aside.card_recent_post.enable
-      include ./card_recent_post.pug
-    if theme.newest_comments.enable
-      include ./card_newest_comment.pug
-    if theme.ad && theme.ad.aside
-      include ./card_ad.pug
-    if theme.aside.card_categories.enable
-      include ./card_categories.pug
-    if theme.aside.card_tags.enable
-      include ./card_tags.pug
-    if theme.aside.card_archives.enable
-      include ./card_archives.pug
-    if theme.aside.card_webinfo.enable
-      include ./card_webinfo.pug
+  //- post
+  if is_post()
+    if showToc && theme.toc.style_simple
+      .sticky_layout
+        include ./card_post_toc.pug
+    else
+      !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
+      .sticky_layout
+        if showToc
+          include ./card_post_toc.pug
+        !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
+        !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
+  else
+    //- page
+    !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
+    !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
+    .sticky_layout
+      !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
+      !=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})
--- a/layout/post.pug
+++ b/layout/post.pug
@@ -1,11 +1,11 @@
 extends includes/layout.pug

 block content
-  article#post(class="")
+  #post
    if top_img === false
      include includes/header/post-info.pug

-    #article-container.post-content!=page.content
+    article#article-container.post-content!=page.content
    include includes/post/post-copyright.pug
    .tag_share
      if (theme.post_meta.post.tags)
@@ -19,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
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "hexo-theme-butterfly",
-  "version": "3.2.0",
+  "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"
 }
--- a/scripts/events/check_hexo.js
+++ b/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)
-  }
-})
--- a/scripts/events/init.js
+++ b/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
+})
--- a/scripts/events/replace_config.js
+++ b/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
-})
--- a/scripts/filters/random_cover.js
+++ b/scripts/filters/random_cover.js
@@ -6,7 +6,8 @@
 'use strict'

 hexo.extend.filter.register('before_post_render', function (data) {
-  if (hexo.theme.config.rootConfig.post_asset_folder) {
+  const { config } = this
+  if (config.post_asset_folder) {
    const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/
    const topImg = data.top_img
    const cover = data.cover
--- a/scripts/helpers/aside_categories.js
+++ b/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>'
        }
      })
    }
--- a/scripts/helpers/page.js
+++ b/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,15 +22,6 @@ hexo.extend.helper.register('page_description', function () {
  }
 })

-hexo.extend.helper.register('injectHtml', function (data) {
-  let result = ''
-  if (!data) return ''
-  for (let i = 0; i < data.length; i++) {
-    result += data[i]
-  }
-  return result
-})
-
 hexo.extend.helper.register('cloudTags', function (options = {}) {
  const env = this
  let source = options.source
@@ -65,18 +55,18 @@ hexo.extend.helper.register('cloudTags', function (options = {}) {
 })

 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
+  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('get_hexo_version', function () {
-  return hexo.version
+hexo.extend.helper.register('injectHtml', function (data) {
+  let result = ''
+  if (!data) return ''
+  for (let i = 0; i < data.length; i++) {
+    result += data[i]
+  }
+  return result
 })
--- a/scripts/helpers/related_post.js
+++ b/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>' +
--- a/scripts/tags/button.js
+++ b/scripts/tags/button.js
--- a/scripts/tags/gallery.js
+++ b/scripts/tags/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>
--- a/scripts/tags/hide.js
+++ b/scripts/tags/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) {
--- a/scripts/tags/mermaid.js
+++ b/scripts/tags/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 })
--- a/scripts/tags/note.js
+++ b/scripts/tags/note.js
--- a/scripts/tags/tabs.js
+++ b/scripts/tags/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>`
--- a/source/css/_global/function.styl
+++ b/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}
@@ -68,27 +72,7 @@ if hexo-config('enter_transitions')
  #ribbon-canvas
    animation: ribbon_to_show 4s

-  .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
+  #sidebar-menus
    &.open
      for i in 1 2 3 4
        > :nth-child({i})
@@ -171,6 +155,13 @@ if hexo-config('avatar.effect') == true
  100%
    opacity: 1

+@keyframes to_hide
+  0%
+    opacity: 1
+
+  100%
+    opacity: 0
+
@keyframes ribbon_to_show
  0%
    opacity: 0
@@ -217,17 +208,3 @@ if hexo-config('avatar.effect') == true

  100%
    transform: translateX(0)
-
-@keyframes tocsidebarRtoL
-  0%
-    transform: translateX(200px)
-
-  100%
-    transform: translateX(0)
-
-@keyframes tocsidebarLtoR
-  0%
-    transform: translateX(-200px)
-
-  100%
-    transform: translateX(0)
--- a/source/css/_global/index.styl
+++ b/source/css/_global/index.styl
@@ -1,4 +1,5 @@
-[data-theme='light']
+:root
+  --global-font-size: $font-size
  --global-bg: $body-bg
  --font-color: $font-black
  --hr-border: lighten($theme-hr-color, 50%)
@@ -25,7 +26,7 @@
  --blockquote-color: $blockquote-color
  --blockquote-bg: $blockquote-background-color
  --reward-pop: $reward-pop-up-bg
-  --sidebar-icon-color: $sidebar-icon-color
+  --toc-link-color: $toc-link-color

 html
  height: 100%
@@ -36,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)
@@ -57,16 +58,17 @@ body
 input::placeholder
  color: var(--font-color)

-#web_bg
-  position: fixed
-  z-index: -999
-  width: 100%
-  height: 100%
-  background: $web-bg
-  background-attachment: local
-  background-position: center
-  background-size: cover
-  background-repeat: no-repeat
+if $web-bg
+  #web_bg
+    position: fixed
+    z-index: -999
+    width: 100%
+    height: 100%
+    background: $web-bg
+    background-attachment: local
+    background-position: center
+    background-size: cover
+    background-repeat: no-repeat

 h1,
 h2,
@@ -140,13 +142,24 @@ 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
-#site-title,
-#site-subtitle,
-#site-name,
-#aside_content .author-info__name,
-#aside_content .author-info__description
-  font-family: $site-name-font
+if $site-name-font
+  #site-title,
+  #site-subtitle,
+  #site-name,
+  #aside_content .author-info__name,
+  #aside_content .author-info__description
+    font-family: $site-name-font

 .is-center
  text-align: center
@@ -183,20 +196,17 @@ button
      transition-timing-function: cubic-bezier(.45, 1.64, .47, .66)
      transform: scaleX(1)

-img[src=''],
-img:not([src])
-  opacity: 0
+img
+  max-width: 100%
+  transition: all .2s
+
+  &[src=''],
+  &:not([src])
+    opacity: 0

 .img-alt
  margin: -.5rem 0 .5rem
  color: #858585

  &:hover
-    text-decoration: none !important
-
-.post-ad
-  margin: 2rem 0
-
-.ad-height
-  display: block !important
-  height: auto !important
+    text-decoration: none !important
--- a/source/css/_highlight/highlight.styl
+++ b/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')
-$prismjsEnable = hexo-config('rootConfig.prismjs') && hexo-config('rootConfig.prismjs.enable')
-wordWrap = !hexo-config('rootConfig.highlight.line_number') && hexo-config('code_word_wrap')
+$highlighEnable = hexo-config('highlight_settings') && hexo-config('highlight_settings.enable')
+$prismjsEnable = hexo-config('prismjs_settings') && hexo-config('prismjs_settings.enable')
+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
--- a/source/css/_highlight/highlight/index.styl
+++ b/source/css/_highlight/highlight/index.styl
@@ -22,9 +22,9 @@ if $highlight_theme != false
      overflow: auto
      border: none

-    td
-      padding: 0
-      border: none
+      td
+        padding: 0
+        border: none

    .gutter pre
      padding-right: .5rem
--- a/source/css/_highlight/prismjs/index.styl
+++ b/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
--- a/source/css/_layout/404.styl
+++ b/source/css/_layout/404.styl
@@ -45,7 +45,8 @@ if hexo-config('error_404.enable')
        padding: .5rem
        text-align: center
        font-size: 14px
-        font-family: $site-name-font
+        if $site-name-font
+          font-family: $site-name-font

        +maxWidth768()
          flex: 1.1
--- a/source/css/_layout/aside.styl
+++ b/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
@@ -171,6 +186,7 @@
  .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,
@@ -214,13 +230,14 @@
        padding: 0 0 0 .8rem

      > .parent
-        .card-category-list
-          &-name
-            width: 70% !important
+        > a
+          .card-category-list
+            &-name
+              width: 70% !important

-          &-count
-            width: calc(100% - 70% - 20px)
-            text-align: right
+            &-count
+              width: calc(100% - 70% - 20px)
+              text-align: right

        i
          float: right
@@ -233,7 +250,7 @@
            transform: rotate(-90deg)

        if hexo-config('aside.card_categories.expand') == false
-          + .child
+          > .child
            display: none

  .card-webinfo
@@ -248,23 +265,96 @@
            flex: 1
            padding-right: 1rem

-+maxWidth900()
-  #aside_content
-    width: 100% !important
+  // toc
+  #card-toc
+    +minWidth901()
+      right: 0 !important

-  #aside_content
-    .card-widget:first-child
-      margin-top: 1rem
+    +maxWidth900()
+      position: fixed
+      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
-    .card-widget
-      if hexo-config('aside.position') == 'right'
-        margin-left: 15px
-      else
-        margin-right: 15px
+  html.hide-aside
+    .layout
+      justify-content: center

-if hexo-config('aside.mobile') == false
-  +maxWidth768()
-    #aside_content
-      display: none
+      > .aside_content
+        display: none
+
+      > div:first-child
+        width: 80%
--- a/source/css/_layout/comments.styl
+++ b/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,46 +30,34 @@
      .second-comment
        color: $comments-switch-second-text

-      label
+      .switch-btn
        position: relative
        display: inline-block
        margin: -4px .4rem 0
        width: 42px
        height: 22px
+        border-radius: 34px
+        background-color: $comments-switch-first-text
        vertical-align: middle
+        cursor: pointer
+        transition: .4s

-        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
+        &:before
          position: absolute
-          top: 0
-          right: 0
-          bottom: 0
-          left: 0
-          border-radius: 34px
-          background-color: $comments-switch-first-text
-          cursor: pointer
+          bottom: 4px
+          left: 4px
+          width: 14px
+          height: 14px
+          border-radius: 50%
+          background-color: $comments-switch-round
+          content: ''
          transition: .4s

+        &.move
+          background-color: $comments-switch-second-text
+
          &:before
-            position: absolute
-            bottom: 4px
-            left: 4px
-            width: 14px
-            height: 14px
-            border-radius: 50%
-            background-color: $comments-switch-round
-            content: ''
-            transition: .4s
+            transform: translateX(20px)

  .comment-wrap
    > div:nth-child(2)
--- a/source/css/_layout/footer.styl
+++ b/source/css/_layout/footer.styl
@@ -31,3 +31,5 @@
  .icp-icon
    padding: 0 4px
    vertical-align: text-bottom
+    max-height: 1.4em
+    width auto
--- a/source/css/_layout/head.styl
+++ b/source/css/_layout/head.styl
@@ -116,29 +116,32 @@

  #post-info
    position: absolute
-    bottom: 1.5rem
+    bottom: 5rem
    padding: 0 8%
    width: 100%
-    text-align: left
+    text-align: center
+
+    +maxWidth900()
+      bottom: 1.5rem
+      text-align: left

    +maxWidth768()
      bottom: 1.1rem
      padding: 0 1.1rem

 #post-info
-  #post-title
+  .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%
@@ -185,17 +188,14 @@
  & > #post-info
    margin-bottom: 1.5rem

-    .posttitle
+    .post-title
      padding-bottom: .2rem
      border-bottom: 1px solid var(--light-grey)
      color: var(--text-highlight-color)

-[data-theme='light']
-  #post
-    #post-info
-      #post-meta,
-      #post-meta a
-        color: #78818a
+    #post-meta,
+    #post-meta a
+      color: #78818a

 // css hack
 // all browser in ios and safari in all apple device
@@ -346,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
-      display: none !important
-
-  #search_button
+  #search-button
    display: inline
    padding: 0 0 0 .7rem

--- a/source/css/_layout/mobile-sidebar.styl
+++ b/source/css/_layout/mobile-sidebar.styl
@@ -1,97 +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
-
-    &.open
-      transform: translate3d(-100%, 0, 0)
-
-    & > .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
--- a/source/css/_layout/pagination.styl
+++ b/source/css/_layout/pagination.styl
@@ -59,6 +59,9 @@
  .next-post
    width: 50%

+    +maxWidth768()
+      width: 100%
+
    a
      position: relative
      display: block
@@ -73,9 +76,4 @@

  &.pagination-post
    margin: 2rem 0 !important
-    background: $dark-black
-
-+maxWidth768()
-  .prev-post,
-  .next-post
-    width: 100% !important
+    background: $dark-black
--- a/source/css/_layout/post.styl
+++ b/source/css/_layout/post.styl
@@ -142,6 +142,24 @@ no-beautify()
      padding-left: .3rem

 #article-container
+  word-wrap: break-word
+  overflow-wrap: break-word
+
+  a
+    color: $theme-link-color
+
+    &:hover
+      text-decoration: underline
+
+  img
+    margin: 0 auto .8rem
+
+  p
+    margin: 0 0 .8rem
+
+  iframe
+    margin: 0 0 1rem
+
  if hexo-config('beautify.enable') && hexo-config('beautify.field') == 'site'
    beautify()
  else if hexo-config('beautify.enable') && hexo-config('beautify.field') == 'post'
@@ -152,42 +170,7 @@ no-beautify()
  else
    no-beautify()

-a
-  color: $a-link-color
-  text-decoration: none
-  word-wrap: break-word
-  transition: all .2s
-  overflow-wrap: break-word
-
-  &:hover
-    color: $light-blue
-
-a.fancybox
-  outline: none
-
-  &:focus
-    outline: none
-
-  display: inline-block
-  width: 100%
-  text-align: center
-
-img
-  max-width: 100%
-  transition: all .2s
-
-.katex-wrap
-  overflow: auto
-
-  if hexo-config('katex') && hexo-config('katex.hide_scrollbar')
-    &::-webkit-scrollbar
-      display: none
-
-.layout_post
-  margin: 0 auto
-  padding: 2rem 15px
-  max-width: 1000px
-
+#post
  img
    display: block

@@ -272,25 +255,6 @@ img
          &:hover
            text-decoration: none

-#article-container
-  word-wrap: break-word
-  overflow-wrap: break-word
-
-  a
-    color: $theme-link-color
-
-    &:hover
-      text-decoration: underline
-
-  img
-    margin: 0 auto .8rem
-
-  p
-    margin: 0 0 .8rem
-
-  iframe
-    margin: 0 0 1rem
-
  .post-outdate-notice
    position: relative
    margin: 0 0 1rem
@@ -312,24 +276,5 @@ img
        content: '\f071'
        transform: translateY(-50%)

-+maxWidth1024()
-  .layout_post
-    width: auto
-
-+maxWidth768()
-  .layout_post
-    padding: 1rem 5px
-
-    & > #post
-      padding: 1.8rem .7rem
-
-// adjust the layout width in big screen
-+minWidth2000()
-  .layout_post
-    max-width: 1300px
-
-  .layout_page
-    max-width: 1500px
-
-    &.hide-aside
-      max-width: 1300px
+  .ads-wrap
+    margin: 2rem 0
--- a/source/css/_layout/rightside.styl
+++ b/source/css/_layout/rightside.styl
@@ -29,12 +29,12 @@
      &:hover
        background-color: var(--btn-hover-color)

-  #rightside_config
-    i
-      animation: avatar_turn_around 2s linear infinite
-
  #mobile-toc-button
    display: none

-    +maxWidth1024()
+    +maxWidth900()
      display: block
+
+  +maxWidth900()
+    #hide-aside-btn
+      display: none
--- a/source/css/_layout/sidebar.styl
+++ b/source/css/_layout/sidebar.styl
@@ -1,88 +1,97 @@
-#toggle-sidebar
-  position: fixed
-  bottom: $sidebar-icon-top
-  left: $sidebar-icon-left
-  z-index: 100
-  color: var(--sidebar-icon-color)
-  font-size: $sidebar-icon-size
-  cursor: pointer
-  transition: all .2s
-
-  +maxWidth1024()
-    display: none
-
 #sidebar
-  position: fixed
-  top: 0
-  left: -($sidebar-width)
-  z-index: 10
-  padding: 1rem 0 2rem .5rem
-  width: $sidebar-width
-  height: 100%
-  background: var(--sidebar-bg)
-  opacity: .9
+  #menu-mask
+    position: fixed
+    z-index: 102
+    display: none
+    width: 100%
+    height: 100%
+    background: alpha($dark-black, .8)

-  &.tocOpenPc
-    & > #toggle-sidebar
-      color: #99a9bf
-      transform: rotateZ(180deg)
-
-  +maxWidth1024()
-    right: -($mobile-sidebar-width)
-    left: auto
+  #sidebar-menus
+    position: fixed
+    top: 0
+    right: -($sidebar-width)
    z-index: 103
-    width: $mobile-sidebar-width
-    box-shadow: none
-    opacity: 1
-    transition: all .4s
+    overflow-x: hidden
+    overflow-y: auto
+    width: $sidebar-width
+    height: 100%
+    background: var(--sidebar-bg)
+    transition: all .5s

-    .toc-child
-      display: block !important
+    &.open
+      transform: translate3d(-100%, 0, 0)

-  .sidebar-toc
-    ol,
-    li
-      list-style: none
-
-    ol
-      margin-top: .2rem
-      padding-left: .4rem
-
-    &__title
-      padding-right: .5rem
+    & > .author-avatar
+      padding: 1.3rem 1.5rem 0
      text-align: center
-      font-size: 1.3em

-    &__content
-      overflow-y: scroll
-      padding-bottom: 5rem
-      height: 90vh
+      img
+        width: 110px
+        height: 110px
+        border-radius: 70px
+        transition: all .5s

-    .toc-link
-      display: block
-      padding-left: .2rem
-      border-right: 3px solid transparent
-      transition: all .2s ease-in-out
+        &:hover
+          transform: rotate(360deg)

-      &.active
-        border-right-color: darken($theme-toc-color, 20%)
-        background: $theme-toc-color
-        color: $sidebar-active-color
+    .site-data
+      display: table
+      padding: .6rem .5rem 0
+      width: 100%
+      table-layout: fixed

-    &__progress
-      position: relative
-      margin-bottom: .3rem
-      padding-left: .6rem
-      color: $theme-toc-color
+      .data-item
+        display: table-cell

-      .progress-notice
-        margin-right: .4rem
+        .data-item-link
+          & > a > div
+            @extend .limit-one-line

-      .progress-num
-        display: inline-block
-        min-width: .9rem
+          .length-num
+            color: var(--text-highlight-color)
+            font-size: 1.28em

-      &-bar
-        width: 0
-        height: 1px
-        background: $theme-toc-color
+          .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: 25%
+          text-align: left
+
+        span
+          width: 75%
+
+          &: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
--- a/source/css/_layout/third-party.styl
+++ b/source/css/_layout/third-party.styl
@@ -14,7 +14,7 @@
      background: url(hexo-config('valine.bg')) 100% 100% no-repeat

      &:focus
-        background: none
+        background-image: none

  .vimg
    transition: all .3s
@@ -61,6 +61,13 @@
    margin: 0 0 .8em
    padding: .3rem 0 .8em

+.katex-wrap
+  overflow: auto
+
+  if hexo-config('katex') && hexo-config('katex.hide_scrollbar')
+    &::-webkit-scrollbar
+      display: none
+
 // mathjax
 .mathjax-overflow
  overflow-x: auto
--- a/source/css/_mode/darkmode.styl
+++ b/source/css/_mode/darkmode.styl
@@ -26,7 +26,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
    --blockquote-color: alpha(#FFFFFF, .7)
    --blockquote-bg: lighten(#121212, 10)
    --reward-pop: lighten(#121212, 10)
-    --sidebar-icon-color: alpha(#FFFFFF, .7)
+    --toc-link-color: alpha(#FFFFFF, .6)

    #web_bg:before,
    #footer:before,
@@ -48,6 +48,9 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
        code
          background: $code-background

+      .aplayer
+        filter: brightness(.8)
+
    // 頭部
    #page-header
      & > #nav.fixed,
@@ -65,7 +68,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
      figure.highlight
        box-shadow: none

-        if hexo-config('rootConfig.highlight') && hexo-config('rootConfig.highlight.enable')
+        if hexo-config('highlight_settings') && hexo-config('highlight_settings.enable')
          table::-webkit-scrollbar-thumb
            background: lighten(#121212, 5)

@@ -83,11 +86,11 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
          color: #90a4ae !important

    #post-comment
-      .comment-switch
+      #comment-switch
        if hexo-config('comments.text')
          background: #2c2c2c !important

-        label
+        .switch-btn
          filter: brightness(.8)

    // note
@@ -104,7 +107,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
    #article-container iframe,
    img,
    .gist,
-    .aplayer
+    .ads-wrap
      filter: brightness(.8)

    #aside_content .aside-list > .aside-list-item:not(:last-child)
--- a/source/css/_mode/readmode.styl
+++ b/source/css/_mode/readmode.styl
@@ -1,29 +1,31 @@
 if hexo-config('readmode')
-  [data-theme='light']
-    .read-mode
-      --font-color: #4c4948
-      --readmode-light-color: #fff
-      --white: #4c4948
-      --light-grey: #4c4948
-      --gray: #d6dbdf
-      --hr-border: #d6dbdf
-      --hr-before-color: darken(#d6dbdf, 10)
-      -highlight-bg: #f7f7f7
+  .read-mode
+    --font-color: #4c4948
+    --readmode-light-color: #fff
+    --white: #4c4948
+    --light-grey: #4c4948
+    --gray: #d6dbdf
+    --hr-border: #d6dbdf
+    --hr-before-color: darken(#d6dbdf, 10)
+    -highlight-bg: #f7f7f7

  [data-theme='dark']
    .read-mode
-      --font-color: rgba(255, 255, 255, .6)
+      --font-color: rgba(255, 255, 255, .7)
      --readmode-light-color: #0d0d0d
-      --white: rgba(255, 255, 255, .8)
-      --light-grey: rgba(255, 255, 255, .6)
-      --gray: rgba(255, 255, 255, .6)
-      --hr-border: rgba(255, 255, 255, .3)
-      --hr-before-color: rgba(255, 255, 255, .6)
+      --white: rgba(255, 255, 255, .9)
+      --light-grey: rgba(255, 255, 255, .7)
+      --gray: rgba(255, 255, 255, .7)
+      --hr-border: rgba(255, 255, 255, .5)
+      --hr-before-color: rgba(255, 255, 255, .7)
      -highlight-bg: #171717

  .read-mode
    background: var(--readmode-light-color)

+    #aside_content
+      display: none
+
    #body-wrap
      padding-left: 0 !important

@@ -38,23 +40,21 @@ if hexo-config('readmode')
        padding: 0
        text-align: center

-    .layout_post
-      > #post
-        background: transparent
-        box-shadow: none
+    #post
+      margin: 0 auto
+      background: transparent
+      box-shadow: none

-        &:hover
-          box-shadow: none
+      &:hover
+        box-shadow: none

    & > canvas
      display: none !important

    .highlight-tools,
    #footer,
-    #post > *:not(:first-child),
+    #post > *:not(#post-info):not(.post-content),
    #to_comment,
-    #sidebar,
-    #toggle-sidebar,
    #mobile-toc-button,
    #nav,
    .post-outdate-notice,
@@ -179,6 +179,7 @@ if hexo-config('readmode')

      .note
        border: 2px solid var(--gray)
+        border-left-color: var(--gray) !important
        filter: none
-        background-color: var(--readmode-light-color)
+        background-color: var(--readmode-light-color) !important
        color: var(--font-color)
--- a/source/css/_page/common.styl
+++ b/source/css/_page/common.styl
@@ -1,4 +1,4 @@
-.layout_page
+.layout
  display: flex
  margin: 0 auto
  padding: 2rem 15px
@@ -10,41 +10,43 @@
  +maxWidth768()
    padding: 1rem 5px !important

+  +minWidth2000()
+    max-width: 1500px
+
  & > div:first-child:not(.recent-posts)
+    align-self: flex-start
+    padding: 50px 40px
+    border-radius: 8px
+    background: var(--card-bg)
+    box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
+
+    &:hover
+      box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
+
    +maxWidth768()
      padding: 1.8rem .7rem !important

  & > div:first-child
    width: 75%
+    transition: all .3s

    +maxWidth900()
      width: 100% !important

+    if hexo-config('aside.position') == 'left'
+      +minWidth900()
+        order: 2
+
  // 隱藏aside
  &.hide-aside
    max-width: 1000px

+    +minWidth2000()
+      max-width: 1300px
+
    & > div
      width: 100% !important

-.layout_post > #post,
-.layout_page > div:first-child:not(.recent-posts)
-  align-self: flex-start
-  padding: 50px 40px
-  border-radius: 8px
-  background: var(--card-bg)
-  box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
-  transition: all .3s
-
-  &:hover
-    box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
-
-if hexo-config('aside.position') == 'left'
-  +minWidth900()
-    .layout_page
-      & > div:first-child
-        order: 2
-
 #page
  h1.page-title
    margin-top: .4rem
--- a/source/css/_page/homepage.styl
+++ b/source/css/_page/homepage.styl
@@ -43,6 +43,10 @@
        order: 2
        border-radius: 0 8px 8px 0

+    &.ads-wrap
+      display: block !important
+      height: auto !important
+
    .post_cover
      overflow: hidden
      width: 45%
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jerry	4a69c623fc	fix: 修復開啟gitalk評論數後與toc衝突的bug close #462 fix: 修復jquery在一些介面仍然載入問題 fix: 修復medium zoom 報錯的 bug	2020-12-27 15:51:00 +08:00
Jerry	eb823b0a2d	Merge branch 'dev' into master	2020-12-15 18:54:32 +08:00
Jerry	83299dfd2f	fix: 修復tabs 標簽外挂設爲-1時，按鈕點擊沒反應的bugs	2020-12-15 18:52:58 +08:00
Jerry	8f412c90da	Merge branch 'dev' into master	2020-12-13 17:02:32 +08:00
Jerry	d82f69e83b	label: 3.4.0 發佈 improvement: js優化	2020-12-13 17:00:34 +08:00
Jerry	6fda7ef004	feat: 當設置aside mobile為false時，toc仍然能顯示 fix: 修復resize 時，toc 的位置問題 fix: 修復當aside mobile設為false時，文章頁 js報錯的bugs close #444	2020-12-11 15:45:32 +08:00
Jerry	ecca2621c2	feat: twikoo 最新評論更新，增加QQ頭像顯示 fix: 修復關閉圖片嬾加載，最新評論圖片無法加載的bugs fix: 修復某些情況下toc無法滾動的bugs close #442 fix: 修復pjax下，開啟anchor後，文章頁跳轉到其他頁面會出現網址加上toc最後一節錨點ID的bugs #442	2020-12-10 21:47:47 +08:00
Jerry	9536df735c	fix: 當主頁設置不顯示頂部圖時,js報錯的bug	2020-12-09 22:54:18 +08:00
Jerry	8227acb1b7	Merge branch 'dev' of https://github.com/jerryc127/hexo-theme-butterfly into dev	2020-12-09 16:01:48 +08:00
Jerry	3a1ed95c32	feat: 右下角增加字體調整按鈕 fix: 修復沒有滾動條時，右下角按鈕顯示問題 close #439 remove: 刪除ICP配置，如需要，請使用custom_text配置 close #435	2020-12-09 15:58:58 +08:00
Jerry Wong	dc1c7c5efd	Merge pull request #437 from Dreamy-TZK/dev 修改twikoo评论无法正常显示的问题	2020-12-07 21:17:09 +08:00
零度冷咖啡	97fe932ad9	🐛 修复无法获取twikoo评论标签元素ID的bug	2020-12-07 08:25:02 +08:00
零度冷咖啡	01e7929c02	Merge pull request #1 from jerryc127/dev 更新最新版	2020-12-07 08:22:17 +08:00
Jerry	02af3077e7	feat: 增加twikoo 最新評論 close #433 feat: 增加twikoo評論數顯示 feat: 增加toc簡潔模式 feat: 最新評論頭像增加lazyload feat: fontawesome和google字體增加異步加載 fix: 修復上個版本導致的圖庫報沒有jQuery的bugs fix: 修復上個版本導致aside 分類展開/收縮按鈕的bugs improvement: toc點擊時改用document.getElementById獲取參數，避免有些字符導致無法跳轉 close #426 improvement: icp圖片限制大小 close #434 improvement: 最新評論優化，當沒有評論時顯示 '沒有評論' improvement: 若瀏覽器支持,scroll將採用原生瀏覽器支持的滾動方法 improvement: 當屏幕沒有滾動條時，rightside會直接顯示	2020-12-05 22:28:54 +08:00
Jerry	88b1cc553c	feat: 去除 jQuery (fancybox和圖庫仍需要加載jQuery) feat: 點擊文字特效增加隨機配置 feat: 可配置是否添加css前綴 fix: 修復子目錄下，配置justifiedGallery CDN（相對鏈接）後，連接會無法訪問的bugs fix: 修復 pangu 配置post 後，仍在全站生效的bugs improvement: 夜間模式下，廣告降低亮度 improvement: 手機端toc邊距微調 improvement: html格式優化 improvement: 搜索優化 improvement: 刪除不必要的語言文件	2020-11-21 00:27:01 +08:00
Jerry	6a1330de84	Merge branch 'dev' into master	2020-11-03 22:21:43 +08:00
Jerry	7f03c3f716	update: 更改文檔地址	2020-11-03 22:20:16 +08:00
Jerry	eb5a356a4e	Merge branch 'dev' into master	2020-10-28 14:37:18 +08:00
Jerry	b230c8f2bd	label: 3.3.0 發佈	2020-10-28 14:36:03 +08:00
Jerry	d2f5af32ae	feat: 增加Twikoo評論 #402 improvement: 滾動到評論按鈕只要用評論的頁面就出現 improvement: aside狀態存localstore fix: 修復disqusjs沒有設置api時，沒有反代的bugs fix: 修復aside在font-matter aside為false時，收縮按鈕依舊出現和點擊按鈕會出現空白的bugs #398	2020-10-27 22:14:47 +08:00
Jerry	6b35388f33	feat: aside 可配置隐藏/增加按钮可展开或收缩aside	2020-10-21 21:54:14 +08:00
Jerry	c54f23bc14	fix: 修復上個版本導致的代碼塊部分css沒有生成的bugs fix: 修復valine背景圖片再次出現時，由左到右移動的bugs improvement: 調大sidebar的寬度 improvement: html結構調整，mobile-sidebar改為sidebar/search調整 remove: 刪除多餘的css和pug	2020-10-20 21:05:58 +08:00
Jerry Wong	71b15d86c1	Merge pull request #393 from wayne0926/dev SEO优化格式修复	2020-10-17 17:44:06 +08:00
时过境迁Wayne	918a1da4c5	格式	2020-10-17 17:41:25 +08:00
时过境迁Wayne	b541a192d3	SEO优化格式修复	2020-10-17 13:01:13 +08:00
时过境迁Wayne	f7ba0a4b36	SEO优化	2020-10-16 20:50:46 +08:00
Jerry	666637ce99	fix: 退回之前的inject實現,解決上一個版本導致無法插入inject的bugs close #390	2020-10-15 14:39:51 +08:00
Jerry	8014ddb65e	feat: 不再支持 butterfly.yml 寫法 improvement: 文章頁標題改為h1(seo) improvement: 改用hexo 內置的 injector 插入 inject 的代碼 improvement: canonical 改為hexo提供的函數生成 improvement: 優化手機toc 的特效和按鈕出現的時機 remove: 刪除搜索不必要的配置 remove: 移除豆瓣配置,如需配置，請使用 hexo-butterfly-douban fix: 修復上一個版本導致的搜索按鈕在pjax下無法點擊的bugs close #387 fix: 修復上一個版本更新的toc z-index 過低的bugs	2020-10-15 00:14:38 +08:00
Jerry	83b7232841	feat: 只支持 hexo 5.0.0 及以上版本 feat: toc改為aside顯示,去掉sidebar feat: 手機toc ui 修改 feat: 去掉 toc auto_open 配置 feat: 文章標題改為居中 improvement: 完善note標籤在readmode上的顯示 improvement: 精簡css 和 js improvement： pjax 優化 fix: 修復當文章頁top_img設為false時，閲讀模式下文章內容不顯示的bugs	2020-10-11 18:25:58 +08:00
Jerry	b078ebef14	fix: 修復網站壓縮後，mermaid 會無法生成顯示的Bugs feat： Valine 增加 option 設置	2020-10-07 15:36:52 +08:00
Jerry	f4b07340f7	label: 3.2.0	2020-09-28 22:02:11 +08:00
Jerry Wong	17d8062968	Merge pull request #360 from jerryc127/revert-358-customized-chang Revert "Add a flag for allowing to disable aside.card_author.button"	2020-09-12 02:41:46 +08:00
Jerry Wong	d4b69051aa	Revert "Add a flag for allowing to disable aside.card_author.button"	2020-09-12 02:41:12 +08:00
Jerry Wong	59f6ce63e3	Merge pull request #358 from gcmiao/customized-chang Add a flag for allowing to disable aside.card_author.button	2020-09-11 19:02:33 +08:00
gcmiao	cd78f639dd	Add a flag for allowing to disable aside.card_author.button	2020-09-10 21:09:23 +02:00
Jerry	8e4c20f6d4	label: 更新 3.1.1 chore: update hexo-renderer-stylus to 2.0.1	2020-09-06 22:13:37 +08:00
Jerry	e984efa35c	fix: 修復開啟 prismjs 後，在低版本的 safari 會出現 js 報錯的 Bugs	2020-09-06 22:11:59 +08:00
Jerry	863cf1e780	Merge branch 'dev' into master	2020-09-04 00:42:50 +08:00
Jerry	85b8a83371	Merge branch 'dev' into master	2020-08-31 13:41:47 +08:00
Jerry	d73960f2a2	Merge branch 'dev' into master	2020-08-11 21:20:01 +08:00
Jerry	fcd430902d	Merge branch 'dev' into master	2020-08-05 22:04:47 +08:00
Jerry	ee45f6517f	Merge branch 'dev' into master	2020-08-02 23:31:32 +08:00
Jerry	67201ac58d	📝 更改注釋文字	2020-08-01 22:47:34 +08:00
Jerry	315d3b50df	Merge branch 'dev' into master	2020-08-01 14:44:06 +08:00
Jerry	727a2d97d9	🐛 修復子目錄下，404頁面的‘回到首頁’鏈接錯誤的bugs	2020-07-18 23:30:37 +08:00
Jerry	54b67987c1	Merge branch 'dev'	2020-06-24 00:52:33 +08:00
Jerry	26df41c772	Merge branch 'dev'	2020-06-20 22:10:55 +08:00
Jerry	4e7051ad77	Merge branch 'dev'	2020-06-20 14:01:45 +08:00
Jerry	955b4bae6a	Merge branch 'dev'	2020-06-18 20:13:59 +08:00
Jerry	95ddf28f3b	Merge branch 'dev'	2020-06-16 21:19:47 +08:00
Jerry	e901f9ad35	Merge branch 'dev'	2020-06-16 18:43:13 +08:00
Jerry	462422e279	Merge branch 'dev'	2020-05-21 16:29:44 +08:00
Jerry	bad24849bd	Merge branch 'dev'	2020-05-01 19:00:12 +08:00
Jerry	eb242f0809	Merge branch 'dev'	2020-04-30 00:36:07 +08:00
Jerry	b1795e3def	Merge branch 'dev'	2020-04-28 15:35:58 +08:00
Jerry	54b212ead3	Merge branch 'dev'	2020-04-27 14:45:26 +08:00
Jerry	4bbc035f54	Merge branch 'dev'	2020-04-27 02:40:24 +08:00
Jerry	40ba3bb92f	🏷️ 更新2.3.0	2020-04-26 23:42:52 +08:00
Jerry	e2cb0242bb	🏷️ 2.3.0發佈	2020-04-26 23:37:37 +08:00
Jerry	559afab632	🔖 2.2.5發佈更新内容請看 https://github.com/jerryc127/hexo-theme-butterfly/releases	2020-03-28 03:20:36 +08:00
Jerry	c134d4fc86	🐛 fix: 修復highlight_shrink設為false時,導致script報錯的bug 🐛 fix: 修復highlight_shrink設為true時,按鈕點擊無反應,沒有打開代碼框的bug 🐛 fix: 修復自動切換darkmode時，切換按鈕icon沒有變更的bug	2020-03-24 19:03:51 +08:00