fix: 修復 github-issues 最新評論 獲取的url格式 bug

fix: 當標題有符號'時，disqus 和 disqusjs 無法加載的 bug

.github/workflows/publish.yml

@@ -0,0 +1,19 @@
+name: npm publish
+
+on:
+  release:
+    types: [created]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    # Setup .npmrc file to publish to npm
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '12.x'
+        registry-url: 'https://registry.npmjs.org'
+    - run: npm install
+    - run: npm publish
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

README.md

@@ -1,12 +1,18 @@
+<div align="right">
+  Language:
+  🇺🇸
+  <a title="Chinese" href="/README_CN.md">🇨🇳</a>
+</div>
+
 # hexo-theme-butterfly
 
-![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly)
+![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
+![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-4.2+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
-![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [JerryC](https://jerryc.me/)
+Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [MYW](https://immyw.com/)
 
 Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
@@ -71,7 +77,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/Twikoo）
+- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/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)

README_CN.md

@@ -1,13 +1,18 @@
+<div align="right">
+  語言:
+  中文
+  <a title="English" href="/README.md">英文</a>
+</div>
+
 # hexo-theme-butterfly
 
-![version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly)
+![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
+![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-4.2+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
-![npm download](https://img.shields.io/npm/dw/hexo-theme-butterfly?color=green)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-
+預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [MYW](https://immyw.com/)
-預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [JerryC](https://jerryc.me/)
 
 文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 
@@ -71,7 +76,7 @@ theme: butterfly
 - [x] 顯示相關文章
 - [x] 過期文章提醒
 - [x] 多種分享系統（AddThis/Sharejs/Addtoany）
-- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments/Twikoo）
+- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo）
 - [x] 支持雙評論部署
 - [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
 - [x] 多種分析系統（百度分析/谷歌分析/騰訊分析/CNZZ分析）

_config.yml

@@ -12,8 +12,8 @@ menu:
   # Tags: /tags/ || fas fa-tags
   # Categories: /categories/ || fas fa-folder-open
   # List||fas fa-list:
-  #   - Music || /music/ || fas fa-music
+  #   Music: /music/ || fas fa-music
-  #   - Movie || /movies/ || fas fa-video
+  #   Movie: /movies/ || fas fa-video
   # Link: /link/ || fas fa-link
   # About: /about/ || fas fa-heart
 
@@ -27,6 +27,7 @@ highlight_theme: light #  darker / pale night / light / ocean / mac / mac light
 highlight_copy: true # copy button
 highlight_lang: true # show the code language
 highlight_shrink: false # true: shrink the code blocks / false: expand the code blocks | none: expand code blocks and hide the button
+highlight_height_limit: false # unit: px
 code_word_wrap: false
 
 # copy settings
@@ -83,9 +84,12 @@ favicon: /img/favicon.png
 
 # Avatar (頭像)
 avatar:
-  img:
+  img: https://i.loli.net/2021/02/24/5O1day2nriDzjSu.png
   effect: false
 
+# Disable all banner image
+disable_top_img: false
+
 # The banner image of home page
 index_img:
 
@@ -192,6 +196,14 @@ reward:
     #   link:
     #   text: alipay
 
+# Post edit
+# Easily browse and edit blog source code online.
+post_edit:
+  enable: false
+  # url: https://github.com/user-name/repo-name/edit/branch-name/subdirectory-name/
+  # For example: https://github.com/jerryc127/butterfly.js.org/edit/main/source/
+  url:
+
 # Related Articles
 related_post:
   enable: true
@@ -201,6 +213,13 @@ related_post:
 # figcaption (圖片描述文字)
 photofigcaption: false
 
+# post_pagination (分頁)
+# value: 1 || 2 || false
+# 1: The 'next post' will link to old post
+# 2: The 'next post' will link to new post
+# false: disable pagination
+post_pagination: 1
+
 # anchor
 # when you scroll in post, the URL will update according to header id.
 anchor: false
@@ -240,7 +259,7 @@ addtoany:
 
 comments:
   # Up to two comments system, the first will be shown as default
-  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments/Twikoo
+  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo
   use:
   # - Valine
   # - Disqus
@@ -248,7 +267,8 @@ comments:
   # lazyload: The comment system will be load when comment element enters the browser's viewport.
   # If you set it to true, the comment count will be invalid
   lazyload: false
-  count: false # Display comment count in top_img
+  count: false # Display comment count in post's top_img
+  card_post_count: false # Display comment count in Home Page
 
 # disqus
 # https://disqus.com/
@@ -285,6 +305,7 @@ gitalk:
   distractionFreeMode: false # Facebook-like distraction free mode.
   pagerDirection: last # Comment sorting direction, available values are last and first.
   createIssueManually: false # Gitalk will create a corresponding github issue for your every single page automatically
+  option:
 
 # valine
 # https://valine.js.org
@@ -302,6 +323,17 @@ 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)
+  visitor: false
+  option:
+
+# waline - A simple comment system with backend support fork from Valine
+# https://waline.js.org/
+waline:
+  serverURL: # Waline server address url
+  avatar: monsterid # gravatar style https://zh-tw.gravatar.com/site/implement/images/#default-image
+  emojiCDN: # emoji CDN
+  bg: # waline background
+  visitor: false
   option:
 
 # utterances
@@ -326,6 +358,10 @@ facebook_comments:
 # Twikoo
 # https://github.com/imaegoo/twikoo
 twikoo:
+  envId:
+  region:
+  visitor: false
+  option:
 
 # Chat Services
 # --------------------------------------
@@ -395,6 +431,14 @@ tencent_analytics:
 # https://www.umeng.com/
 cnzz_analytics:
 
+# Cloudflare Analytics
+# https://www.cloudflare.com/zh-tw/web-analytics/
+cloudflare_analytics:
+
+# Microsoft Clarity
+# https://clarity.microsoft.com/
+microsoft_clarity:
+
 # Advertisement
 # --------------------------------------
 
@@ -581,10 +625,10 @@ subtitle:
   loop: true
   # source調用第三方服務
   # source: false 關閉調用
-  # source: 1  調用搏天api的隨機語錄（簡體） https://api.btstu.cn/
+  # source: 1  調用搏天api的隨機語錄（簡體）
-  # source: 2  調用一言網的一句話（簡體） https://hitokoto.cn/
+  # source: 2  調用一言網的一句話（簡體）
-  # source: 3  調用一句網（簡體） http://yijuzhan.com/
+  # source: 3  調用一句網（簡體）
-  # source: 4  調用今日詩詞（簡體） https://www.jinrishici.com/
+  # source: 4  調用今日詩詞（簡體）
   # subtitle 會先顯示 source , 再顯示 sub 的內容
   source: false
   # 如果有英文逗號' , ',請使用轉義字元 ,
@@ -609,6 +653,7 @@ aside:
     enable: true
     description:
     button:
+      enable: true
       icon: fab fa-github
       text: Follow Me
       link: https://github.com/xxxxxx
@@ -619,24 +664,29 @@ aside:
     enable: true
     limit: 5 # if set 0 will show all
     sort: date # date or updated
+    sort_order: # Don't modify the setting unless you know how it works
   card_categories:
     enable: true
     limit: 8 # if set 0 will show all
     expand: none # none/true/false
+    sort_order: # Don't modify the setting unless you know how it works
   card_tags:
     enable: true
     limit: 40 # if set 0 will show all
     color: false
+    sort_order: # Don't modify the setting unless you know how it works
   card_archives:
     enable: true
     type: monthly # yearly or monthly
     format: MMMM YYYY # eg: YYYY年MM月
     order: -1 # Sort of order. 1, asc for ascending; -1, desc for descending
     limit: 8 # if set 0 will show all
+    sort_order: # Don't modify the setting unless you know how it works
   card_webinfo:
     enable: true
     post_count: true
     last_push_date: true
+    sort_order: # Don't modify the setting unless you know how it works
 
 # busuanzi count for PV / UV in site
 # 訪問人數
@@ -654,14 +704,12 @@ runtimeshow:
 # Aside widget - Newest Comments
 newest_comments:
   enable: false
+  sort_order: # Don't modify the setting unless you know how it works
   limit: 6
+  storage: 10 # unit: mins, save data to localStorage
   avatar: true
-  leancloud:
+  # You can only choose one, or neither
-    enable: false
+  valine: false
-    appId: # leancloud application app id
-    appKey: # leancloud application app key
-    serverURL: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in)
-    default_avatar: # mp/identicon/monsterid/wavatar/retro/robohash/blank
   github_issues:
     enable: false
     repo:
@@ -670,6 +718,7 @@ newest_comments:
     forum:
     api_key:
   twikoo: false
+  waline: false
 
 # Bottom right button (右下角按鈕)
 # --------------------------------------
@@ -744,14 +793,7 @@ note:
 # other
 # --------------------------------------
 
-# Artitalk
+# Pjax
-# see https://artitalk.js.org/
-artitalk:
-  appId:
-  appKey:
-  option:
-
-# Pjax [Beta]
 # It may contain bugs and unstable, give feedback when you find the bugs.
 # https://github.com/MoOx/pjax
 pjax:
@@ -775,9 +817,6 @@ snackbar:
   bg_light: '#49b1f5' # The background color of Toast Notification in light mode
   bg_dark: '#121212' # The background color of Toast Notification in dark mode
 
-# Baidu Push (百度推送)
-baidu_push: false
-
 # https://instant.page/
 # prefetch (預加載)
 instantpage: false
@@ -799,22 +838,16 @@ lazyload:
 # ---------------
 # pwa:
 #   enable: false
-#   manifest: /image/pwa/manifest.json
+#   manifest: /pwa/manifest.json
-#   apple_touch_icon: /image/pwa/apple-touch-icon.png
+#   apple_touch_icon: /pwa/apple-touch-icon.png
-#   favicon_32_32: /image/pwa/32.png
+#   favicon_32_32: /pwa/32.png
-#   favicon_16_16: /image/pwa/16.png
+#   favicon_16_16: /pwa/16.png
-#   mask_icon: /image/pwa/safari-pinned-tab.svg
+#   mask_icon: /pwa/safari-pinned-tab.svg
-
-# Disable Baidu transformation on mobile devices (禁止百度轉碼)
-disable_baidu_transformation: true
 
 # Open graph meta tags
 # https://developers.facebook.com/docs/sharing/webmasters/
 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
 
@@ -848,6 +881,7 @@ CDN:
   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
+  waline: https://cdn.jsdelivr.net/npm/@waline/client/dist/Waline.min.js
 
   # share
   addtoany: https://static.addtoany.com/menu/page.js
@@ -863,8 +897,8 @@ CDN:
   # math
   mathjax: https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
   katex: https://cdn.jsdelivr.net/npm/katex@latest/dist/katex.min.css
-  katex_copytex: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.js
+  katex_copytex: https://cdn.jsdelivr.net/npm/katex@latest/dist/contrib/copy-tex.min.js
-  katex_copytex_css: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.css
+  katex_copytex_css: https://cdn.jsdelivr.net/npm/katex@latest/dist/contrib/copy-tex.css
   mermaid: https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js
 
   # count
@@ -914,5 +948,3 @@ CDN:
   prismjs_js: https://cdn.jsdelivr.net/npm/prismjs/prism.min.js
   prismjs_lineNumber_js: https://cdn.jsdelivr.net/npm/prismjs/plugins/line-numbers/prism-line-numbers.min.js
   prismjs_autoloader: https://cdn.jsdelivr.net/npm/prismjs/plugins/autoloader/prism-autoloader.min.js
-
-  artitalk: https://cdn.jsdelivr.net/npm/artitalk

languages/default.yml

@@ -13,6 +13,8 @@ page:
   category: Category
   archives: Archives
 
+card_post_count: comments
+
 sticky: Sticky
 no_title: No title
 
@@ -30,6 +32,7 @@ post:
     copyright_notice: Copyright Notice
     copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
   recommend: Related Articles
+  edit: Edited on
 
 search: Search
 algolia_search:
@@ -74,6 +77,9 @@ aside:
     loading_text: loading...
     error: Unable to get the data, please make sure the settings are correct.
     zero: No Comment
+    image: image
+    link: link
+    code: code
   card_toc: Catalog
 
 date_suffix:

languages/en.yml

@@ -13,6 +13,8 @@ page:
   category: Category
   archives: Archives
 
+card_post_count: comments
+
 sticky: Sticky
 no_title: No title
 
@@ -30,6 +32,7 @@ post:
     copyright_notice: Copyright Notice
     copyright_content: 'All articles in this blog are licensed under <a href="%s">%s</a> unless stating additionally.'
   recommend: Related Articles
+  edit: Edited on
 
 search: Search
 algolia_search:
@@ -74,6 +77,9 @@ aside:
     loading_text: loading...
     error: Unable to get the data, please make sure the settings are correct.
     zero: No Comment
+    image: image
+    link: link
+    code: code
   card_toc: Catalog
 
 date_suffix:

languages/zh-CN.yml

@@ -13,6 +13,8 @@ page:
   category: 分类
   archives: 归档
 
+card_post_count: 条评论
+
 sticky: 置顶
 no_title: 无题
 
@@ -31,6 +33,7 @@ post:
     copyright_content: '本博客所有文章除特别声明外，均采用
       <a href="%s" target="_blank">%s</a> 许可协议。转载请注明来自 <a href="%s" target="_blank">%s</a>！'
   recommend: 相关推荐
+  edit: 编辑
 
 search: 搜索
 algolia_search:
@@ -75,6 +78,9 @@ aside:
     loading_text: 正在加载中...
     error: 无法获取评论，请确认相关配置是否正确
     zero: 没有评论
+    image: 图片
+    link: 链接
+    code: 代码
   card_toc: 目录
 
 date_suffix:

languages/zh-TW.yml

@@ -13,6 +13,8 @@ page:
   category: 分類
   archives: 歸檔
 
+card_post_count: 條評論
+
 sticky: 置頂
 no_title: 無題
 
@@ -20,7 +22,7 @@ post:
   created: 發表於
   updated: 更新於
   wordcount: 字數總計
-  min2read: 閲讀時長
+  min2read: 閱讀時長
   min2read_unit: 分鐘
   page_pv: 閱讀量
   comments: 評論數
@@ -31,6 +33,7 @@ post:
     copyright_content: '本部落格所有文章除特別聲明外，均採用
       <a href="%s" target="_blank">%s</a> 許可協議。轉載請註明來自 <a href="%s" target="_blank">%s</a>！'
   recommend: 相關推薦
+  edit: 編輯
 
 search: 搜尋
 algolia_search:
@@ -72,9 +75,12 @@ aside:
   more_button: 檢視更多
   card_newest_comments:
     headline: 最新評論
-    loading_text: 正在加載中...
+    loading_text: 正在載入中...
     error: 無法獲取評論，請確認相關配置是否正確
     zero: 沒有評論
+    image: 圖片
+    link: 連結
+    code: 代碼
   card_toc: 目錄
 
 date_suffix:

layout/404.pug

@@ -1,5 +1,5 @@
 - var top_img = theme.error_404.background || theme.default_top_img
-- var bg_img = `background-image: url(${url_for(top_img)})`
+- var bg_img = `background-image: url('${url_for(top_img)}')`
 
 doctype html
 html(lang=config.language data-theme=theme.display_mode)
@@ -7,7 +7,7 @@ html(lang=config.language data-theme=theme.display_mode)
     include includes/head.pug
   body
     if theme.preloader
-      !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
+      !=partial('includes/loading/loading', {}, {cache: true})
 
     if theme.fireworks && theme.fireworks.enable
       canvas.fireworks

layout/includes/additional-js.pug

@@ -2,7 +2,7 @@ div
   script(src=url_for(theme.CDN.utils))
   script(src=url_for(theme.CDN.main))
 
-  if theme.translate && theme.translate.enable
+  if theme.translate.enable
     script(src=url_for(theme.CDN.translate))
 
   if theme.medium_zoom
@@ -14,11 +14,11 @@ div
   if theme.lazyload.enable
     script(src=url_for(theme.CDN.lazyload))
 
-  if (theme.snackbar && theme.snackbar.enable)
+  if theme.snackbar.enable
     script(src=url_for(theme.CDN.snackbar))
 
-  if theme.pangu && theme.pangu.enable
+  if theme.pangu.enable
-    !=partial('includes/third-party/pangu.pug', {}, {cache:theme.fragment_cache})
+    !=partial('includes/third-party/pangu.pug', {}, {cache: true})
 
   //- search
   if theme.algolia_search.enable
@@ -27,10 +27,13 @@ div
     script(src=url_for(theme.CDN.local_search))
 
   if theme.preloader
-    !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
+    !=partial('includes/loading/loading-js', {}, {cache: true})
 
   .js-pjax
-    if theme.subtitle.enable && is_home() && theme.index_img !== false
+    if needLoadCountJs
+      !=partial('includes/third-party/card-post-count/index', {}, {cache: true})
+    
+    if loadSubJs
       include ./third-party/subtitle.pug
 
     include ./third-party/math/index.pug
@@ -38,22 +41,19 @@ div
     if commentsJsLoad
       include ./third-party/comments/js.pug
 
-    if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+  !=partial('includes/third-party/prismjs', {}, {cache: true})
-      script(async src=url_for(theme.CDN.busuanzi))
-
-  !=partial('includes/third-party/prismjs', {}, {cache:theme.fragment_cache})
 
   if theme.aside.enable && theme.newest_comments.enable
     if theme.pjax.enable
-      !=partial('includes/third-party/newest-comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/newest-comments/index', {}, {cache: true})
     else if (!is_post() && page.aside !== false)
-      !=partial('includes/third-party/newest-comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/newest-comments/index', {}, {cache: true})
 
   !=fragment_cache('injectBottom', function(){return injectHtml(theme.inject.bottom)})
 
-  !=partial('includes/third-party/effect', {}, {cache:theme.fragment_cache})
+  !=partial('includes/third-party/effect', {}, {cache: true})
 
-  !=partial('includes/third-party/chat/index', {}, {cache:theme.fragment_cache})
+  !=partial('includes/third-party/chat/index', {}, {cache: true})
   
   if theme.aplayerInject && theme.aplayerInject.enable
     if theme.pjax.enable || theme.aplayerInject.per_page
@@ -62,7 +62,7 @@ div
       include ./third-party/aplayer.pug
 
   if theme.pjax.enable
-    !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache})
+    !=partial('includes/third-party/pjax', {}, {cache: true})
-  
-  !=partial('includes/third-party/baidu_push', {}, {cache:theme.fragment_cache})
     
+  if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+    script(async data-pjax src=url_for(theme.CDN.busuanzi))

layout/includes/head.pug

@@ -29,10 +29,6 @@ meta(name="copyright" content=pageCopyright)
 meta(name ="format-detection" content="telephone=no")
 meta(name="theme-color" content=themeColor)
 
-if theme.disable_baidu_transformation
-  meta(http-equiv="Cache-Control" content="no-transform")
-  meta(http-equiv="Cache-Control" content="no-siteapp")
-
 //- Open_Graph
 include ./head/Open_Graph.pug
 
@@ -40,14 +36,14 @@ include ./head/Open_Graph.pug
 link(rel="canonical" href=urlNoIndex())
 
 //- 預解析
-!=partial('includes/head/preconnect', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/preconnect', {}, {cache: true})
 
 //- 網站驗證
-!=partial('includes/head/site_verification', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/site_verification', {}, {cache: true})
 
 //- PWA
 if (theme.pwa && theme.pwa.enable)
-  !=partial('includes/head/pwa', {}, {cache:theme.fragment_cache})
+  !=partial('includes/head/pwa', {}, {cache: true})
 
 //- main css
 link(rel='stylesheet', href=url_for(theme.CDN.main_css))
@@ -61,21 +57,21 @@ if theme.algolia_search.enable
   script(src=url_for(theme.CDN.algolia_search) defer)
 
 //- google_adsense
-!=partial('includes/head/google_adsense', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/google_adsense', {}, {cache: true})
 
 //- analytics
-!=partial('includes/head/analytics', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/analytics', {}, {cache: true})
 
 //- font
 if theme.blog_title_font &&　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})
+!=partial('includes/head/config', {}, {cache: true})
 
 include ./head/config_site.pug
 include ./head/noscript.pug
 
-!=partial('includes/head/js', {}, {cache:theme.fragment_cache})
+!=fragment_cache('injectHeadJs', function(){return inject_head_js()})
 
 !=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})

layout/includes/head/Open_Graph.pug

@@ -1,6 +1,6 @@
 if theme.Open_Graph_meta
   - let contentType = is_post() ? 'article' : 'website'
-  - let metaImage = full_url_for(page.cover || theme.avatar.img)
+  - let metaImage = (page.cover || theme.avatar.img) ? full_url_for(page.cover || theme.avatar.img) : ''
   - let fb_appId = theme.facebook_comments.app_id || ''
   - let fb_admins = theme.facebook_comments.user_id || ''
 

layout/includes/head/analytics.pug

@@ -30,3 +30,14 @@ if theme.tencent_analytics
 
 if theme.cnzz_analytics
   script(async data-pjax src=`https://s4.cnzz.com/z_stat.php?id=${theme.cnzz_analytics}&web_id=${theme.cnzz_analytics}`)
+
+if theme.cloudflare_analytics
+  script(defer data-pjax src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon=`{"token": "${theme.cloudflare_analytics}"}`)
+
+if theme.microsoft_clarity
+  script.
+    (function(c,l,a,r,i,t,y){
+        c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
+        t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
+        y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
+    })(window, document, "clarity", "script", "!{theme.microsoft_clarity}");

layout/includes/head/config.pug

@@ -78,12 +78,13 @@
     highlight = JSON.stringify({
       plugin: config.highlight.enable ? 'highlighjs' : 'prismjs',
       highlightCopy: theme.highlight_copy,
-      highlightLang: theme.highlight_lang
+      highlightLang: theme.highlight_lang,
+      highlightHeightLimit: theme.highlight_height_limit
     })
   }
 
 script.
-  var GLOBAL_CONFIG = { 
+  const GLOBAL_CONFIG = { 
     root: '!{config.root}',
     algolia: !{algolia},
     localSearch: !{localSearch},
@@ -124,47 +125,4 @@ script.
     isPhotoFigcaption: !{theme.photofigcaption},
     islazyload: !{theme.lazyload.enable},
     isanchor: !{theme.anchor}
-  };
-
-  var saveToLocal = {
-    set: function setWithExpiry(key, value, ttl) {
-      const now = new Date()
-      const expiryDay = ttl * 86400000
-      const item = {
-        value: value,
-        expiry: now.getTime() + expiryDay,
-      }
-      localStorage.setItem(key, JSON.stringify(item))
-    },
-
-    get: function getWithExpiry(key) {
-      const itemStr = localStorage.getItem(key)
-
-      if (!itemStr) {
-        return undefined
-      }
-      const item = JSON.parse(itemStr)
-      const now = new Date()
-
-      if (now.getTime() > item.expiry) {
-        localStorage.removeItem(key)
-        return undefined
-      }
-      return item.value
-    }
   }
-
-  // https://stackoverflow.com/questions/16839698/jquery-getscript-alternative-in-native-javascript
-  const getScript = url => new Promise((resolve, reject) => {
-    const script = document.createElement('script')
-    script.src = url
-    script.async = true
-    script.onerror = reject
-    script.onload = script.onreadystatechange = function() {
-      const loadState = this.readyState
-      if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-      script.onload = script.onreadystatechange = null
-      resolve()
-    }
-    document.head.appendChild(script)
-  })

layout/includes/head/config_site.pug

@@ -8,7 +8,7 @@
   var showToc = is_post() && theme.aside.enable && pageToc && (toc(page.content) !== '' || page.encrypt == true )
 -
 
-script#config_change
+script#config-diff
   .
     var GLOBAL_CONFIG_SITE = { 
       isPost: !{is_post()},

layout/includes/head/js.pug

@@ -1,71 +0,0 @@
-script
-  | (function () {
-    
-  if theme.darkmode.enable
-    |   window.activateDarkMode = function () {
-    |     document.documentElement.setAttribute('data-theme', 'dark')
-    |     if (document.querySelector('meta[name="theme-color"]') !== null) {
-    |       document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
-    |     }
-    |   }
-    |   window.activateLightMode = function () {
-    |     document.documentElement.setAttribute('data-theme', 'light')
-    |    if (document.querySelector('meta[name="theme-color"]') !== null) {
-    |       document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
-    |     }
-    |   }
-
-    |   const autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-    |   const t = saveToLocal.get('theme')
-    |   if (autoChangeMode === '1') {
-    |     const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-    |     const isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
-    |     const isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
-    |     const hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-
-    |     if (t === undefined) {
-    |       if (isLightMode) activateLightMode()
-    |       else if (isDarkMode) activateDarkMode()
-    |       else if (isNotSpecified || hasNoSupport) {
-    |         const now = new Date()
-    |         const hour = now.getHours()
-    |         const isNight = hour <= 6 || hour >= 18
-    |         isNight ? activateDarkMode() : activateLightMode()
-    |       }
-    |       window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
-    |         if (saveToLocal.get('theme') === undefined) {
-    |           e.matches ? activateDarkMode() : activateLightMode()
-    |         }
-    |       })
-    |     } else if (t === 'light') activateLightMode()
-    |     else activateDarkMode()
-    |   } else if (autoChangeMode === '2') {
-    |     const now = new Date()
-    |     const hour = now.getHours()
-    |     const isNight = hour <= 6 || hour >= 18
-    |     if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
-    |     else if (t === 'light') activateLightMode()
-    |     else activateDarkMode()
-    |   } else {
-    |     if (t === 'dark') activateDarkMode()
-    |     else if (t === 'light') activateLightMode()
-    |   }
-
-  if theme.aside.enable && theme.aside.button
-    | const asideStatus = saveToLocal.get('aside-status')
-    | if (asideStatus !== undefined) {
-    |    if (asideStatus === 'hide') {
-    |      document.documentElement.classList.add('hide-aside')
-    |    } else {
-    |      document.documentElement.classList.remove('hide-aside')
-    |    }
-    | }
-  
-  if theme.change_font_size
-    | const fontSizeVal = saveToLocal.get('global-font-size')
-    | if (fontSizeVal !== undefined) {
-    |   document.documentElement.style.setProperty('--global-font-size', fontSizeVal + 'px')
-    | }
-
-  | })()
-

layout/includes/head/preconnect.pug

@@ -12,11 +12,14 @@ if theme.tencent_analytics
 if theme.cnzz_analytics
   link(rel="preconnect" href="//s4.cnzz.com")
 
+if theme.cloudflare_analytics
+  link(rel="preconnect" href="//static.cloudflareinsights.com")
+
+if theme.microsoft_clarity
+  link(rel="preconnect" href="//www.clarity.ms")
+
 if theme.blog_title_font && theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
   link(rel="preconnect" href="//fonts.googleapis.com" crossorigin='')
 
 if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
   link(rel="preconnect" href="//busuanzi.ibruce.info")
-
-if theme.baidu_push
-  link(rel="preconnect" href="//zz.bdstatic.com")

layout/includes/header/index.pug

@@ -1,6 +1,6 @@
-if page.top_img !== false
+if !theme.disable_top_img && page.top_img !== false
   if is_post()
-    - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
+    - var top_img = page.top_img || page.cover || page.randomcover
   else if is_page()
     - var top_img = page.top_img || theme.default_top_img
   else if is_tag()
@@ -17,27 +17,29 @@ if page.top_img !== false
     - var top_img = page.top_img || theme.default_top_img
 
   if top_img !== false
-    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url(${url_for(top_img)})` : `background: ${top_img}`
+    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
     - var bg_img = top_img ? imgSource : ''
     - var site_title = is_archive() ? _p('page.archives') : page.title || page.tag || page.category || config.title
-    - var isHomeClass = is_home() ? 'full_page' : 'not-index-bg'
+    - var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
     - is_post() ? isHomeClass = 'post-bg' : isHomeClass
   else
-    - var isHomeClass = 'no-top-img'
+    - var isHomeClass = 'not-top-img'
 else
   - var top_img = false
-  - var isHomeClass = 'no-top-img'
+  - var isHomeClass = 'not-top-img'
 
 header#page-header(class=isHomeClass style=bg_img)
-  !=partial('includes/header/nav', {}, {cache:theme.fragment_cache})
+  !=partial('includes/header/nav', {}, {cache: true})
   if top_img !== false
     if is_post()
       include ./post-info.pug
     else if is_home() 
       #site-info
         h1#site-title=site_title
-        #site-subtitle
+        if theme.subtitle.enable
-          span#subtitle
+          - var loadSubJs = true
+          #site-subtitle
+            span#subtitle
         if(theme.social)
           #site_social_icons
             !=fragment_cache('social', function(){return partial('includes/header/social')})

layout/includes/header/menu_item.pug

@@ -4,7 +4,7 @@ if theme.menu
 
   .menus_items
     each value, label in theme.menu
-      if !Array.isArray(value)
+      if typeof value !== 'object'
         .menus_item
           a.site-page(href=url_for(trim(value.split('||')[0])))
             if value.split('||')[1]
@@ -18,9 +18,9 @@ if theme.menu
             span=' '+ trim(label.split('||')[0])
             i.fas.fa-chevron-down.expand(class=sidebarChildHide)
           ul.menus_item_child
-            each i in value
+            each val,lab in value 
               li
-                a.site-page(href=url_for(trim(i.split('||')[1])))
+                a.site-page.child(href=url_for(trim(val.split('||')[0])))
-                  if i.split('||')[2]
+                  if val.split('||')[1]
-                    i.fa-fw(class=trim(i.split('||')[2]))
+                    i.fa-fw(class=trim(val.split('||')[1]))
-                  span=' '+trim(i.split('||')[0])
+                  span=' '+ lab

layout/includes/header/nav.pug

@@ -8,7 +8,7 @@ nav#nav
         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')})
+    !=partial('includes/header/menu_item', {}, {cache: true})
 
     #toggle-menu
       a.site-page

layout/includes/header/post-info.pug

@@ -1,5 +1,9 @@
+- let comments = theme.comments
 #post-info
   h1.post-title= page.title || _p('no_title')
+    if theme.post_edit.enable
+      a.post-edit-link(href=theme.post_edit.url + page.source title=_p('post.edit') target="_blank")
+        i.fas.fa-pencil-alt
         
   #post-meta
     .meta-firstline
@@ -48,15 +52,28 @@
             span.post-meta-label= _p('post.min2read') + ':'
             span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
     
-      if theme.busuanzi.page_pv
+      //- for pv and count
+      mixin pvBlock(parent_id,parent_class,parent_title)
         span.post-meta-separator |
-        span.post-meta-pv-cv
+        span(class=parent_class id=parent_id data-flag-title=page.title)
           i.far.fa-eye.fa-fw.post-meta-icon
           span.post-meta-label=_p('post.page_pv') + ':'
-          span#busuanzi_value_page_pv
+          if block
+            block
 
-      if !theme.comments.lazyload && page.comments !== false && theme.comments.use && theme.comments.count
+      if theme.busuanzi.page_pv
-        - var whichCount = theme.comments.use[0]
+        +pvBlock('','post-meta-pv-cv','')
+          span#busuanzi_value_page_pv
+      else if comments.use && !comments.lazyload
+        if (comments.use.includes('Valine') && theme.valine.visitor) || (comments.use.includes('Waline') && theme.waline.visitor)
+          +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
+            span.leancloud-visitors-count
+        else if (comments.use.includes('Twikoo') && theme.twikoo.visitor)
+          +pvBlock('','','')
+            span#twikoo_visitors
+
+      if comments.count && !comments.lazyload && page.comments !== false && comments.use
+        - var whichCount = comments.use[0]
 
         mixin countBlock
           span.post-meta-separator |
@@ -66,23 +83,29 @@
             if block
               block
         
-        if whichCount === 'Disqus' || whichCount === 'Disqusjs'
+        case whichCount
-          +countBlock
+          when 'Disqus'
-            span.disqus-comment-count
+          when 'Disqusjs'
-              a(href=full_url_for(page.path) + '#disqus_thread')
+            +countBlock
-        else if whichCount === 'Valine'
+              span.disqus-comment-count
-          +countBlock
+                a(href=full_url_for(page.path) + '#disqus_thread')
-            a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
+          when 'Valine'
-              span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+            +countBlock
-        else if whichCount === 'Gitalk'
+              a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
-          +countBlock
+                span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-            a(href=url_for(page.path) + '#post-comment')
+          when 'Waline'
-              span.gitalk-comment-count
+            +countBlock
-        else if whichCount === 'Twikoo'
+              a(href=url_for(page.path) + '#post-comment')
-          +countBlock
+                span.waline-comment-count(id=url_for(page.path))
-            a(href=url_for(page.path) + '#post-comment')
+          when 'Gitalk'
-              span#twikoo-count
+            +countBlock
-        else if whichCount === 'Facebook Comments'
+              a(href=url_for(page.path) + '#post-comment')
-          +countBlock
+                span.gitalk-comment-count
-            a(href=url_for(page.path) + '#post-comment')
+          when 'Twikoo'
-              span.fb-comments-count(data-href=urlNoIndex())
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span#twikoo-count
+          when 'Facebook Comments'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.fb-comments-count(data-href=urlNoIndex())

layout/includes/layout.pug

@@ -1,5 +1,6 @@
 - var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
+- var pageType = is_post() ? 'post' : 'page'
 
 doctype html
 html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside)
@@ -7,14 +8,14 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
     include ./head.pug
   body
     if theme.preloader
-      !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
+      !=partial('includes/loading/loading', {}, {cache: true})
 
     if theme.background
       #web_bg
       
-    !=partial('includes/sidebar', {}, {cache:theme.fragment_cache})
+    !=partial('includes/sidebar', {}, {cache: true})
 
-    #body-wrap
+    #body-wrap(class=pageType)
       include ./header/index.pug
 
       main#content-inner.layout(class=hideAside)
@@ -30,13 +31,13 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
         if (footerBg === true)
           - var footer_bg = bg_img
         else
-          - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url(${url_for(footerBg)})` : `background: ${footerBg}`
+          - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url('${url_for(footerBg)}')` : `background: ${footerBg}`
       else
         - var footer_bg = ''
 
       footer#footer(style=footer_bg)
-        !=partial('includes/footer', {}, {cache:theme.fragment_cache})
+        !=partial('includes/footer', {}, {cache: true})
 
     include ./rightside.pug
-    !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache})
+    !=partial('includes/third-party/search/index', {}, {cache: true})
     include ./additional-js.pug

layout/includes/loading/loading-js.pug

@@ -10,4 +10,4 @@ script.
 
     }
   }
-  window.addEventListener('load',()=> {preloader.endLoading()})
+  window.addEventListener('load',preloader.endLoading())

layout/includes/mixins/post-ui.pug

@@ -18,7 +18,7 @@ mixin postUI(posts)
         .article-meta-wrap
           if (is_home() && (article.top || article.sticky > 0))
             span.article-meta
-              i.fas.fa-thumbtack.article-meta__icon.sticky
+              i.fas.fa-thumbtack.sticky
               span.sticky= _p('sticky')
               span.article-meta__separator |
           if (theme.post_meta.page.date_type)
@@ -42,7 +42,7 @@ mixin postUI(posts)
           if (theme.post_meta.page.categories && article.categories.data.length > 0)
             span.article-meta
               span.article-meta__separator |
-              i.fas.fa-inbox.article-meta__icon
+              i.fas.fa-inbox
               each item, index in article.categories.data
                 a(href=url_for(item.path)).article-meta__categories #[=item.name]
                 if (index < article.categories.data.length - 1)
@@ -50,12 +50,43 @@ mixin postUI(posts)
           if (theme.post_meta.page.tags && article.tags.data.length > 0)
             span.article-meta.tags
               span.article-meta__separator |
-              i.fas.fa-tag.article-meta__icon
+              i.fas.fa-tag
               each item, index in article.tags.data
                 a(href=url_for(item.path)).article-meta__tags #[=item.name]
                 if (index < article.tags.data.length - 1)
                   span.article-meta__link #[='•']
           
+          mixin countBlockInIndex
+            - needLoadCountJs = true
+            span.article-meta
+              span.article-meta__separator |
+              i.fas.fa-comments
+              if block
+                block
+              span.article-meta-label= ' ' + _p('card_post_count')
+          
+          if theme.comments.card_post_count
+            case theme.comments.use[0]
+              when 'Disqus'
+              when 'Disqusjs'
+                +countBlockInIndex
+                  a(href=full_url_for(link) + '#disqus_thread')
+              when 'Valine'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment' itemprop="discussionUrl")
+                    span.valine-comment-count(data-xid=url_for(link) itemprop="commentCount")
+              when 'Waline'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.waline-comment-count(id=url_for(link))
+              when 'Twikoo'
+                +countBlockInIndex
+                  a.twikoo-count(href=url_for(link) + '#post-comment')
+              when 'Facebook Comments'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.fb-comments-count(data-href=urlNoIndex(article.permalink))
+
         //- Display the article introduction on homepage
         case theme.index_post_content.method
           when false

layout/includes/page/artitalk.pug

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

layout/includes/page/flink.pug

@@ -1,19 +1,23 @@
-.flink#article-container
+#article-container
-  if site.data.link
+  if top_img === false
-    each i in site.data.link
+    h1.page-title= page.title
-      if i.class_name
+
-        h2!= i.class_name
+  .flink
-      if i.class_desc
+    if site.data.link
-        .flink-desc!=i.class_desc
+      each i in site.data.link
-      .flink-list
+        if i.class_name
-        each item in i.link_list
+          h2!= i.class_name
-          .flink-list-item
+        if i.class_desc
-            a(href=url_for(item.link)  title=item.name target="_blank")
+          .flink-desc!=i.class_desc
-              if theme.lazyload.enable
+        .flink-list
-                img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+          each item in i.link_list
-              else
+            .flink-list-item
-                img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+              a(href=url_for(item.link)  title=item.name target="_blank")
-              span.flink-item-name= item.name 
+                if theme.lazyload.enable
-              span.flink-item-desc(title=item.descr)= item.descr
+                  img(data-lazy-src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
-  != page.content
+                else
+                  img(src=url_for(item.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt=item.name )
+                span.flink-item-name= item.name 
+                span.flink-item-desc(title=item.descr)= item.descr
+    != page.content
 

layout/includes/pagination.pug

@@ -6,34 +6,38 @@
     escape: false
   }
 
-if(!is_post())
+if is_post()
-  nav#pagination
+  - let prev = theme.post_pagination === 1 ? page.prev : page.next
-    div.pagination
+  - let next = theme.post_pagination === 1 ? page.next : page.prev
-      !=paginator(options)
-else
   nav#pagination.pagination-post
-    if(page.prev)
+    if(prev)
-      - var hasPageNext = page.next ? 'pull-left' : 'pull-full'
+      - var hasPageNext = next ? 'pull-left' : 'pull-full'
       .prev-post(class=hasPageNext)
-        - var pagination_cover = page.prev.cover === false ? page.prev.randomcover : page.prev.cover
+        - var pagination_cover = prev.cover === false ? prev.randomcover : prev.cover
-        a(href=url_for(page.prev.path))
+        a(href=url_for(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)}'` 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)}'` alt='cover of previous post')
           .pagination-info
             .label=_p('pagination.prev')
-            .prev_info=page.prev.title
+            .prev_info=prev.title
           
-    if(page.next)
+    if(next)
-      - var hasPagePrev = page.prev ? 'pull-right' : 'pull-full'
+      - var hasPagePrev = prev ? 'pull-right' : 'pull-full'
-      - var pagination_cover = page.next.cover == false ? page.next.randomcover : page.next.cover
+      - var pagination_cover = next.cover == false ? next.randomcover : next.cover
       .next-post(class=hasPagePrev)
-        a(href=url_for(page.next.path))
+        a(href=url_for(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)}'` 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)}'` alt='cover of next post')
           .pagination-info
             .label=_p('pagination.next')
-            .next_info=page.next.title 
+            .next_info=next.title
+else
+  nav#pagination
+    .pagination
+      if is_home()
+        - options.format = 'page/%d/#content-inner'
+      !=paginator(options)

layout/includes/post/reward.pug

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

layout/includes/sidebar.pug

@@ -28,4 +28,4 @@
               .headline= _p('aside.categories') 
               .length-num= site.categories.length
     hr
-    !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
+    !=partial('includes/header/menu_item', {}, {cache: true})

layout/includes/third-party/baidu_push.pug

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

layout/includes/third-party/card-post-count/disqus.pug

@@ -0,0 +1,16 @@
+script.
+  (() => {
+    const getCount = () => {
+      if (window.DISQUSWIDGETS === undefined) {
+        var d = document, s = d.createElement('script');
+        s.src = 'https://!{theme.disqus.shortname}.disqus.com/count.js';
+        s.id = 'dsq-count-scr';
+        (d.head || d.body).appendChild(s);
+      } else {
+        DISQUSWIDGETS.getCount({reset: true});
+      }
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+
+  })()

layout/includes/third-party/card-post-count/fb.pug

@@ -0,0 +1,15 @@
+script.
+  (()=>{
+    function loadFBComment () {
+      if (typeof FB === 'object') FB.XFBML.parse()
+      else {
+        let ele = document.createElement('script')
+        ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v9.0')
+        ele.setAttribute('async', 'true')
+        ele.setAttribute('defer', 'true')
+        ele.setAttribute('crossorigin', 'anonymous')
+        document.body.appendChild(ele)
+      }
+    }
+    window.pjax ? loadFBComment() : window.addEventListener('load', loadFBComment)
+  })()

layout/includes/third-party/card-post-count/index.pug

@@ -0,0 +1,12 @@
+case theme.comments.use[0]
+  when 'Twikoo'
+    include ./twikoo.pug
+  when 'Disqus'
+  when 'Disqusjs'
+    include ./disqus.pug
+  when 'Valine'
+    include ./valine.pug
+  when 'Waline'
+    include ./waline.pug
+  when 'Facebook Comments'
+    include ./fb.pug

layout/includes/third-party/card-post-count/twikoo.pug

@@ -0,0 +1,37 @@
+script.
+  (() => { 
+    const getCommentUrl = () => {
+      const eleGroup = document.querySelectorAll('#recent-posts .article-title')
+      let urlArray = []
+      eleGroup.forEach(i=>{
+        urlArray.push(i.getAttribute('href'))
+      })
+      return urlArray
+    }
+
+    const getCount = () => {
+      const runTwikoo = () => {
+        twikoo.getCommentsCount({
+          envId: '!{theme.twikoo.envId}',
+          region: '!{theme.twikoo.region}',
+          urls: getCommentUrl(),
+          includeReply: false
+        }).then(function (res) {
+          document.querySelectorAll('#recent-posts .twikoo-count').forEach((item,index) => {
+            item.innerText = res[index].count
+          })
+        }).catch(function (err) {
+          console.log(err)
+        })
+      }
+
+        if (typeof twikoo === 'object') {
+          runTwikoo()
+        } else {
+          getScript('!{theme.CDN.twikoo}').then(runTwikoo)
+        }
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+
+  })()

layout/includes/third-party/card-post-count/valine.pug

@@ -0,0 +1,19 @@
+script.
+  (() => {
+    function loadValine () {
+      function initValine () {
+        let initData = {
+          el: '#vcomment',
+          appId: '#{theme.valine.appId}',
+          appKey: '#{theme.valine.appKey}',
+        }
+        
+        const valine = new Valine(initData)
+      }
+
+      if (typeof Valine === 'function') initValine() 
+      else getScript('!{url_for(theme.CDN.valine)}').then(initValine)
+    }
+
+    window.pjax ? loadValine() : window.addEventListener('load', loadValine)
+  })()

layout/includes/third-party/card-post-count/waline.pug

@@ -0,0 +1,18 @@
+script.
+  (() => {
+    function loadWaline () {
+      function initWaline () {
+        let initData = {
+          el: '#waline-wrap',
+          serverURL: '!{theme.waline.serverURL}',
+        }
+        
+        const waline = new Waline(initData)
+      }
+
+      if (typeof Waline === 'function') initWaline() 
+      else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
+    }
+
+    window.pjax ? loadWaline() : window.addEventListener('load', loadWaline)
+  })()

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

@@ -1,9 +1,11 @@
+- let disqusPageTitle = page.title.replace(/'/ig,"\\'")
+
 script.
   function loadDisqus () {
     var disqus_config = function () {
       this.page.url = '!{ page.permalink }'
       this.page.identifier = '!{ page.path }'
-      this.page.title = '!{ page.title }'
+      this.page.title = '!{ disqusPageTitle }'
     };
 
     window.disqusReset = () => {

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

@@ -1,4 +1,6 @@
 - let disqusjsApi = theme.disqusjs.api || 'https://disqus.skk.moe/disqus/'
+- let disqusjsPageTitle = page.title.replace(/'/ig,"\\'")
+
 script.
   function loadDisqusjs () {
     function addDisqusjsCSS () {
@@ -15,7 +17,7 @@ script.
         siteName: '!{theme.disqusjs.siteName}',
         identifier: '!{ page.path }',
         url: '!{ page.permalink }',
-        title: '!{ page.title }',
+        title: '!{ disqusjsPageTitle }',
         api: '!{disqusjsApi}',
         apikey: '!{theme.disqusjs.apikey}',
         nocomment: '!{theme.disqusjs.nocomment}',
@@ -55,4 +57,3 @@ if is_post() && !theme.comments.lazyload && theme.comments.count && theme.commen
     } else {
       DISQUSWIDGETS.getCount({reset: true});
     }
-

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

@@ -7,7 +7,7 @@ script.
     if (typeof FB === 'object') FB.XFBML.parse()
     else {
       let ele = document.createElement('script')
-      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v7.0')
+      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v9.0')
       ele.setAttribute('async', 'true')
       ele.setAttribute('defer', 'true')
       ele.setAttribute('crossorigin', 'anonymous')

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

@@ -8,7 +8,7 @@ script.
 
   function loadGitalk () {
     function initGitalk () {
-      var gitalk = new Gitalk({
+      var gitalk = new Gitalk(Object.assign({
         clientID: '!{theme.gitalk.client_id}',
         clientSecret: '!{theme.gitalk.client_secret}',
         repo: '!{theme.gitalk.repo}',
@@ -21,7 +21,8 @@ script.
         pagerDirection: '!{theme.gitalk.pagerDirection}',
         createIssueManually: !{theme.gitalk.createIssueManually},
         updateCountCallback: commentCount
-      })
+      },!{JSON.stringify(theme.gitalk.option)}))
+
       gitalk.render('gitalk-container')
     }
 

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

@@ -31,6 +31,8 @@ hr
             #utterances-wrap
           when 'Twikoo'
             #twikoo-wrap
+          when 'Waline'
+            #waline-wrap
           when 'Facebook Comments'
             .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
                         data-numposts= theme.facebook_comments.pageSize || 10

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

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

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

@@ -2,15 +2,17 @@ script.
   (()=>{
     const $countDom = document.getElementById('twikoo-count')
     const init = () => {
-      twikoo.init({
+      twikoo.init(Object.assign({
-        envId: '!{theme.twikoo}',
+        el: '#twikoo-wrap',
-        el: '#twikoo-wrap'
+        envId: '!{theme.twikoo.envId}',
-      })
+        region: '!{theme.twikoo.region}'
+      }, !{JSON.stringify(theme.twikoo.option)}))
     }
 
     const getCount = () => {
       twikoo.getCommentsCount({
-        envId: '!{theme.twikoo}',
+        envId: '!{theme.twikoo.envId}',
+        region: '!{theme.twikoo.region}',
         urls: [window.location.pathname],
         includeReply: false
       }).then(function (res) {

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

@@ -1,4 +1,3 @@
-- let option = theme.valine.option ? JSON.stringify(theme.valine.option) : false
 - let emojiMaps = '""'
 if site.data.valine
   - emojiMaps = JSON.stringify(site.data.valine)
@@ -6,7 +5,7 @@ if site.data.valine
 script.
   function loadValine () {
     function initValine () {
-      let initData = {
+      const valine = new Valine(Object.assign({
         el: '#vcomment',
         appId: '#{theme.valine.appId}',
         appKey: '#{theme.valine.appKey}',
@@ -21,18 +20,9 @@ script.
         emojiMaps: !{emojiMaps},
         enableQQ: #{theme.valine.enableQQ},
         path: window.location.pathname,
-      }
+        requiredFields: [!{theme.valine.requiredFields ? JSON.stringify(theme.valine.requiredFields).split(',') : ''}],
-
+        visitor: #{theme.valine.visitor}
-      if (!{Boolean(theme.valine.requiredFields)}) { 
+      }, !{JSON.stringify(theme.valine.option)}))
-        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() 
@@ -40,7 +30,7 @@ script.
   }
 
   if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#vcomment'),loadValine)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
     else setTimeout(loadValine, 0)
   } else {
     function loadOtherComment () {

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

@@ -0,0 +1,32 @@
+- let emojiMaps = '""'
+if site.data.waline
+  - emojiMaps = JSON.stringify(site.data.waline)
+
+script.
+  function loadWaline () {
+    function initWaline () {
+      const waline = new Waline(Object.assign({
+        el: '#waline-wrap',
+        serverURL: '!{theme.waline.serverURL}',
+        avatar: '#{theme.waline.avatar}',
+        path: location.pathname,
+        emojiCDN: '#{theme.waline.emojiCDN}',
+        emojiMaps: !{emojiMaps},
+        visitor: #{theme.waline.visitor}
+      }, !{JSON.stringify(theme.waline.option)}))
+    }
+
+    if (typeof Waline === 'function') initWaline() 
+    else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Waline' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+    else setTimeout(loadWaline, 0)
+  } else {
+    function loadOtherComment () {
+      loadWaline()
+    }
+  }
+  
+

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

@@ -1,6 +1,6 @@
 if theme.mathjax && theme.mathjax.enable
   if theme.mathjax.per_page
-    if(!is_tag() && !is_category() && !is_archive() && !is_home())
+    if is_post() || is_page()
       include ./mathjax.pug
   else
     if page.mathjax
@@ -8,7 +8,7 @@ if theme.mathjax && theme.mathjax.enable
 
 if theme.katex && theme.katex.enable
   if theme.katex.per_page
-    if(!is_tag() && !is_category() && !is_archive() && !is_home())
+    if is_post() || is_page()
       include ./katex.pug
   else
     if page.katex

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

@@ -3,9 +3,10 @@ script.
     const changeContent = (content) => {
       if (content === '') return content
 
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<code>.*?<\/code>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
       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) + '...'
@@ -26,8 +27,8 @@ script.
               'date': item.createdAt
             }
           })
-          // set expiry to 10 min
+
-          saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24))
+          saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), !{theme.newest_comments.storage}/(60*24))
           generateHtml(disqusArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
@@ -43,10 +44,7 @@ script.
           result += '<div class=\'aside-list-item\'>'
 
           if (!{theme.newest_comments.avatar}) {
-            let name = 'src'
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "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>`
           }
           

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

@@ -3,9 +3,10 @@ script.
     const changeContent = (content) => {
       if (content === '') return content
 
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
       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) + '...'
@@ -13,21 +14,48 @@ script.
       return content
     }
 
+    const findTrueUrl = (array) => {
+      Promise.all(array.map(item =>
+        fetch(item.url).then(resp => resp.json()).then(data => {
+          const urlArray = data.body.match(/(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?/ig)
+          if (data.user.login === 'utterances-bot') {
+            return urlArray.pop()
+          } else {
+            return urlArray.shift()
+          }
+        })
+      )).then(res => {
+          array = array.map((i,index)=> {
+            return {
+              ...i,
+              url: res[index]
+            }
+          })
+
+          saveToLocal.set('github-newest-comments', JSON.stringify(array), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(array)
+      });
+    }
+
     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')
+      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',{
+        "headers": {
+          Accept: 'application/vnd.github.v3.html+json'
+        }
+      })
         .then(response => response.json())
         .then(data => {
           const githubArray = data.map(item => {
             return {
               'avatar': item.user.avatar_url,
-              'content': changeContent(item.body),
+              'content': changeContent(item.body_html),
               'nick': item.user.login,
-              'url': item.html_url,
+              'url': item.issue_url,
-              'date': item.updated_at
+              'date': item.updated_at,
+              'githubUrl': item.html_url
             }
           })
-          saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24))
+          findTrueUrl(githubArray)
-          generateHtml(githubArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
           $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
@@ -42,16 +70,13 @@ script.
           result += '<div class=\'aside-list-item\'>'
 
           if (!{theme.newest_comments.avatar}) {
-            let name = 'src'
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            if(!{theme.lazyload.enable}) {
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-              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 class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
       } else {
@@ -78,7 +103,3 @@ script.
     newestCommentInit()
     document.addEventListener('pjax:complete', newestCommentInit)
   })
-
-
-
-

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

@@ -1,8 +1,12 @@
-if theme.newest_comments.leancloud.enable
+- let config = theme.newest_comments
-  include ./leancloud.pug
+
-else if theme.newest_comments.github_issues.enable
+if config.valine
+  include ./valine.pug
+else if config.waline
+  include ./waline.pug
+else if config.github_issues.enable
   include ./github-issues.pug
-else if theme.newest_comments.disqus.enable
+else if config.disqus.enable
   include ./disqus-comment.pug
-else if theme.newest_comments.twikoo
+else if config.twikoo
   include ./twikoo-comment.pug

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

@@ -3,9 +3,10 @@ script.
     const changeContent = (content) => {
       if (content === '') return content
 
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
       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) + '...'
@@ -16,12 +17,23 @@ script.
     const getComment = () => {
       const runTwikoo = () => {
         twikoo.getRecentComments({
-          envId: '!{theme.twikoo}',
+          envId: '!{theme.twikoo.envId}',
+          region: '!{theme.twikoo.region}',
           pageSize: !{theme.newest_comments.limit},
           includeReply: true
         }).then(function (res) {
-          saveToLocal.set('twikoo-newest-comments', JSON.stringify(res), 10/(60*24))
+          const twikooArray = res.map(e => {
-          generateHtml(res)
+            return {
+              'content': changeContent(e.comment),
+              'avatar': e.avatar,
+              'nick': e.nick,
+              'url': e.url + '#' + e.id,
+              'date': new Date(e.created).toISOString()
+            }
+          })
+
+          saveToLocal.set('twikoo-newest-comments', JSON.stringify(twikooArray), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(twikooArray)
         }).catch(function (err) {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
           $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
@@ -43,16 +55,13 @@ script.
           result += '<div class=\'aside-list-item\'>'
 
           if (!{theme.newest_comments.avatar}) {
-            let name = 'src'
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            if(!{theme.lazyload.enable}) {
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-              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>
+          <a class='comment' href='${array[i].url}'>${array[i].content}</a>
-          <div class='name'><span>${array[i].nick}</span><time> / ${btf.diffDate(array[i].created, true)}</time></div>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
       } else {

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

@@ -1,12 +1,15 @@
+- let default_avatar = theme.valine.avatar
+
 script(src="https://cdn.jsdelivr.net/npm/blueimp-md5@2.17.0/js/md5.min.js")
 script.
   window.addEventListener('load', () => {
     const changeContent = (content) => {
       if (content === '') return content
 
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
       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) + '...'
@@ -16,8 +19,7 @@ script.
 
     const getIcon = (icon, mail) => {
       if (icon) return icon
-      
+      let defaultIcon = '!{ default_avatar ? `?d=${default_avatar}` : ''}'
-      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
     }
@@ -30,16 +32,13 @@ script.
           result += '<div class=\'aside-list-item\'>'
 
           if (!{theme.newest_comments.avatar}) {
-            let name = 'src'
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
-            if(!{theme.lazyload.enable}) {
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
-              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 class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
           </div></div>`
         }
       } else {
@@ -53,18 +52,13 @@ script.
     }
 
     const getComment = () => {
-        let serverURL = ''
+      const serverURL = '!{theme.valine.serverURLs || `https://${theme.valine.appId.substring(0,8)}.api.lncldglobal.com` }'
-        if (!{Boolean(theme.newest_comments.leancloud.serverURL)}) {
-          serverURL = '!{theme.newest_comments.leancloud.serverURL}'
-        } else {
-          serverURL = 'https://!{theme.newest_comments.leancloud.appId.substring(0,8)}.api.lncldglobal.com'
-        }
 
       var settings = {
         "method": "GET",
         "headers": {
-          "X-LC-Id": '!{theme.newest_comments.leancloud.appId}',
+          "X-LC-Id": '!{theme.valine.appId}',
-          "X-LC-Key": '!{theme.newest_comments.leancloud.appKey}',
+          "X-LC-Key": '!{theme.valine.appKey}',
           "Content-Type": "application/json"
         },
       }
@@ -74,15 +68,14 @@ script.
         .then(data => {
           const valineArray = data.results.map(function (e) {
             return {
-              'avatar': e.QQAvatar,
+              'avatar': getIcon(e.QQAvatar, e.mail),
               'content': changeContent(e.comment),
-              'mail': e.mail,
               'nick': e.nick,
-              'url': e.url,
+              'url': e.url + '#' + e.objectId,
-              'date': e.createdAt,
+              'date': e.updatedAt,
             }
           })
-          saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24))
+          saveToLocal.set('valine-newest-comments', JSON.stringify(valineArray), !{theme.newest_comments.storage}/(60*24))
           generateHtml(valineArray)
         }).catch(e => {
           const $dom = document.querySelector('#card-newest-comments .aside-list')
@@ -92,7 +85,7 @@ script.
 
     const newestCommentInit = () => {
       if (document.querySelector('#card-newest-comments .aside-list')) {
-        const data = saveToLocal.get('leancloud-newest-comments')
+        const data = saveToLocal.get('valine-newest-comments')
         if (data) {
           generateHtml(JSON.parse(data))
         } else {

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

@@ -0,0 +1,94 @@
+- let default_avatar = theme.waline.avatar
+
+script.
+  window.addEventListener('load', () => {
+    const changeContent = (content) => {
+      if (content === '') return content
+
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+      content = content.replace(/<[^>]+>/g,"") // remove html tag
+
+      if (content.length > 150) {
+        content = content.substring(0,150) + '...'
+      }
+      return content
+    }
+
+    const getIcon = (avatar,mail) => {
+      if (avatar) return avatar
+      let defaultIcon = '!{ default_avatar ? `?d=${default_avatar}` : ''}'
+      let iconUrl = `https://gravatar.loli.net/avatar/${mail + defaultIcon}`
+      return iconUrl
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "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 datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const getComment = () => {
+      const loadWaline = () => {
+        Waline.Widget.RecentComments({
+          el: '#card-newest-comments .aside-list',
+          serverURL: '!{theme.waline.serverURL}',
+          count: !{theme.newest_comments.limit}
+        }).then(comments => {
+          const walineArray = comments.map(function (e) {
+            return {
+              'content': changeContent(e.comment),
+              'avatar': getIcon(e.QQAvatar,e.mail),
+              'nick': e.nick,
+              'url': e.url + '#' + e.objectId,
+              'date': e.updatedAt,
+            }
+          })
+          saveToLocal.set('waline-newest-comments', JSON.stringify(walineArray), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(walineArray)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        }) 
+      }
+
+      if (typeof Waline === 'function') loadWaline() 
+      else getScript('!{url_for(theme.CDN.waline)}').then(loadWaline)
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('waline-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })

layout/includes/third-party/pangu.pug

@@ -1,10 +1,10 @@
 script.
   function panguFn () {
-    if (typeof pangu === 'object') pangu.spacingElementById('content-inner')
+    if (typeof pangu === 'object') pangu.autoSpacingPage()
     else {
       getScript('!{url_for(theme.CDN.pangu)}')
         .then(() => {
-          pangu.spacingElementById('content-inner')
+          pangu.autoSpacingPage()
         })
     }
   }

layout/includes/third-party/pjax.pug

@@ -7,7 +7,7 @@ script(src=url_for(theme.CDN.pjax))
 script.
   let pjaxSelectors = [
     'title',
-    '#config_change',
+    '#config-diff',
     '#body-wrap',
     '#rightside-config-hide',
     '#rightside-config-show',
@@ -42,9 +42,11 @@ script.
     typeof chatBtnFn === 'function' && chatBtnFn()
     typeof panguInit === 'function' && panguInit()
 
-    if (typeof gtag === 'function') {
+    // google analytics
-      gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
+    typeof gtag === 'function' && gtag('config', '!{theme.google_analytics}', {'page_path': window.location.pathname});
-    }
+
+    // baidu analytics
+    typeof _hmt === 'object' && _hmt.push(['_trackPageview',window.location.pathname]);
 
     typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()
 
@@ -78,3 +80,9 @@ script.
     $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')
 
   })
+
+  document.addEventListener('pjax:error', (e) => {
+    if (e.request.status === 404) {
+      pjax.loadUrl('/404.html')
+    }
+  })

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

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

layout/includes/third-party/subtitle.pug

@@ -69,7 +69,7 @@ case source
   when 3
     script.
       function subtitleType () {
-        getScript('http://yijuzhan.com/api/word.php?m=js').then(() => {
+        getScript('https://yijuzhan.com/api/word.php?m=js').then(() => {
           var con = str[0]
           if (!{theme.subtitle.effect}) {
             var from = '出自 ' + str[1]

layout/includes/widget/card_announcement.pug

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

layout/includes/widget/card_archives.pug

@@ -1,12 +1,7 @@
 if theme.aside.card_archives.enable
   .card-widget.card-archives
-    .card-content
+    - let type = theme.aside.card_archives.type || 'monthly'
-      .item-headline
+    - let format = theme.aside.card_archives.format || 'MMMM YYYY'
-        i.fas.fa-archive
+    - let order = theme.aside.card_archives.order || -1
-        span= _p('aside.card_archives')
+    - 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 })
-      - 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 })

layout/includes/widget/card_author.pug

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

layout/includes/widget/card_categories.pug

@@ -1,8 +1,4 @@
 if theme.aside.card_categories.enable
   if site.categories.length
     .card-widget.card-categories
-        .card-content
+      !=aside_categories({ limit: theme.aside.card_categories.limit === 0 ? 0 : theme.aside.card_categories.limit || 8 , expand: theme.aside.card_categories.expand })
-          .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 })

layout/includes/widget/card_newest_comment.pug

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

layout/includes/widget/card_post_toc.pug

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

layout/includes/widget/card_recent_post.pug

@@ -1,28 +1,27 @@
 if theme.aside.card_recent_post.enable
   .card-widget.card-recent-post
-    .card-content
+    .item-headline
-      .item-headline
+      i.fas.fa-history
-        i.fas.fa-history
+      span= _p('aside.card_recent_post')
-        span= _p('aside.card_recent_post')
+    .aside-list
-      .aside-list
+      - let postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5
-        - 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'
-        - let sort = theme.aside.card_recent_post.sort === 'updated' ? 'updated' : 'date'
+      - site.posts.sort(sort, -1).limit(postLimit).each(function(article){
-        - site.posts.sort(sort, -1).limit(postLimit).each(function(article){
+        - let link = article.link || article.path
-          - let link = article.link || article.path
+        - let title = article.title || _p('no_title')
-          - let title = article.title || _p('no_title')
+        - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-cover' : ''
-          - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-cover' : ''
+        - let post_cover = article.cover
-          - let post_cover = article.cover
+        .aside-list-item(class=no_cover)
-          .aside-list-item(class=no_cover)
+          if post_cover && theme.cover.aside_enable
-            if post_cover && theme.cover.aside_enable
+            a.thumbnail(href=url_for(link) title=title)
-              a.thumbnail(href=url_for(link) title=title)
+              if theme.lazyload.enable
-                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)
-                  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
-                time(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)]
+                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)]
+      - })

layout/includes/widget/card_self.pug

@@ -0,0 +1,9 @@
+if site.data.widget
+  each item in site.data.widget
+    .card-widget(class=item.class_name id=item.id_name style=item.order ? `order: ${item.order}` : '')
+      .item-headline
+        i(class=item.icon)
+        span=item.name
+      .item-content
+        !=item.html
+

layout/includes/widget/card_tags.pug

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

layout/includes/widget/card_webinfo.pug

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

layout/includes/widget/index.pug

@@ -1,26 +1,27 @@
-#aside_content.aside_content
+#aside-content.aside-content
   //- 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_author', {}, {cache: true})
-      !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_announcement', {}, {cache: true})
       .sticky_layout
         if showToc
           include ./card_post_toc.pug
-        !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
+        !=partial('includes/widget/card_recent_post', {}, {cache: true})
-        !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
+        !=partial('includes/widget/card_ad', {}, {cache: true})
   else
     //- page
-    !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
+    !=partial('includes/widget/card_author', {}, {cache: true})
-    !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
+    !=partial('includes/widget/card_announcement', {}, {cache: true})
     .sticky_layout
-      !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_recent_post', {}, {cache: true})
-      !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_ad', {}, {cache: true})
-      !=partial('includes/widget/card_newest_comment', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_newest_comment', {}, {cache: true})
-      !=partial('includes/widget/card_categories', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_categories', {}, {cache: true})
-      !=partial('includes/widget/card_tags', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_tags', {}, {cache: true})
-      !=partial('includes/widget/card_archives', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_archives', {}, {cache: true})
-      !=partial('includes/widget/card_webinfo', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_webinfo', {}, {cache: true})
+      !=partial('includes/widget/card_self', {}, {cache: true})

layout/page.pug

@@ -9,11 +9,9 @@ block content
         include includes/page/flink.pug
       when 'categories'
         include includes/page/categories.pug
-      when 'artitalk'
-        include includes/page/artitalk.pug
       default
         include includes/page/default-page.pug
 
     if page.comments !== false && theme.comments && theme.comments.use
       - var commentsJsLoad = true
-      !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/index', {}, {cache: true})

layout/post.pug

@@ -15,17 +15,18 @@ block content
       include includes/third-party/share/index.pug
         
     if theme.reward.enable
-      !=partial('includes/post/reward', {}, {cache:theme.fragment_cache})
+      !=partial('includes/post/reward', {}, {cache: true})
 
     //- ad
     if theme.ad && theme.ad.post
       .ads-wrap!=theme.ad.post
 
-    include includes/pagination.pug
+    if theme.post_pagination
+      include includes/pagination.pug
     if theme.related_post && theme.related_post.enable
       != related_posts(page,site.posts)
 
     if page.comments !== false && theme.comments && theme.comments.use
       - var commentsJsLoad = true
-      !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
+      !=partial('includes/third-party/comments/index', {}, {cache: true})
       

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "3.4.2",
+  "version": "3.7.1",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -20,13 +20,13 @@
   },
   "bugs": {
     "url": "https://github.com/jerryc127/hexo-theme-butterfly/issues",
-    "email": "wong@jerryc.me"
+    "email": "btf@immyw.com"
   },
   "dependencies": {
     "hexo-renderer-stylus": "^2.0.1",
     "hexo-renderer-pug": "^1.0.0"
   },
   "homepage": "https://butterfly.js.org/",
-  "author": "Jerry <wong@jerryc.me>",
+  "author": "Jerry <btf@immyw.com>",
   "license": "Apache-2.0"
 }

scripts/filters/random_cover.js

@@ -39,7 +39,7 @@ function randomCover () {
       return cover
     }
   } else {
-    cover = 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/img/default.jpg'
+    cover = theme.default_top_img || 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/img/default.jpg'
     return cover
   }
 }

scripts/helpers/aside_archives.js

@@ -19,7 +19,6 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
     ? (yearA, monthA, yearB, monthB) => yearA === yearB && monthA === monthB
     : (yearA, monthA, yearB, monthB) => yearA === yearB
   const limit = options.limit
-  const moreButton = this._p('aside.more_button')
   let result = ''
 
   if (!format) {
@@ -67,11 +66,18 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
     return this.url_for(url)
   }
 
-  result += '<ul class="card-archive-list">'
-
   const len = data.length
   const Judge = limit === 0 ? len : Math.min(len, limit)
 
+  result += `<div class="item-headline"><i class="fas fa-archive"></i><span>${this._p('aside.card_archives')}</span>`
+
+  if (len > Judge) {
+    result += `<a class="card-more-btn" href="${this.url_for(archiveDir)}/" title="${this._p('aside.more_button')}">
+    <i class="fas fa-angle-right"></i></a>`
+  }
+
+  result += '</div><ul class="card-archive-list">'
+
   for (let i = 0; i < Judge; i++) {
     const item = data[i]
 
@@ -89,11 +95,6 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
     result += '</li>'
   }
 
-  if (len > Judge) {
-    result += '<li class="card-archive-list-item more is-center">'
-    result += `<a class="card-archive-list-link-more" href="${this.url_for(archiveDir)}/">
-              <span>${moreButton}</span><i class="fas fa-angle-right"  ></i></a></li>`
-  }
   result += '</ul>'
   return result
 })

scripts/helpers/aside_categories.js

@@ -25,7 +25,6 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
   const limit = options.limit === 0 ? categories.length : options.limit
   const isExpand = options.expand !== 'none'
   const expandClass = isExpand && options.expand === true ? 'expand' : ''
-
   const buttonLabel = this._p('aside.more_button')
   const prepareQuery = (parent) => {
     const query = {}
@@ -80,17 +79,19 @@ hexo.extend.helper.register('aside_categories', function (categories, options) {
   const list = hierarchicalList(limit, 0)
 
   const moreButton = function () {
-    let moreHtml = ''
     if (categories.length <= limit) return ''
-    moreHtml += '<li class="card-category-list-item more is-center">'
+    const moreHtml = `<a class="card-more-btn" href="${categoryDir}/" title="${buttonLabel}">
-    moreHtml += `<a class="card-category-list-link-more" href="${categoryDir}/">
+    <i class="fas fa-angle-right"></i></a>`
-                <span>${buttonLabel}</span><i class="fas fa-angle-right"></i></a></li>`
 
     return moreHtml
   }
 
-  return `<ul class="card-category-list" id="aside-cat-list">
+  return `<div class="item-headline">
-            ${list[0]}
+            <i class="fas fa-folder-open"></i>
+            <span>${this._p('aside.card_categories')}</span>
             ${moreButton()}
+            </div>
+            <ul class="card-category-list" id="aside-cat-list">
+            ${list[0]}
             </ul>`
 })

scripts/helpers/inject_head_js.js

@@ -0,0 +1,145 @@
+/**
+ * Butterfly
+ * inject js to head
+ */
+
+'use strict'
+
+hexo.extend.helper.register('inject_head_js', function () {
+  const { darkmode, aside, change_font_size } = this.theme
+
+  const localStore = `
+    win.saveToLocal = {
+      set: function setWithExpiry(key, value, ttl) {
+        if (ttl === 0) return
+        const now = new Date()
+        const expiryDay = ttl * 86400000
+        const item = {
+          value: value,
+          expiry: now.getTime() + expiryDay,
+        }
+        localStorage.setItem(key, JSON.stringify(item))
+      },
+
+      get: function getWithExpiry(key) {
+        const itemStr = localStorage.getItem(key)
+
+        if (!itemStr) {
+          return undefined
+        }
+        const item = JSON.parse(itemStr)
+        const now = new Date()
+
+        if (now.getTime() > item.expiry) {
+          localStorage.removeItem(key)
+          return undefined
+        }
+        return item.value
+      }
+    }
+  `
+
+  // https://stackoverflow.com/questions/16839698/jquery-getscript-alternative-in-native-javascript
+  const getScript = `
+    win.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)
+    })
+  `
+
+  let darkmodeJs = ''
+  if (darkmode.enable) {
+    darkmodeJs = `
+      win.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')
+        }
+      }
+      win.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 t = saveToLocal.get('theme')
+    `
+
+    const autoChangeMode = darkmode.autoChangeMode
+
+    if (autoChangeMode === 1) {
+      darkmodeJs += `
+          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) {
+      darkmodeJs += `
+          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 {
+      darkmodeJs += `
+          if (t === 'dark') activateDarkMode()
+          else if (t === 'light') activateLightMode()
+        `
+    }
+  }
+
+  let asideStatus = ''
+  if (aside.enable && aside.button) {
+    asideStatus = `
+      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')
+        }
+      }
+    `
+  }
+
+  let changFontAside = ''
+  if (change_font_size) {
+    changFontAside = `
+    const fontSizeVal = saveToLocal.get('global-font-size')
+    if (fontSizeVal !== undefined) {
+      document.documentElement.style.setProperty('--global-font-size', fontSizeVal + 'px')
+    }
+    `
+  }
+
+  return `<script>(win=>{${localStore + getScript + darkmodeJs + asideStatus + changFontAside}})(window)</script>`
+})

scripts/helpers/page.js

@@ -15,7 +15,7 @@ hexo.extend.helper.register('page_description', function () {
   let description = page.description || page.content || page.title || config.description
 
   if (description) {
-    description = escapeHTML(stripHTML(description).substring(0, 200)
+    description = escapeHTML(stripHTML(description).substring(0, 150)
       .trim()
     ).replace(/\n/g, ' ')
     return description
@@ -54,8 +54,8 @@ hexo.extend.helper.register('cloudTags', function (options = {}) {
   return result
 })
 
-hexo.extend.helper.register('urlNoIndex', function () {
+hexo.extend.helper.register('urlNoIndex', function (url = null) {
-  return prettyUrls(this.url, { trailing_index: false, trailing_html: false })
+  return prettyUrls(url || this.url, { trailing_index: false, trailing_html: false })
 })
 
 hexo.extend.helper.register('md5', function (path) {

scripts/tag/inlineImg.js

@@ -0,0 +1,17 @@
+/**
+ * inlineImg 圖片
+ * {% inlineImg src height %}
+ */
+
+'use strict'
+
+const urlFor = require('hexo-util').url_for.bind(hexo)
+
+function inlineImg (args) {
+  const img = args[0]
+  const height = args[1] ? `style="height:${args[1]}"` : ''
+
+  return `<img class="inline-img" src="${urlFor(img)}" ${height}/>`
+}
+
+hexo.extend.tag.register('inlineImg', inlineImg, { ends: false })

source/css/_global/function.styl

@@ -53,7 +53,7 @@ minWidth2000()
 if hexo-config('enter_transitions')
   #content-inner,
   #footer
-    animation: main 1s
+    animation: bottom-top 1s
 
   #page-header
     animation: header-effect 1s
@@ -121,14 +121,14 @@ if hexo-config('avatar.effect') == true
   100%
     transform: translateY(0)
 
-@keyframes main
+@keyframes bottom-top
   0%
     opacity: 0
-    transform: translateY(50px)
+    margin-top: 50px
 
   100%
     opacity: 1
-    transform: translateY(0)
+    margin-top: 0
 
 @keyframes titlescale
   0%

source/css/_global/index.styl

@@ -27,6 +27,8 @@
   --blockquote-bg: $blockquote-background-color
   --reward-pop: $reward-pop-up-bg
   --toc-link-color: $toc-link-color
+  --card-box-shadow: 0 3px 8px 6px rgba(7, 17, 27, .06)
+  --card-hover-box-shadow: 0 3px 8px 6px rgba(7, 17, 27, .15)
 
 html
   height: 100%
@@ -157,8 +159,8 @@ if $site-name-font
   #site-title,
   #site-subtitle,
   #site-name,
-  #aside_content .author-info__name,
+  #aside-content .author-info__name,
-  #aside_content .author-info__description
+  #aside-content .author-info__description
     font-family: $site-name-font
 
 .is-center

source/css/_highlight/highlight.styl

@@ -1,4 +1,3 @@
-// https://github.com/equinusocio/vsc-material-theme
 $highlight_theme = hexo-config('highlight_theme')
 $highlighEnable = hexo-config('highlight_settings') && hexo-config('highlight_settings.enable')
 $prismjsEnable = hexo-config('prismjs_settings') && hexo-config('prismjs_settings.enable')
@@ -6,6 +5,16 @@ wordWrap = !hexo-config('highlight_settings.line_number') && hexo-config('code_w
 
 @require 'theme'
 
+:root
+  --hl-color: $highlight-foreground
+  --hl-bg: $highlight-background
+  --hltools-bg: $highlight-tools.bg-color
+  --hltools-color: $highlight-tools.color
+  --hlnumber-bg: $highlight-gutter.bg-color
+  --hlnumber-color: $highlight-gutter.color
+  --hlscrollbar-bg: $highlight-scrollbar
+  --hlexpand-bg: linear-gradient(180deg, rgba($highlight-background, .6), rgba($highlight-background, .9))
+
 if $highlighEnable
   @require 'highlight/index'
 
@@ -16,8 +25,8 @@ $code-block
   overflow: auto
   margin: 0 0 1rem
   padding: 0
-  background: $highlight-background
+  background: var(--hl-bg)
-  color: $highlight-foreground
+  color: var(--hl-color)
   line-height: $line-height-code-block
 
   if wordWrap
@@ -56,9 +65,6 @@ blockquote
     padding: .1rem .2rem
     background: $code-background
     color: $code-foreground
-    word-wrap: break-word
-    word-break: break-word
-    overflow-wrap: break-word
 
   pre
     @extend $code-block
@@ -67,7 +73,7 @@ blockquote
     code
       padding: 0
       background: none
-      color: $highlight-foreground
+      color: var(--hl-color)
       text-shadow: none
 
   figure.highlight
@@ -88,10 +94,10 @@ blockquote
       a
         float: right
         padding-right: 10px
-        color: $highlight-foreground
+        color: var(--hl-color)
 
         &:hover
-          border-bottom-color: $highlight-foreground
+          border-bottom-color: var(--hl-color)
 
   .highlight-tools
     position: relative
@@ -100,8 +106,8 @@ blockquote
     overflow: hidden
     min-height: 1.2rem
     height: 2.15em
-    background: $highlight-tools.bg-color
+    background: var(--hltools-bg)
-    color: $highlight-tools.color
+    color: var(--hltools-color)
     font-size: $code-font-size
 
     &.closed + table
@@ -185,3 +191,38 @@ blockquote
 
         .code-lang
           left: 3.8rem !important
+
+  if hexo-config('highlight_height_limit')
+    .code-expand-btn
+      position: absolute
+      bottom: 0
+      z-index: 10
+      width: 100%
+      background: var(--hlexpand-bg)
+      text-align: center
+      font-size: $code-font-size
+      cursor: pointer
+
+      i
+        padding: .3rem 0
+        color: var(--hlnumber-color)
+        animation: code-expand-key 1.2s infinite
+
+      &.expand-done
+        display: none !important
+
+      &:not(.expand-done)
+        & ~ table,
+        & ~ pre
+          overflow: hidden
+          height: unit(hexo-config('highlight_height_limit'), px)
+
+@keyframes code-expand-key
+  0%
+    opacity: .6
+
+  50%
+    opacity: .1
+
+  100%
+    opacity: .6

source/css/_highlight/highlight/diff.styl

@@ -1,7 +1,7 @@
 figure.highlight
   table
     &::-webkit-scrollbar-thumb
-      background: $highlight-scrollbar
+      background: var(--hlscrollbar-bg)
 
   pre .deletion
     color: $highlight-deletion

source/css/_highlight/highlight/index.styl

@@ -9,7 +9,7 @@ if $highlight_theme != false
           display: inline-block
           padding: 0 .3rem 0 0
           min-width: 1.6rem
-          color: $highlight-gutter.color
+          color: var(--hlnumber-color)
           content: counter(line)
           counter-increment: line
           text-align: left
@@ -29,8 +29,8 @@ if $highlight_theme != false
     .gutter pre
       padding-right: .5rem
       padding-left: .5rem
-      background-color: $highlight-gutter.bg-color
+      background-color: var(--hlnumber-bg)
-      color: $highlight-gutter.color
+      color: var(--hlnumber-color)
       text-align: right
 
     .code pre

source/css/_highlight/prismjs/index.styl

@@ -7,7 +7,7 @@ if $highlight_theme != false
 #article-container
   pre[class*='language-']
     &::-webkit-scrollbar-thumb
-      background: $highlight-scrollbar
+      background: var(--hlscrollbar-bg)
 
     &:not(.line-numbers)
       padding: 10px 20px

source/css/_highlight/prismjs/line-number.styl

@@ -8,9 +8,16 @@
 
       > code
         position: relative
-        white-space: inherit
         line-height: $line-height-code-block
 
+        if hexo-config('code_word_wrap')
+          white-space: pre-wrap
+        else
+          white-space: inherit
+          word-wrap: normal
+          word-break: normal
+          overflow-wrap: normal
+
       .line-numbers-rows
         position: absolute
         top: 0
@@ -29,6 +36,6 @@
           &:before
             display: block
             padding-right: .8em
-            color: $highlight-gutter.color
+            color: var(--hlnumber-color)
             content: counter(linenumber)
             text-align: right

source/css/_layout/404.styl

@@ -18,7 +18,11 @@ if hexo-config('error_404.enable')
       height: 18rem
       border-radius: 8px
       background: var(--card-bg)
-      box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
+      box-shadow: var(--card-box-shadow)
+      transition: all .3s
+
+      &:hover
+        box-shadow: var(--card-hover-box-shadow)
 
       +maxWidth768()
         flex-direction: column
@@ -45,6 +49,7 @@ if hexo-config('error_404.enable')
         padding: .5rem
         text-align: center
         font-size: 14px
+
         if $site-name-font
           font-family: $site-name-font
 

source/css/_layout/aside.styl

@@ -1,4 +1,4 @@
-#aside_content
+#aside-content
   width: 25%
 
   +minWidth900()
@@ -20,13 +20,14 @@
     position: relative
     overflow: hidden
     margin-top: 1rem
+    padding: 1rem 1.2rem
     border-radius: 8px
     background: var(--card-bg)
-    box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
+    box-shadow: var(--card-box-shadow)
     transition: box-shadow .3s
 
     &:hover
-      box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
+      box-shadow: var(--card-hover-box-shadow)
 
     if hexo-config('aside.mobile') == false
       +maxWidth768()
@@ -53,7 +54,7 @@
 
     .card-info-data
       display: table
-      padding: .7rem 0
+      margin: .7rem 0 .2rem
       width: 100%
       table-layout: fixed
 
@@ -88,6 +89,7 @@
 
     #card-info-btn
       display: block
+      margin-top: .7rem
       background-color: var(--btn-bg)
       color: var(--btn-color)
       text-align: center
@@ -96,9 +98,6 @@
       span
         padding-left: .5rem
 
-  .card-content
-    padding: 1rem 1.2rem
-
   .item-headline
     padding-bottom: .3rem
     font-size: 1.2em
@@ -111,11 +110,12 @@
       position: sticky
       position: -webkit-sticky
       top: 20px
+      transition: top .3s
 
   .card-tag-cloud
     a
       display: inline-block
-      padding: 0 .1rem
+      padding: 0 .2rem
 
       &:hover
         color: $text-hover !important
@@ -214,16 +214,6 @@
           width: 20%
           text-align: right
 
-    &.more
-      span
-        padding-right: .3rem
-        width: auto !important
-        transition: .5s
-
-      &:hover
-        span
-          padding-right: .6rem
-
   .card-categories
     .card-category-list
       &.child
@@ -334,6 +324,21 @@
     > .card-widget
       margin-top: 0
 
+  .card-more-btn
+    float: right
+    color: inherit
+
+    &:hover
+      animation: more-btn-move 1s infinite
+
+@keyframes more-btn-move
+  0%,
+  100%
+    transform: translateX(0)
+
+  50%
+    transform: translateX(3px)
+
 @keyframes toc-open
   0%
     transform: scale(.7)
@@ -353,8 +358,37 @@
     .layout
       justify-content: center
 
-      > .aside_content
+      > .aside-content
         display: none
 
       > div:first-child
         width: 80%
+
+.page
+  .sticky_layout
+    display: flex
+    flex-direction: column
+
+  if hexo-config('aside.card_recent_post.sort_order')
+    .card-recent-post
+      order: hexo-config('aside.card_recent_post.sort_order')
+
+  if hexo-config('newest_comments.sort_order')
+    #card-newest-comments
+      order: hexo-config('newest_comments.sort_order')
+
+  if hexo-config('aside.card_categories.sort_order')
+    .card-categories
+      order: hexo-config('aside.card_categories.sort_order')
+
+  if hexo-config('aside.card_tags.sort_order')
+    .card-tags
+      order: hexo-config('aside.card_tags.sort_order')
+
+  if hexo-config('aside.card_archives.sort_order')
+    .card-archives
+      order: hexo-config('aside.card-archives.sort_order')
+
+  if hexo-config('aside.card_webinfo.sort_order')
+    .card-webinfo
+      order: hexo-config('aside.card_webinfo.sort_order')

source/css/_layout/head.styl

@@ -69,7 +69,7 @@
       font-size: 30px
 
   // page
-  &.not-index-bg
+  &.not-home-page
     height: 20rem
 
     +maxWidth768()
@@ -101,19 +101,6 @@
       background-color: alpha($dark-black, .5)
       content: ''
 
-  &.no-top-img
-    margin-bottom: .5rem
-    height: 60px
-    background: 0
-
-    #nav
-      background: rgba(255, 255, 255, .8)
-      box-shadow: 0 5px 6px -5px rgba(133, 133, 133, .6)
-
-      a
-        color: var(--font-color)
-        text-shadow: none
-
   #post-info
     position: absolute
     bottom: 5rem
@@ -129,6 +116,75 @@
       bottom: 1.1rem
       padding: 0 1.1rem
 
+  &.not-top-img
+    margin-bottom: .5rem
+    height: 60px
+    background: 0
+
+    #nav
+      background: rgba(255, 255, 255, .8)
+      box-shadow: 0 5px 6px -5px rgba(133, 133, 133, .6)
+
+      a
+        color: var(--font-color)
+        text-shadow: none
+
+  &.nav-fixed
+    #nav
+      position: fixed
+      top: -60px
+      z-index: 91
+      background: rgba(255, 255, 255, .8)
+      box-shadow: 0 5px 6px -5px alpha($grey, .6)
+      transition: transform .2s ease-in-out, opacity .2s ease-in-out
+
+      a,
+      #site-name,
+      #toggle-menu
+        color: var(--font-color)
+        text-shadow: none
+
+        &:hover
+          color: $light-blue
+
+  &.nav-visible
+    #nav
+      transition: all .5s
+      transform: translate3d(0, 100%, 0)
+
+    & + .layout
+      & > .aside-content > .sticky_layout
+        top: 70px
+        transition: top .5s
+
+// css hack
+// all browser in ios and safari in all apple device
+_::-webkit-full-page-media,
+_:future,
+:root #page-header.full_page
+  background-attachment: scroll !important
+
+#page
+  h1.page-title
+    margin: .4rem 0 1rem
+
+// for not top_img
+#post
+  & > #post-info
+    margin-bottom: 1.5rem
+
+    .post-title
+      padding-bottom: .2rem
+      border-bottom: 1px solid var(--light-grey)
+      color: var(--text-highlight-color)
+
+      .post-edit-link
+        float: right
+
+    #post-meta,
+    #post-meta a
+      color: #78818a
+
 #post-info
   .post-title
     @extend .limit-more-line
@@ -142,6 +198,9 @@
     +maxWidth768()
       font-size: 1.72em
 
+    .post-edit-link
+      padding-left: .5rem
+
   #post-meta
     color: var(--light-grey)
     font-size: 95%
@@ -183,27 +242,6 @@
       time
         display: none
 
-// for not top_img
-#post
-  & > #post-info
-    margin-bottom: 1.5rem
-
-    .post-title
-      padding-bottom: .2rem
-      border-bottom: 1px solid var(--light-grey)
-      color: var(--text-highlight-color)
-
-    #post-meta,
-    #post-meta a
-      color: #78818a
-
-// css hack
-// all browser in ios and safari in all apple device
-_::-webkit-full-page-media,
-_:future,
-:root #page-header.full_page
-  background-attachment: scroll !important
-
 #nav
   position: absolute
   top: 0
@@ -221,10 +259,6 @@ _:future,
   +maxWidth768()
     padding: 0 16px
 
-  &:not(.fixed)
-    #menus
-      padding-right: 0 !important
-
   &.show
     opacity: 1
 
@@ -245,27 +279,6 @@ _:future,
     &:hover
       color: var(--white)
 
-  &.fixed
-    position: fixed
-    top: -60px
-    z-index: 91
-    background: rgba(255, 255, 255, .8)
-    box-shadow: 0 5px 6px -5px alpha($grey, .6)
-    transition: transform .2s ease-in-out, opacity .2s ease-in-out
-
-    a,
-    #site-name,
-    #toggle-menu
-      color: var(--font-color)
-      text-shadow: none
-
-      &:hover
-        color: $light-blue
-
-  &.visible
-    transition: all .5s
-    transform: translate3d(0, 100%, 0)
-
   #site-name
     text-shadow: .1rem .1rem .2rem rgba($dark-black, .15)
     font-weight: bold
@@ -290,22 +303,6 @@ _:future,
         padding: 4px
         transition: transform .3s
 
-      & > a
-        &:after
-          position: absolute
-          bottom: 0
-          left: 0
-          z-index: -1
-          width: 0
-          height: 3px
-          background-color: lighten($theme-color, 30%)
-          content: ''
-          transition: all .3s ease-in-out
-
-        &:hover
-          &:after
-            width: 100%
-
       .menus_item_child
         position: absolute
         right: 0
@@ -335,8 +332,8 @@ _:future,
             display: inline-block
             padding: .3rem .7rem
             width: 100%
-            color: var(--font-color)
+            color: var(--font-color) !important
-            text-shadow: none
+            text-shadow: none !important
 
   &.hide-menu
     #toggle-menu
@@ -364,3 +361,19 @@ _:future,
     text-shadow: .05rem .05rem .1rem rgba($dark-black, .3)
     font-size: .78em
     cursor: pointer
+
+    &:not(.child)
+      &:after
+        position: absolute
+        bottom: 0
+        left: 0
+        z-index: -1
+        width: 0
+        height: 3px
+        background-color: lighten($theme-color, 30%)
+        content: ''
+        transition: all .3s ease-in-out
+
+      &:hover
+        &:after
+          width: 100%

source/css/_layout/pagination.styl

@@ -75,5 +75,5 @@
         transform: scale(1.1)
 
   &.pagination-post
-    margin: 2rem 0 !important
+    margin-top: 2rem
     background: $dark-black

source/css/_layout/post.styl

@@ -152,6 +152,7 @@ no-beautify()
       text-decoration: underline
 
   img
+    display: block
     margin: 0 auto .8rem
 
   p
@@ -160,6 +161,20 @@ no-beautify()
   iframe
     margin: 0 0 1rem
 
+  kbd
+    margin: 0 3px
+    padding: 3px 5px
+    border: 1px solid #b4b4b4
+    border-radius: 3px
+    background-color: #f8f8f8
+    box-shadow: 0 1px 3px rgba(0, 0, 0, .25), 0 2px 1px 0 rgba(255, 255, 255, .6) inset
+    color: #34495e
+    white-space: nowrap
+    font-weight: 600
+    font-size: .9em
+    font-family: Monaco, 'Ubuntu Mono', monospace
+    line-height: 1em
+
   if hexo-config('beautify.enable') && hexo-config('beautify.field') == 'site'
     beautify()
   else if hexo-config('beautify.enable') && hexo-config('beautify.field') == 'post'
@@ -171,9 +186,6 @@ no-beautify()
     no-beautify()
 
 #post
-  img
-    display: block
-
   .tag_share
     .post-meta
       &__tag-list
@@ -218,24 +230,13 @@ no-beautify()
     transition: box-shadow .3s ease-in-out
 
     &:before
+      @extend .fontawesomeIcon
       position: absolute
-      top: t = .5rem
+      top: .1rem
-      right: t
+      right: .6rem
-      width: w = .8rem
+      color: $theme-color
-      height: w
+      content: '\f1f9'
-      border-radius: w
+      font-size: 1rem
-      background: $light-blue
-      content: ''
-
-    &:after
-      position: absolute
-      top: t = .7rem
-      right: t
-      width: w = .4rem
-      height: w
-      border-radius: w
-      background: var(--card-bg)
-      content: ''
 
     &:hover
       box-shadow: 0 0 8px 0 rgba(232, 237, 250, .6), 0 2px 4px 0 rgba(232, 237, 250, .5)

source/css/_layout/relatedposts.styl

@@ -1,5 +1,5 @@
 .relatedPosts
-  margin-top: 1rem
+  margin-top: 2rem
 
   & > .headline
     margin-bottom: 5px

source/css/_layout/reward.styl

@@ -12,60 +12,58 @@
     cursor: pointer
     transition: all .4s
 
-    &:hover
+  &:hover
-      box-shadow: inset 9em 0 0 0 var(--btn-hover-color)
+    & > .reward-main
+      display: block
 
-      .reward-main
+  .reward-main
-        display: block
+    position: absolute
+    bottom: 40px
+    left: 0
+    z-index: 100
+    display: none
+    padding: 0 0 15px
+    width: 100%
 
-    .reward-main
+    .reward-all
-      position: absolute
+      display: inline-block
-      bottom: 40px
+      margin: 0
-      left: 0
+      padding: 1rem .5rem
-      z-index: 100
+      border-radius: 4px
-      display: none
+      background: var(--reward-pop)
-      padding: 0 0 15px
-      width: 100%
 
-      .reward-all
+      &:before
+        position: absolute
+        bottom: -10px
+        left: 0
+        width: 100%
+        height: 20px
+        content: ''
+
+      &:after
+        position: absolute
+        right: 0
+        bottom: 2px
+        left: 0
+        margin: 0 auto
+        width: 0
+        height: 0
+        border-top: 13px solid var(--reward-pop)
+        border-right: 13px solid transparent
+        border-left: 13px solid transparent
+        content: ''
+
+      .reward-item
         display: inline-block
-        margin: 0
+        padding: 0 8px
-        padding: 1rem .5rem
+        list-style-type: none
-        border-radius: 4px
+        vertical-align: top
-        background: var(--reward-pop)
 
-        &:before
+        img
-          position: absolute
+          width: 130px
-          bottom: -10px
+          height: 130px
-          left: 0
-          width: 100%
-          height: 20px
-          content: ''
 
-        &:after
+        .post-qr-code-desc
-          position: absolute
+          padding-top: .4rem
-          right: 0
+          width: 130px
-          bottom: 2px
+          color: $reward-pop-up-color
-          left: 0
-          margin: 0 auto
-          width: 0
-          height: 0
-          border-top: 13px solid var(--reward-pop)
-          border-right: 13px solid transparent
-          border-left: 13px solid transparent
-          content: ''
-
-        .reward-item
-          display: inline-block
-          padding: 0 8px
-          list-style-type: none
-          vertical-align: top
-
-          img
-            width: 130px
-            height: 130px
-
-          .post-qr-code-desc
-            padding-top: .4rem
-            width: 130px
-            color: $reward-pop-up-color

source/css/_layout/rightside.styl

@@ -24,7 +24,6 @@
       color: var(--btn-color)
       text-align: center
       font-size: 16px
-      cursor: pointer
 
       &:hover
         background-color: var(--btn-hover-color)

source/css/_layout/third-party.styl

@@ -1,4 +1,5 @@
-#vcomment
+#vcomment,
+#waline
   font-size: 1.1em
 
   .vbtn
@@ -9,13 +10,6 @@
     &:hover
       background: var(--btn-hover-color)
 
-  if hexo-config('valine.bg')
-    textarea
-      background: url(hexo-config('valine.bg')) 100% 100% no-repeat
-
-      &:focus
-        background-image: none
-
   .vimg
     transition: all .3s
 
@@ -27,6 +21,22 @@
     &:after
       z-index: 22
 
+if hexo-config('valine.bg')
+  #vcomment
+    textarea
+      background: url(hexo-config('valine.bg')) 100% 100% no-repeat
+
+      &:focus
+        background-image: none
+
+if hexo-config('waline.bg')
+  #waline-wrap
+    textarea
+      background: url(hexo-config('waline.bg')) 100% 100% no-repeat
+
+      &:focus
+        background-image: none
+
 .fireworks
   position: fixed
   top: 0

source/css/_mode/darkmode.styl

@@ -27,6 +27,14 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
     --blockquote-bg: lighten(#121212, 10)
     --reward-pop: lighten(#121212, 10)
     --toc-link-color: alpha(#FFFFFF, .6)
+    --hl-color: alpha(#FFFFFF, .7)
+    --hl-bg: lighten(#121212, 2)
+    --hltools-bg: lighten(#121212, 3)
+    --hltools-color: #90a4ae
+    --hlnumber-bg: lighten(#121212, 2)
+    --hlnumber-color: alpha(#FFFFFF, .4)
+    --hlscrollbar-bg: lighten(#121212, 5)
+    --hlexpand-bg: linear-gradient(180deg, rgba(lighten(#121212, 2), .6), rgba(lighten(#121212, 2), .9))
 
     #web_bg:before,
     #footer:before,
@@ -42,7 +50,10 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
         background: #2c2c2c
 
       pre > code
-        background: 0
+        background: lighten(#121212, 2)
+
+      figure.highlight
+        box-shadow: none
 
       .note
         code
@@ -51,40 +62,18 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
       .aplayer
         filter: brightness(.8)
 
+      kbd
+        border-color: #696969
+        background-color: #525252
+        color: #e2f1ff
+
     // 頭部
     #page-header
-      & > #nav.fixed,
+      &.nav-fixed > #nav,
-      &.no-top-img #nav
+      &.not-top-img > #nav
         background: alpha(#121212, .8)
         box-shadow: 0 5px 6px -5px rgba(133, 133, 133, 0)
 
-    // 代碼框
-    #article-container
-      pre,
-      .highlight:not(.js-file-line-container)
-        background-color: lighten(#121212, 2) !important
-        color: alpha(#FFFFFF, .7) !important
-
-      figure.highlight
-        box-shadow: none
-
-        if hexo-config('highlight_settings') && hexo-config('highlight_settings.enable')
-          table::-webkit-scrollbar-thumb
-            background: lighten(#121212, 5)
-
-          .line:before
-            color: alpha(#FFFFFF, .7) !important
-
-          .hljs
-            background-color: lighten(#121212, 2) !important
-
-        pre[class*='language-']::-webkit-scrollbar-thumb
-          background: lighten(#121212, 5)
-
-        .highlight-tools
-          background: lighten(#121212, 3) !important
-          color: #90a4ae !important
-
     #post-comment
       #comment-switch
         if hexo-config('comments.text')
@@ -110,19 +99,9 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
     .ads-wrap
       filter: brightness(.8)
 
-    #aside_content .aside-list > .aside-list-item:not(:last-child)
+    #aside-content .aside-list > .aside-list-item:not(:last-child)
       border-bottom: 1px dashed alpha(#FFFFFF, .1)
 
-    // 第三方
-    // 插件 hexo-blog-encrypt
-    #hexo-blog-encrypt
-      label,
-      input
-        color: alpha(#FFFFFF, .7) !important
-
-      input
-        background-color: #121212
-
     // Gitalk
     #gitalk-container
       filter: brightness(.8)
@@ -130,7 +109,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
       svg
         fill: alpha(#FFFFFF, .9) !important
 
-    // Disqus and Disqusjs
+    // Disqusjs 反代模式下的適配
     #disqus_thread
       #dsqjs
         .dsqjs-tab-active,

source/css/_mode/readmode.styl

@@ -7,7 +7,10 @@ if hexo-config('readmode')
     --gray: #d6dbdf
     --hr-border: #d6dbdf
     --hr-before-color: darken(#d6dbdf, 10)
-    -highlight-bg: #f7f7f7
+    --highlight-bg: #f7f7f7
+    --exit-btn-bg: #C0C0C0
+    --exit-btn-color: #fff
+    --exit-btn-hover: darken(#C0C0C0, 20)
 
   [data-theme='dark']
     .read-mode
@@ -18,16 +21,31 @@ if hexo-config('readmode')
       --gray: rgba(255, 255, 255, .7)
       --hr-border: rgba(255, 255, 255, .5)
       --hr-before-color: rgba(255, 255, 255, .7)
-      -highlight-bg: #171717
+      --highlight-bg: #171717
+      --exit-btn-bg: #1f1f1f
+      --exit-btn-color: rgba(255, 255, 255, .9)
+      --exit-btn-hover: lighten(#1f1f1f, 20)
 
   .read-mode
     background: var(--readmode-light-color)
 
-    #aside_content
+    .exit-readmode
-      display: none
+      position: fixed
+      top: 30px
+      right: 30px
+      width: 40px
+      height: 40px
+      border-radius: 8px
+      background: var(--exit-btn-bg)
+      color: var(--exit-btn-color)
+      font-size: 16px
+      transition: background .3s
 
-    #body-wrap
+      &:hover
-      padding-left: 0 !important
+        background: var(--exit-btn-hover)
+
+    #aside-content
+      display: none
 
     #page-header.post-bg
       background-color: transparent
@@ -37,7 +55,6 @@ if hexo-config('readmode')
         opacity: 0
 
       & > #post-info
-        padding: 0
         text-align: center
 
     #post
@@ -54,29 +71,20 @@ if hexo-config('readmode')
     .highlight-tools,
     #footer,
     #post > *:not(#post-info):not(.post-content),
-    #to_comment,
-    #mobile-toc-button,
     #nav,
     .post-outdate-notice,
-    #web_bg
+    #web_bg,
+    #rightside,
+    .not-top-img
       display: none !important
 
-    if !hexo-config('chat_btn')
-      #chatra,
-      #tidio-chat-code,
-      #tidio-chat,
-      #daodream-container,
-      .gitter-chat-embed,
-      .gitter-open-chat-button
-        display: none !important
-
     #article-container
       a
         color: #99a9bf
 
       pre,
       .highlight:not(.js-file-line-container)
-        background: var(-highlight-bg) !important
+        background: var(--highlight-bg) !important
 
         *
           color: var(--font-color) !important
@@ -155,6 +163,12 @@ if hexo-config('readmode')
         border-left: .2rem solid var(--gray)
         background-color: var(--readmode-light-color)
 
+      kbd
+        border: 1px solid var(--gray)
+        background-color: transparent
+        box-shadow: none
+        color: var(--font-color)
+
       .hide-toggle
         border: 1px solid var(--gray) !important
 
@@ -183,3 +197,7 @@ if hexo-config('readmode')
         filter: none
         background-color: var(--readmode-light-color) !important
         color: var(--font-color)
+
+        &:before,
+        .note-icon
+          color: var(--font-color)

source/css/_page/common.styl

@@ -8,7 +8,7 @@
     flex-direction: column
 
   +maxWidth768()
-    padding: 1rem 5px !important
+    padding: 1rem 5px
 
   +minWidth2000()
     max-width: 1500px
@@ -18,10 +18,10 @@
     padding: 50px 40px
     border-radius: 8px
     background: var(--card-bg)
-    box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
+    box-shadow: var(--card-box-shadow)
 
     &:hover
-      box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
+      box-shadow: var(--card-hover-box-shadow)
 
     +maxWidth768()
       padding: 1.8rem .7rem !important
@@ -46,7 +46,3 @@
 
     & > div
       width: 100% !important
-
-#page
-  h1.page-title
-    margin-top: .4rem

source/css/_page/flink.styl

@@ -1,76 +1,77 @@
-.flink#article-container
+#article-container
-  .flink-desc
+  .flink
-    margin: .2rem 0 .5rem
+    .flink-desc
+      margin: .2rem 0 .5rem
 
-  .flink-list
+    .flink-list
-    overflow: auto
+      overflow: auto
-    padding: 10px 10px 0
+      padding: 10px 10px 0
-    text-align: center
+      text-align: center
 
-    & > .flink-list-item
+      & > .flink-list-item
-      position: relative
+        position: relative
-      float: left
+        float: left
-      overflow: hidden
+        overflow: hidden
-      margin: 15px 7px
+        margin: 15px 7px
-      width: calc(100% / 3 - 15px)
+        width: calc(100% / 3 - 15px)
-      height: 90px
+        height: 90px
-      border-radius: 8px
+        border-radius: 8px
-      line-height: 17px
+        line-height: 17px
-      -webkit-transform: translateZ(0)
+        -webkit-transform: translateZ(0)
 
-      +maxWidth1024()
+        +maxWidth1024()
-        width: calc(50% - 15px) !important
+          width: calc(50% - 15px) !important
 
-      +maxWidth600()
+        +maxWidth600()
-        width: calc(100% - 15px) !important
+          width: calc(100% - 15px) !important
 
-      &:hover
+        &:hover
-        img
+          img
-          transform: rotate(360deg)
+            transform: rotate(360deg)
 
-      &:before
+        &:before
-        position: absolute
+          position: absolute
-        top: 0
+          top: 0
-        right: 0
+          right: 0
-        bottom: 0
+          bottom: 0
-        left: 0
+          left: 0
-        z-index: -1
+          z-index: -1
-        background: var(--text-bg-hover)
+          background: var(--text-bg-hover)
-        content: ''
+          content: ''
-        transition: transform .3s ease-out
+          transition: transform .3s ease-out
-        transform: scale(0)
+          transform: scale(0)
 
-      &:hover:before,
+        &:hover:before,
-      &:focus:before,
+        &:focus:before,
-      &:active:before
+        &:active:before
-        transform: scale(1)
+          transform: scale(1)
 
-      a
+        a
-        color: var(--font-color)
+          color: var(--font-color)
-        text-decoration: none
+          text-decoration: none
 
-        img
+          img
-          float: left
+            float: left
-          margin: 15px 10px
+            margin: 15px 10px
-          width: 60px
+            width: 60px
-          height: 60px
+            height: 60px
-          border-radius: 35px
+            border-radius: 35px
-          transition: all .3s
+            transition: all .3s
 
-        .img-alt
+          .img-alt
-          display: none
+            display: none
 
-        .flink-item-name
+          .flink-item-name
-          @extend .limit-one-line
+            @extend .limit-one-line
-          display: block
+            display: block
-          padding: 16px 10px 0 0
+            padding: 16px 10px 0 0
-          height: 40px
+            height: 40px
-          font-weight: bold
+            font-weight: bold
-          font-size: 1.43em
+            font-size: 1.43em
 
-        .flink-item-desc
+          .flink-item-desc
-          @extend .limit-one-line
+            @extend .limit-one-line
-          display: block
+            display: block
-          padding: 16px 10px 16px 0
+            padding: 16px 10px 16px 0
-          height: 50px
+            height: 50px
-          font-size: .93em
+            font-size: .93em

source/css/_page/homepage.styl

@@ -9,14 +9,14 @@
     height: 20em
     border-radius: 12px 8px 8px 12px
     background: var(--card-bg)
-    box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
+    box-shadow: var(--card-box-shadow)
     transition: all .3s
 
     +maxWidth768()
       border-radius: 12px 12px 8px 8px
 
     &:hover
-      box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
+      box-shadow: var(--card-hover-box-shadow)
 
       img.post_bg
         transform: scale(1.1)

source/css/_tags/inlineImg.styl

@@ -0,0 +1,6 @@
+#article-container
+  .inline-img
+    display: inline
+    margin: 0 3px
+    height: 1.1em
+    vertical-align: text-bottom

source/css/var.styl

@@ -28,7 +28,7 @@ $title-prefix-icon = $beautifyEnable ? hexo-config('beautify.title-prefix-icon')
 $title-prefix-icon-color = $beautifyEnable ? convert(hexo-config('beautify.title-prefix-icon-color')) : $light-red
 // Global Variables
 $font-size = hexo-config('font.global-font-size') ? convert(hexo-config('font.global-font-size')) : 14px
-$code-font-size = hexo-config('font.code-font-size') ? convert(hexo-config('font.code-font-size')) : $font-size
+$code-font-size = hexo-config('font.code-font-size') ? convert(hexo-config('font.code-font-size')) : var(--global-font-size)
 $font-color = #1F2D3D
 $rem = 20px
 $text-line-height = 2

source/js/main.js

@@ -1,17 +1,16 @@
 document.addEventListener('DOMContentLoaded', function () {
-  let blogNameWidth = document.getElementById('site-name').offsetWidth
+  const $blogName = document.getElementById('site-name')
+  let blogNameWidth = $blogName && $blogName.offsetWidth
   const $menusEle = document.querySelector('#menus .menus_items')
   let menusWidth = $menusEle && $menusEle.offsetWidth
   const $searchEle = document.querySelector('#search-button')
   let searchWidth = $searchEle && $searchEle.offsetWidth
-  let detectFontSizeChange = false
 
-  const adjustMenu = () => {
+  const adjustMenu = (change = false) => {
-    if (detectFontSizeChange) {
+    if (change) {
-      blogNameWidth = document.getElementById('site-name').offsetWidth
+      blogNameWidth = $blogName && $blogName.offsetWidth
       menusWidth = $menusEle && $menusEle.offsetWidth
       searchWidth = $searchEle && $searchEle.offsetWidth
-      detectFontSizeChange = false
     }
     const $nav = document.getElementById('nav')
     let t
@@ -82,123 +81,142 @@ document.addEventListener('DOMContentLoaded', function () {
  * 只適用於Hexo默認的代碼渲染
  */
   const addHighlightTool = function () {
-    const isHighlightCopy = GLOBAL_CONFIG.highlight.highlightCopy
+    const highLight = GLOBAL_CONFIG.highlight
-    const isHighlightLang = GLOBAL_CONFIG.highlight.highlightLang
+    if (!highLight) return
+
+    const isHighlightCopy = highLight.highlightCopy
+    const isHighlightLang = highLight.highlightLang
     const isHighlightShrink = GLOBAL_CONFIG_SITE.isHighlightShrink
+    const highlightHeightLimit = highLight.highlightHeightLimit
     const isShowTool = isHighlightCopy || isHighlightLang || isHighlightShrink !== undefined
-    const $figureHighlight = GLOBAL_CONFIG.highlight.plugin === 'highlighjs' ? document.querySelectorAll('figure.highlight') : document.querySelectorAll('pre[class*="language-"]')
+    const $figureHighlight = highLight.plugin === 'highlighjs' ? document.querySelectorAll('figure.highlight') : document.querySelectorAll('pre[class*="language-"]')
 
-    if (isShowTool && $figureHighlight.length) {
+    if (!((isShowTool || highlightHeightLimit) && $figureHighlight.length)) return
-      const isPrismjs = GLOBAL_CONFIG.highlight.plugin === 'prismjs'
 
-      let highlightShrinkEle = ''
+    const isPrismjs = highLight.plugin === 'prismjs'
-      let highlightCopyEle = ''
-      const highlightShrinkClass = isHighlightShrink === true ? 'closed' : ''
 
-      if (isHighlightShrink !== undefined) {
+    let highlightShrinkEle = ''
-        highlightShrinkEle = `<i class="fas fa-angle-down expand ${highlightShrinkClass}"></i>`
+    let highlightCopyEle = ''
-      }
+    const highlightShrinkClass = isHighlightShrink === true ? 'closed' : ''
 
-      if (isHighlightCopy) {
+    if (isHighlightShrink !== undefined) {
-        highlightCopyEle = '<div class="copy-notice"></div><i class="fas fa-paste copy-button"></i>'
+      highlightShrinkEle = `<i class="fas fa-angle-down expand ${highlightShrinkClass}"></i>`
-      }
+    }
 
-      const copy = (text, ctx) => {
+    if (isHighlightCopy) {
-        if (document.queryCommandSupported && document.queryCommandSupported('copy')) {
+      highlightCopyEle = '<div class="copy-notice"></div><i class="fas fa-paste copy-button"></i>'
-          document.execCommand('copy')
+    }
-          if (GLOBAL_CONFIG.Snackbar !== undefined) {
+
-            btf.snackbarShow(GLOBAL_CONFIG.copy.success)
+    const copy = (text, ctx) => {
-          } else {
+      if (document.queryCommandSupported && document.queryCommandSupported('copy')) {
-            const prevEle = ctx.previousElementSibling
+        document.execCommand('copy')
-            prevEle.innerText = GLOBAL_CONFIG.copy.success
+        if (GLOBAL_CONFIG.Snackbar !== undefined) {
-            prevEle.style.opacity = 1
+          btf.snackbarShow(GLOBAL_CONFIG.copy.success)
-            setTimeout(() => { prevEle.style.opacity = 0 }, 700)
-          }
         } else {
-          if (GLOBAL_CONFIG.Snackbar !== undefined) {
+          const prevEle = ctx.previousElementSibling
-            btf.snackbarShow(GLOBAL_CONFIG.copy.noSupport)
+          prevEle.innerText = GLOBAL_CONFIG.copy.success
-          } else {
+          prevEle.style.opacity = 1
-            ctx.previousElementSibling.innerText = GLOBAL_CONFIG.copy.noSupport
+          setTimeout(() => { prevEle.style.opacity = 0 }, 700)
-          }
-        }
-      }
-
-      // click events
-      const highlightCopyFn = (ele) => {
-        const $buttonParent = ele.parentNode
-        $buttonParent.classList.add('copy-true')
-        const selection = window.getSelection()
-        const range = document.createRange()
-        if (isPrismjs) range.selectNodeContents($buttonParent.querySelectorAll('pre code')[0])
-        else range.selectNodeContents($buttonParent.querySelectorAll('table .code pre')[0])
-        selection.removeAllRanges()
-        selection.addRange(range)
-        const text = selection.toString()
-        copy(text, ele.lastChild)
-        selection.removeAllRanges()
-        $buttonParent.classList.remove('copy-true')
-      }
-
-      const highlightShrinkFn = (ele) => {
-        const $nextEle = [...ele.parentNode.children].slice(1)
-        ele.firstChild.classList.toggle('closed')
-        if (btf.isHidden($nextEle[0])) {
-          $nextEle.forEach(e => { e.style.display = 'block' })
-        } else {
-          $nextEle.forEach(e => { e.style.display = 'none' })
-        }
-      }
-
-      const highlightToolsFn = function (e) {
-        const $target = e.target.classList
-        if ($target.contains('expand')) highlightShrinkFn(this)
-        else if ($target.contains('copy-button')) highlightCopyFn(this)
-      }
-
-      const createEle = () => {
-        const newEle = document.createElement('div')
-        newEle.className = `highlight-tools ${highlightShrinkClass}`
-        newEle.addEventListener('click', highlightToolsFn)
-        return newEle
-      }
-
-      if (isHighlightLang) {
-        if (isPrismjs) {
-          $figureHighlight.forEach(function (item) {
-            const langName = item.getAttribute('data-language') !== undefined ? item.getAttribute('data-language') : 'Code'
-            const highlightLangEle = `<div class="code-lang">${langName}</div>`
-            btf.wrap(item, 'figure', '', 'highlight')
-            const newEle = createEle()
-            newEle.innerHTML = highlightShrinkEle + highlightLangEle + highlightCopyEle
-            item.parentNode.insertBefore(newEle, item)
-          })
-        } else {
-          $figureHighlight.forEach(function (item) {
-            let langName = item.getAttribute('class').split(' ')[1]
-            if (langName === 'plain' || langName === undefined) langName = 'Code'
-            const highlightLangEle = `<div class="code-lang">${langName}</div>`
-            const newEle = createEle()
-            newEle.innerHTML = highlightShrinkEle + highlightLangEle + highlightCopyEle
-            item.insertBefore(newEle, item.firstChild)
-          })
         }
       } else {
-        if (isPrismjs) {
+        if (GLOBAL_CONFIG.Snackbar !== undefined) {
-          $figureHighlight.forEach(function (item) {
+          btf.snackbarShow(GLOBAL_CONFIG.copy.noSupport)
-            btf.wrap(item, 'figure', '', 'highlight')
-            const newEle = createEle()
-            newEle.innerHTML = highlightShrinkEle + highlightCopyEle
-            item.parentNode.insertBefore(newEle, item)
-          })
         } else {
-          $figureHighlight.forEach(function (item) {
+          ctx.previousElementSibling.innerText = GLOBAL_CONFIG.copy.noSupport
-            const newEle = createEle()
-            newEle.innerHTML = highlightShrinkEle + highlightCopyEle
-            item.insertBefore(newEle, item.firstChild)
-          })
         }
       }
     }
+
+    // click events
+    const highlightCopyFn = (ele) => {
+      const $buttonParent = ele.parentNode
+      $buttonParent.classList.add('copy-true')
+      const selection = window.getSelection()
+      const range = document.createRange()
+      if (isPrismjs) range.selectNodeContents($buttonParent.querySelectorAll('pre code')[0])
+      else range.selectNodeContents($buttonParent.querySelectorAll('table .code pre')[0])
+      selection.removeAllRanges()
+      selection.addRange(range)
+      const text = selection.toString()
+      copy(text, ele.lastChild)
+      selection.removeAllRanges()
+      $buttonParent.classList.remove('copy-true')
+    }
+
+    const highlightShrinkFn = (ele) => {
+      const $nextEle = [...ele.parentNode.children].slice(1)
+      ele.firstChild.classList.toggle('closed')
+      if (btf.isHidden($nextEle[$nextEle.length - 1])) {
+        $nextEle.forEach(e => { e.style.display = 'block' })
+      } else {
+        $nextEle.forEach(e => { e.style.display = 'none' })
+      }
+    }
+
+    const highlightToolsFn = function (e) {
+      const $target = e.target.classList
+      if ($target.contains('expand')) highlightShrinkFn(this)
+      else if ($target.contains('copy-button')) highlightCopyFn(this)
+    }
+
+    const expandCode = function () {
+      this.classList.toggle('expand-done')
+    }
+
+    function createEle (lang, item, service) {
+      const fragment = document.createDocumentFragment()
+
+      if (isShowTool) {
+        const hlTools = document.createElement('div')
+        hlTools.className = `highlight-tools ${highlightShrinkClass}`
+        hlTools.innerHTML = highlightShrinkEle + lang + highlightCopyEle
+        hlTools.addEventListener('click', highlightToolsFn)
+        fragment.appendChild(hlTools)
+      }
+
+      if (highlightHeightLimit && item.offsetHeight > highlightHeightLimit + 30) {
+        const ele = document.createElement('div')
+        ele.className = 'code-expand-btn'
+        ele.innerHTML = '<i class="fas fa-angle-double-down"></i>'
+        ele.addEventListener('click', expandCode)
+        fragment.appendChild(ele)
+      }
+
+      if (service === 'hl') {
+        item.insertBefore(fragment, item.firstChild)
+      } else {
+        item.parentNode.insertBefore(fragment, item)
+      }
+    }
+
+    if (isHighlightLang) {
+      if (isPrismjs) {
+        $figureHighlight.forEach(function (item) {
+          const langName = item.getAttribute('data-language') ? item.getAttribute('data-language') : 'Code'
+          const highlightLangEle = `<div class="code-lang">${langName}</div>`
+          btf.wrap(item, 'figure', '', 'highlight')
+          createEle(highlightLangEle, item)
+        })
+      } else {
+        $figureHighlight.forEach(function (item) {
+          let langName = item.getAttribute('class').split(' ')[1]
+          if (langName === 'plain' || langName === undefined) langName = 'Code'
+          const highlightLangEle = `<div class="code-lang">${langName}</div>`
+          createEle(highlightLangEle, item, 'hl')
+        })
+      }
+    } else {
+      if (isPrismjs) {
+        $figureHighlight.forEach(function (item) {
+          btf.wrap(item, 'figure', '', 'highlight')
+          createEle('', item)
+        })
+      } else {
+        $figureHighlight.forEach(function (item) {
+          createEle('', item, 'hl')
+        })
+      }
+    }
   }
 
   /**
@@ -316,7 +334,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     let initTop = 0
     let isChatShow = true
-    const $nav = document.getElementById('nav')
+    const $header = document.getElementById('page-header')
     const isChatBtnHide = typeof chatBtnHide === 'function'
     const isChatBtnShow = typeof chatBtnShow === 'function'
     window.addEventListener('scroll', btf.throttle(function (e) {
@@ -324,25 +342,25 @@ document.addEventListener('DOMContentLoaded', function () {
       const isDown = scrollDirection(currentTop)
       if (currentTop > 56) {
         if (isDown) {
-          if ($nav.classList.contains('visible')) $nav.classList.remove('visible')
+          if ($header.classList.contains('nav-visible')) $header.classList.remove('nav-visible')
           if (isChatBtnShow && isChatShow === true) {
             chatBtnHide()
             isChatShow = false
           }
         } else {
-          if (!$nav.classList.contains('visible')) $nav.classList.add('visible')
+          if (!$header.classList.contains('nav-visible')) $header.classList.add('nav-visible')
           if (isChatBtnHide && isChatShow === false) {
             chatBtnShow()
             isChatShow = true
           }
         }
-        $nav.classList.add('fixed')
+        $header.classList.add('nav-fixed')
         if (window.getComputedStyle($rightside).getPropertyValue('opacity') === '0') {
           $rightside.style.cssText = 'opacity: 1; transform: translateX(-38px)'
         }
       } else {
         if (currentTop === 0) {
-          $nav.classList.remove('fixed', 'visible')
+          $header.classList.remove('nav-fixed', 'nav-visible')
         }
         $rightside.style.cssText = "opacity: ''; transform: ''"
       }
@@ -449,7 +467,7 @@ document.addEventListener('DOMContentLoaded', function () {
       let currentIndex = ''
 
       list.forEach(function (ele, index) {
-        if (top > btf.getEleTop(ele) - 70) {
+        if (top > btf.getEleTop(ele) - 80) {
           currentId = '#' + encodeURI(ele.getAttribute('id'))
           currentIndex = index
         }
@@ -488,7 +506,20 @@ document.addEventListener('DOMContentLoaded', function () {
  */
   const rightSideFn = {
     switchReadMode: () => { // read-mode
-      document.body.classList.toggle('read-mode')
+      const $body = document.body
+      $body.classList.add('read-mode')
+      const newEle = document.createElement('button')
+      newEle.type = 'button'
+      newEle.className = 'fas fa-sign-out-alt exit-readmode'
+      $body.appendChild(newEle)
+
+      function clickFn () {
+        $body.classList.remove('read-mode')
+        newEle.remove()
+        newEle.removeEventListener('click', clickFn)
+      }
+
+      newEle.addEventListener('click', clickFn)
     },
     switchDarkMode: () => { // Switch Between Light And Dark Mode
       const nowMode = document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
@@ -523,17 +554,16 @@ document.addEventListener('DOMContentLoaded', function () {
     adjustFontSize: (plus) => {
       const fontSizeVal = parseInt(window.getComputedStyle(document.documentElement).getPropertyValue('--global-font-size'))
       let newValue = ''
-      detectFontSizeChange = true
       if (plus) {
         if (fontSizeVal >= 20) return
         newValue = fontSizeVal + 1
         document.documentElement.style.setProperty('--global-font-size', newValue + 'px')
-        !document.getElementById('nav').classList.contains('hide-menu') && adjustMenu()
+        !document.getElementById('nav').classList.contains('hide-menu') && adjustMenu(true)
       } else {
         if (fontSizeVal <= 10) return
         newValue = fontSizeVal - 1
         document.documentElement.style.setProperty('--global-font-size', newValue + 'px')
-        document.getElementById('nav').classList.contains('hide-menu') && adjustMenu()
+        document.getElementById('nav').classList.contains('hide-menu') && adjustMenu(true)
       }
 
       saveToLocal.set('global-font-size', newValue, 2)
@@ -785,6 +815,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
   const unRefreshFn = function () {
     window.addEventListener('resize', adjustMenu)
+    window.addEventListener('orientationchange', () => { setTimeout(adjustMenu(true), 100) })
 
     clickFnOfSubMenu()
     GLOBAL_CONFIG.islazyload && lazyloadImg()
@@ -807,7 +838,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     sidebarFn()
     GLOBAL_CONFIG_SITE.isHome && scrollDownInIndex()
-    GLOBAL_CONFIG.highlight && addHighlightTool()
+    addHighlightTool()
     GLOBAL_CONFIG.isPhotoFigcaption && addPhotoFigcaption()
     jqLoadAndRun()
     GLOBAL_CONFIG.lightbox === 'mediumZoom' && addMediumZoom()