Merge branch 'dev' into master

This commit is contained in:
Jerry committed 2020-10-28 14:37:18 +08:00
commit eb5a356a4e
75 files changed
+958 -1141

No files matched your search

-2
View File
@@ -94,5 +94,3 @@ npm i hexo-theme-butterfly
![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png) ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png) ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)
-2
View File
@@ -94,5 +94,3 @@ theme: butterfly
![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png) ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png) ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)
+12 -20
View File
@@ -53,17 +53,9 @@ algolia_search:
hits: hits:
per_page: 6 per_page: 6
labels:
input_placeholder: Search for Posts
hits_empty: "We didn't find any results for the search: ${query}" # if there are no result
hits_stats: '${hits} results found in ${time} ms'
# Local search # Local search
local_search: local_search:
enable: false enable: false
labels:
input_placeholder: Search for Posts
hits_empty: "We didn't find any results for the search: ${query}" # if there are no result
# Math (數學) # Math (數學)
# -------------------------------------- # --------------------------------------
@@ -121,13 +113,6 @@ category_img:
# - category name: xxxxx # - category name: xxxxx
category_per_img: category_per_img:
# If you are using hexo-douban, you can configure it (如果你有使用 hexo-douban,可配置這個)
# douban:
# meta: false
# movies_img:
# books_img:
# games_img:
cover: cover:
# display the cover or not (是否顯示文章封面) # display the cover or not (是否顯示文章封面)
index_enable: true index_enable: true
@@ -188,7 +173,6 @@ index_post_content:
toc: toc:
enable: true enable: true
number: true number: true
auto_open: true # auto open the sidebar
post_copyright: post_copyright:
enable: true enable: true
@@ -317,6 +301,7 @@ valine:
emojiCDN: # emoji CDN emojiCDN: # emoji CDN
enableQQ: false # enable the Nickname box to automatically get QQ Nickname and QQ Avatar enableQQ: false # enable the Nickname box to automatically get QQ Nickname and QQ Avatar
requiredFields: nick,mail # required fields (nick/mail) requiredFields: nick,mail # required fields (nick/mail)
option:
# utterances # utterances
# https://utteranc.es/ # https://utteranc.es/
@@ -337,6 +322,10 @@ facebook_comments:
order_by: social # social/time/reverse_time order_by: social # social/time/reverse_time
lang: en_US # Language en_US/zh_CN/zh_TW and so on lang: en_US # Language en_US/zh_CN/zh_TW and so on
# Twikoo
# https://github.com/imaegoo/twikoo
twikoo:
# Chat Services # Chat Services
# -------------------------------------- # --------------------------------------
@@ -576,9 +565,9 @@ font:
# Font settings for the site title and site subtitle # Font settings for the site title and site subtitle
# 左上角網站名字 主頁居中網站名字 # 左上角網站名字 主頁居中網站名字
# blog_title_font: blog_title_font:
# font_link: https://fonts.googleapis.com/css?family=Titillium+Web&display=swap font_link:
# font-family: Titillium Web, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif font-family:
# The setting of divider icon (水平分隔線圖標設置) # The setting of divider icon (水平分隔線圖標設置)
hr_icon: hr_icon:
@@ -615,6 +604,8 @@ preloader: false
aside: aside:
enable: true enable: true
hide: false
button: true
mobile: true # display on mobile mobile: true # display on mobile
position: right # left or right position: right # left or right
card_author: card_author:
@@ -828,7 +819,7 @@ fragment_cache: true
# 插入代码到头部 </head> 之前 和 底部 </body> 之前 # 插入代码到头部 </head> 之前 和 底部 </body> 之前
inject: inject:
head: head:
# - <link rel="stylesheet" href="/xxx.css"> # - <link rel="stylesheet" href="/xxx.css">
bottom: bottom:
# - <script src="xxxx"></script> # - <script src="xxxx"></script>
@@ -852,6 +843,7 @@ CDN:
disqusjs: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js disqusjs: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js
disqusjs_css: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css disqusjs_css: https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css
utterances: https://utteranc.es/client.js utterances: https://utteranc.es/client.js
twikoo: https://cdn.jsdelivr.net/npm/twikoo/dist/twikoo.all.min.js
# share # share
addtoany: https://static.addtoany.com/menu/page.js addtoany: https://static.addtoany.com/menu/page.js
Loaded 3 of 75 files, more files were not shown because too many files have changed in this diff. Show more