Merge branch 'pjax' into dev

.github/ISSUE_TEMPLATE.md

@@ -1,52 +0,0 @@
-<!--
-IMPORTANT: Please follow the template to create a new issue.
-重要：請依照該模板來提交。
-
-If you upgrade from the old version, and an error occurs when running, please copy the new content in the config to the butterfly.yml
-如果你是由舊版本升級到新版，運行時出現報錯，請首先把config裏新的內容複製到舊的butterfly設置去
-
-If you are a problem when visit the website, please open your browser 'developer tools (shortcut F12)' and check the console if there is an error, include your website address in the feedback
-如果你是線上訪問出現問題，請檢查瀏覽器‘開發人員工具（快捷鍵F12）’的console是否有報錯，反饋時附上你的網站
--->
-
-
-## I want to create a new issue <!-- 我想要建立一個新的issue --> 
-
-<!-- Check all with "x" especially FAQ & Documentation!! (使用 "x" 選擇) -->
-<!-- 請確認是否都已經翻閱過如下的資料, 尤其是安裝文檔！！ -->
-- [] Yes, I have read [Hexo Docs page](https://hexo.io/docs/), especially [Templates](https://hexo.io/docs/templates.html), [Variables](https://hexo.io/docs/variables.html), [Helpers](https://hexo.io/docs/helpers.html) and [Troubleshooting](https://hexo.io/docs/troubleshooting.html).
-- [] Yes, I have read [Hexo-theme-butterfly Documentation](https://jerryc.me/posts/21cfbf15/).
-- [] And yes, I already searched for current [issues](https://github.com/jerryc127/hexo-theme-butterfly/issues?utf8=%E2%9C%93&q=is%3Aissue) and this did not help me.
-
-## Butterfly Information
-
-<!-- Butterfly的版本 -->
-<!-- 檢視主題的package.json -->
-**Butterfly Version:**
-
-<!-- Windows/macOS/Linux/Android/iOS -->
-**Platform:**
-
-<!-- Chrome/Safari/FireFox/.. -->
-**Browser:**
-
-## Expected behavior <!-- (預期行為) -->
-
-## Actual behavior <!-- (實際行為) -->
-
-<!-- Please give me the screenshots to locate the issue -->
-<!-- 請儘量提供截圖來定位問題 -->
-
-## Steps to reproduce the behavior <!-- (重現步驟) -->
-
-## Feature Request
-
-<!-- If you have any ideas of theme-butterfly, please write down here and we can have a discussion. -->
-<!-- 如果你有任何關於Butterfly的功能方面的想法，可以在這個部分裡寫下來我們一起討論 -->
-
----
-
-<!--
-Love hexo-theme-butterfly? Please consider starring the repo to support it!
-喜歡 hexo-theme-butterfly嗎？ 考慮一下給它點個star來支援它吧！
--->

_config.yml

@@ -30,7 +30,9 @@ code_word_wrap: false
 # copyright: Add the copyright information after copied content (複製的內容後面加上版權信息)
 copy:
   enable: true
-  copyright: false
+  copyright:
+    enable: false
+    limit_count: 50
 
 # social settings (社交圖標設置)
 # formal:
@@ -92,18 +94,18 @@ avatar:
 # the banner image of home page
 index_img:
 
-# if the banner of page not setting,it will show the top_img
+# if the banner of page not setting, it will show the top_img
 default_top_img: https://i.loli.net/2020/05/01/IuWi8QbHvzjlOPw.jpg
 
 # the banner image of archive page
 archive_img:
 
 # the banner image of tag page
-# tag page, look like https://xxxxxxxxx.com/tags/butterfly
+# note: tag page, not tags page (子標籤頁面的 top_img)
 tag_img:
 
 # the banner image of category page
-# category page, look like https://xxxxxxxxx.com/categories/butterfly
+# note: category page, not categories page (子分類頁面的 top_img)
 category_img:
 
 # If you are using hexo-douban, you can configure it (如果你有使用 hexo-douban,可配置這個)
@@ -141,10 +143,12 @@ post_meta:
     date_type: created # created or updated or both 主頁文章日期是創建日或者更新日或都顯示
     categories: true # true or false 主頁是否顯示分類
     tags: false # true or false 主頁是否顯示標籤
+    label: true # true or false 顯示描述性文字
   post:
     date_type: both # created or updated or both 文章頁日期是創建日或者更新日或都顯示
     categories: true # true or false 文章頁是否顯示分類
     tags: true # true or false 文章頁是否顯示標籤
+    label: true # true or false 顯示描述性文字
 
 # wordcount (字數統計)
 wordcount:
@@ -155,7 +159,7 @@ wordcount:
 
 # Display the article introduction on homepage
 # 1: description
-# 2: both (if the description exists, it will show description. or show the auto_excerpt)
+# 2: both (if the description exists, it will show description, or show the auto_excerpt)
 # 3: auto_excerpt (default)
 index_post_content:
   method: 3
@@ -242,11 +246,15 @@ addtoany:
 
 comments:
   # Up to two comments system, the first will be shown as default
-  # Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments
+  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Utterances/Facebook Comments
   use:
+  # - Valine
+  # - Disqus
   text: true # Display the comment name next to the button
-  load_begin: false # The second comment system will auto load when visiting the website
+  # lazyload: The comment system will be load when comment element enters the browser's viewport.
-  count: false # Dispaly comment count in top_img
+  # If you set it to false, the comment count will be invalid
+  lazyload: false
+  count: false # Display comment count in top_img
 
 # disqus
 # https://disqus.com/
@@ -254,7 +262,7 @@ disqus:
   shortname:
 
 # Alternative Disqus - Render comments with Disqus API
-# DisqusJS評論系統，可以實現在網路審查地區載入 Disqus 評論列表，兼容原版
+# DisqusJS 評論系統，可以實現在網路審查地區載入 Disqus 評論列表，兼容原版
 # https://github.com/SukkaW/DisqusJS
 disqusjs:
   shortname:
@@ -265,7 +273,7 @@ disqusjs:
   admin:
   adminLabel:
 
-# livere(來必力)
+# livere (來必力)
 # https://www.livere.com/
 livere:
   uid:
@@ -292,8 +300,8 @@ valine:
   pageSize: 10 # comment list page size
   avatar: monsterid # gravatar style https://valine.js.org/#/avatar
   lang: en # i18n: zh-CN/zh-TW/en/ja
-  placeholder: Please leave your footprints # valine comment input placeholder(like: Please leave your footprints )
+  placeholder: Please leave your footprints # valine comment input placeholder (like: Please leave your footprints)
-  guest_info: nick,mail,link #valine comment header info (nick/mail/link)
+  guest_info: nick,mail,link # valine comment header info (nick/mail/link)
   recordIP: false # Record reviewer IP
   serverURLs: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in)
   bg: # valine background
@@ -354,20 +362,25 @@ gitter:
   enable: false
   room:
 
+# crisp
+# https://crisp.chat/en/
+crisp:
+  enable: false
+  website_id:
+
 # Footer Settings
 # --------------------------------------
-
+footer:
-since: 2020
+  owner:
-
+    enable: true
-footer_custom_text:
+    since: 2020
-
+  custom_text: 
-footer_copyright: true
+  copyright: true # Copyright of theme and framework
-
+  ICP: # Chinese ICP License
-ICP:
+    enable: false
-  enable: false
+    url:
-  url:
+    text:
-  text:
+    icon: /img/icp.png
-  icon: /img/icp.png
 
 # Analysis
 # --------------------------------------
@@ -387,6 +400,7 @@ tencent_analytics:
 # Google Adsense (谷歌廣告)
 google_adsense:
   enable: false
+  auto_ads: true
   js: https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js
   client:
   enable_page_level_ads: true
@@ -416,6 +430,10 @@ baidu_site_verification:
 # see http://zhanzhang.so.com/
 qihu_site_verification:
 
+# Yandex Webmaster tools verification setting
+# see https://webmaster.yandex.com/
+yandex_site_verification:
+
 # Beautify/Effect (美化/效果)
 # --------------------------------------
 
@@ -439,7 +457,7 @@ qihu_site_verification:
 
 # The top_img settings of home page
 # default: top img - full screen, site info - middle (默認top_img全屏，site_info在中間)
-# The positon of site info, eg: 300px/300em/300rem/10% (主頁標題距離頂部距離)
+# The position of site info, eg: 300px/300em/300rem/10% (主頁標題距離頂部距離)
 index_site_info_top:
 # The height of top_img, eg: 300px/300em/300rem (主頁top_img高度)
 index_top_img_height:
@@ -536,12 +554,12 @@ font:
 # 左上角網站名字 主頁居中網站名字
 blog_title_font:
   font_link: https://fonts.googleapis.com/css?family=Titillium+Web&display=swap
-  font-family: Titillium Web, 'PingFang SC', 'Hiragino Sans GB', Microsoft YaHei', sans-serif
+  font-family: Titillium Web, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif
 
 # The setting of divider icon (水平分隔線圖標設置)
 hr_icon:
   enable: true
-  icon: # the unicode value of Font Awesome icon
+  icon: # the unicode value of Font Awesome icon, such as '\3423'
   icon-top:
 
 # the subtitle on homepage (主頁subtitle)
@@ -580,12 +598,17 @@ aside:
   card_author:
     enable: true
     description:
+    button:
+      icon: fab fa-github
+      text: Follow Me
+      link: https://github.com/xxxxxx
   card_announcement:
     enable: true
     content: This is my Blog
   card_recent_post:
     enable: true
     limit: 5 # if set 0 will show all
+    sort: date # date or updated
   card_categories:
     enable: true
     limit: 8 # if set 0 will show all
@@ -620,7 +643,7 @@ runtimeshow:
 
 # Conversion between Traditional and Simplified Chinese (簡繁轉換)
 translate:
-  enable: true
+  enable: false
   # The text of a button
   default: 繁
   # the language of website (1 - Traditional Chinese/ 2 - Simplified Chinese）
@@ -685,6 +708,14 @@ note:
 # other
 # --------------------------------------
 
+# Pjax [Beta]
+# It may contain bugs and unstable, give feedback when you find the bugs.
+# https://github.com/MoOx/pjax
+pjax: false
+
+# Inject the css and script (aplayer/meting)
+aplayerInject: false
+
 # Snackbar (Toast Notification 彈窗)
 # https://github.com/polonel/SnackBar
 # position 彈窗位置
@@ -755,8 +786,10 @@ CDN:
   main: /js/main.js
   utils: /js/utils.js
 
+  # pjax
+  pjax: https://cdn.jsdelivr.net/npm/pjax/pjax.min.js
+
   # comments
-  blueimp_md5: https://cdn.jsdelivr.net/npm/blueimp-md5/js/md5.min.js
   gitalk: https://cdn.jsdelivr.net/npm/gitalk@latest/dist/gitalk.min.js
   gitalk_css: https://cdn.jsdelivr.net/npm/gitalk/dist/gitalk.min.css
   valine: https://cdn.jsdelivr.net/npm/valine/dist/Valine.min.js
@@ -776,7 +809,7 @@ CDN:
   algolia_search_css: https://cdn.jsdelivr.net/npm/instantsearch.js@2.10.5/dist/instantsearch.min.css
 
   # math
-  mathjax: https://cdn.jsdelivr.net/npm/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML
+  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_css: https://cdn.jsdelivr.net/npm/katex-copytex@latest/dist/katex-copytex.min.css
@@ -792,7 +825,7 @@ CDN:
 
   lazyload: https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js
   instantpage: https://cdn.jsdelivr.net/npm/instant.page/instantpage.min.js
-  typed: https://cdn.jsdelivr.net/npm/typed.js
+  typed: https://cdn.jsdelivr.net/npm/typed.js/lib/typed.min.js
   pangu: https://cdn.jsdelivr.net/npm/pangu/dist/browser/pangu.min.js
 
   # photo
@@ -824,4 +857,4 @@ CDN:
   # aplayer
   aplayer_css: https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css
   aplayer_js: https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.js
-  meting_js: https://cdn.jsdelivr.net/npm/meting@1.2.0/dist/Meting.min.js
+  meting_js: https://cdn.jsdelivr.net/gh/metowolf/MetingJS@1.2/dist/Meting.min.js

languages/default.yml

@@ -3,7 +3,7 @@ sidebar:
   have_read: You've read
 
 footer:
-  driven: Driven
+  framework: Framework
   theme: Theme
 
 copy:
@@ -24,7 +24,8 @@ post:
   created: Created
   updated: Updated
   wordcount: Word count
-  min2read: 'Reading time: %s min'
+  min2read: Reading time
+  min2read_unit: min
   page_pv: Post View
   comments: Comments
   copyright:
@@ -61,7 +62,6 @@ aside:
   card_tags: Tags
   card_archives: Archives
   card_recent_post: Recent Post
-  card_bookmark: Bookmark
   card_webinfo:
     headline: Info
     article_name: Article