Merge branch 'dev' into master

improvement: 滾動到評論按鈕只要用評論的頁面就出現
improvement: aside狀態存localstore
fix: 修復disqusjs沒有設置api時，沒有反代的bugs
fix: 修復aside在font-matter aside為false時，收縮按鈕依舊出現和點擊按鈕會出現空白的bugs #398

README.md

@@ -93,6 +93,4 @@ npm i hexo-theme-butterfly
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
 
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)

README_CN.md

@@ -93,6 +93,4 @@ theme: butterfly
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-1.png)
 
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
+![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-homepage-2.png)
-
-![](https://cdn.jsdelivr.net/gh/jerryc127/CDN/img/theme-butterfly-readme-post.png)

_config.yml

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

languages/default.yml

@@ -1,7 +1,3 @@
-sidebar:
-  catalog: Catalog
-  have_read: You've read
-
 footer:
   framework: Framework
   theme: Theme
@@ -75,9 +71,10 @@ aside:
     site_pv_name: PV
   more_button: More
   card_newest_comments:
-    heading: Newest Comments
+    headline: Newest Comments
     loading_text: loading...
     error: Unable to get the data, please make sure the settings are correct.
+  card_toc: Catalog
 
 date_suffix:
   just: Just

languages/en.yml

@@ -1,7 +1,3 @@
-sidebar:
-  catalog: Catalog
-  have_read: You've read
-
 footer:
   framework: Framework
   theme: Theme
@@ -75,9 +71,10 @@ aside:
     site_pv_name: PV
   more_button: More
   card_newest_comments:
-    heading: Newest Comments
+    headline: Newest Comments
     loading_text: loading...
     error: Unable to get the data, please make sure the settings are correct.
+  card_toc: Catalog
 
 date_suffix:
   just: Just

languages/zh-CN.yml

@@ -1,7 +1,3 @@
-sidebar:
-  catalog: 目录
-  have_read: 你已经读了
-
 footer:
   framework: 框架
   theme: 主题
@@ -77,9 +73,10 @@ aside:
     site_pv_name: 本站总访问量
   more_button: 查看更多
   card_newest_comments:
-    heading: 最新评论
+    headline: 最新评论
     loading_text: 正在加载中...
     error: 无法获取资料，请确认相关配置是否正确
+  card_toc: 目录
 
 date_suffix:
   just: 刚刚

languages/zh-TW.yml

@@ -1,7 +1,3 @@
-sidebar:
-  catalog: 目錄
-  have_read: 你已經讀了
-
 footer:
   framework: 框架
   theme: 主題
@@ -77,9 +73,10 @@ aside:
     site_pv_name: 本站總訪問量
   more_button: 檢視更多
   card_newest_comments:
-    heading: 最新評論
+    headline: 最新評論
     loading_text: 正在加載中...
     error: 無法獲取資料，請確認相關配置是否正確
+  card_toc: 目錄
 
 date_suffix:
   just: 剛剛

layout/404.pug

@@ -25,5 +25,4 @@ html(lang=config.language data-theme=theme.display_mode)
             i.fas.fa-rocket
             = _p('error404.back_button')
           
-    !=partial('includes/third-party/search/index', {}, {cache:theme.fragment_cache})
     include includes/additional-js.pug

layout/includes/additional-js.pug

@@ -60,12 +60,12 @@ div
   !=partial('includes/third-party/effect', {}, {cache:theme.fragment_cache})
 
   !=partial('includes/third-party/chat/index', {}, {cache:theme.fragment_cache})
-
+  
   if theme.aplayerInject && theme.aplayerInject.enable
     if theme.pjax.enable || theme.aplayerInject.per_page
-      include ./head/aplayer.pug
+      include ./third-party/aplayer.pug
     else if page.aplayer
-      include ./head/aplayer.pug
+      include ./third-party/aplayer.pug
 
   if theme.pjax.enable
     !=partial('includes/third-party/pjax', {}, {cache:theme.fragment_cache})

layout/includes/footer.pug

@@ -14,10 +14,10 @@
       span= _p('footer.theme') + ' '
       a(href='https://github.com/jerryc127/hexo-theme-butterfly')= 'Butterfly'
   if theme.footer.custom_text
-    .footer_custom_text!=`${theme.footer.custom_text}`   
+    .footer_custom_text!=`${theme.footer.custom_text}`
   if theme.footer.ICP.enable
     .icp
       a(href=theme.footer.ICP.url)
         if theme.footer.ICP.icon
-          img.icp-icon(src=url_for(theme.footer.ICP.icon))
+          img.icp-icon(src=url_for(theme.footer.ICP.icon) alt='ICP')
         span=theme.footer.ICP.text

layout/includes/head.pug

@@ -79,7 +79,6 @@ if theme.blog_title_font &&　theme.blog_title_font.font_link
 include ./head/config_site.pug
 include ./head/noscript.pug
 
-!=partial('includes/head/darkmode', {}, {cache:theme.fragment_cache})
+!=partial('includes/head/js', {}, {cache:theme.fragment_cache})
-
-!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
 
+!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})

layout/includes/head/config.pug

@@ -93,7 +93,6 @@
 script.
   var GLOBAL_CONFIG = { 
     root: '!{config.root}',
-    hexoversion: '!{get_hexo_version()}',
     algolia: !{algolia},
     localSearch: !{localSearch},
     translate: !{translate},

layout/includes/head/config_site.pug

@@ -5,7 +5,7 @@
   else isHighlightShrink = theme.highlight_shrink
 
   const pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
-  const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true )
+  const showToc = is_post() && theme.aside.enable && pageToc && (toc(page.content) !== '' || page.encrypt == true )
 -
 
 script#config_change
@@ -14,6 +14,6 @@ script#config_change
       isPost: !{is_post()},
       isHome: !{is_home()},
       isHighlightShrink: !{isHighlightShrink},
-      isSidebar: !{showToc},
+      isToc: !{showToc},
       postUpdate: '!{full_date(page.updated)}'
     }

layout/includes/head/darkmode.pug

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

layout/includes/head/js.pug

@@ -0,0 +1,65 @@
+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')
+    |    }
+    | }
+
+  | })()
+

layout/includes/header/index.pug

@@ -16,18 +16,6 @@ if page.top_img !== false
   else
     - var top_img = page.top_img || theme.default_top_img
 
-  if theme.douban
-    - var doubanExist = false
-    if is_current('/movies/', [strict])
-      - var top_img = theme.douban.movies_img !== false ? theme.douban.movies_img || theme.default_top_img : false
-      - doubanExist = true
-    else if is_current('/books/', [strict])
-      - var top_img = theme.douban.books_img !== false ? theme.douban.books_img || theme.default_top_img : false
-      - doubanExist = true
-    else if is_current('/games/', [strict])
-      - var top_img = theme.douban.games_img !== false ? theme.douban.games_img || theme.default_top_img : false
-      - doubanExist = true
-
   if top_img !== false
     - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url(${url_for(top_img)})` : `background: ${top_img}`
     - var bg_img = top_img ? imgSource : ''

layout/includes/header/post-info.pug

@@ -1,6 +1,5 @@
 #post-info
-  #post-title
+  h1.post-title= page.title || _p('no_title')
-    .posttitle= page.title || _p('no_title')
     
   #post-meta
     .meta-firstline

layout/includes/layout.pug

@@ -1,37 +1,30 @@
+- var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
 
 doctype html
-html(lang=config.language data-theme=theme.display_mode)
+html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside)
   head
     include ./head.pug
   body
     if theme.preloader
       !=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
 
-    !=partial('includes/mobile-sidebar/index', {}, {cache:theme.fragment_cache})
+    if theme.background
+      #web_bg
+      
+    !=partial('includes/sidebar', {}, {cache:theme.fragment_cache})
 
     #body-wrap
-      if theme.background
-        #web_bg
-
-      include ./sidebar.pug
       include ./header/index.pug
 
-      if (!is_post())
+      main#content-inner.layout(class=hideAside)
-        main#content-inner.layout_page(class=hideAside)
+        if body
-          if body
+          div!= body
-            div!= body
+        else
-          else
+          block content
-            block content
+          if theme.aside.enable && page.aside !== false
-            if theme.aside.enable && page.aside !== false
+            include widget/index.pug
-              !=partial('includes/widget/index', {}, {cache:theme.fragment_cache})
+
-      else
-        main#content-inner.layout_post
-          if body
-            div!= body
-          else
-            block content
-      
       - var footerBg = theme.footer_bg
       if (footerBg)
         if (footerBg === true)

layout/includes/mobile-sidebar/index.pug

@@ -1,3 +0,0 @@
-#mobile-sidebar
-  #menu_mask
-  include ../mobile-sidebar/mobile-menus.pug

layout/includes/mobile-sidebar/mobile-menus.pug

@@ -1,29 +0,0 @@
-#mobile-sidebar-menus
-  .mobile_author_icon
-    if theme.lazyload.enable
-      img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
-    else
-      img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
-  .mobile_post_data
-    if site.posts.length
-      .mobile_data_item.is-center
-        .mobile_data_link
-          a(href=url_for(config.archive_dir) + '/')
-            .headline= _p('aside.articles') 
-            .length_num= site.posts.length
-
-    if site.tags.length
-      .mobile_data_item.is-center       
-        .mobile_data_link
-          a(href=url_for(config.tag_dir) + '/' )
-            .headline= _p('aside.tags')
-            .length_num= site.tags.length
-
-    if site.categories.length
-      .mobile_data_item.is-center      
-        .mobile_data_link
-          a(href=url_for(config.category_dir) + '/')
-            .headline= _p('aside.categories') 
-            .length_num= site.categories.length
-  hr
-  !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})

layout/includes/page/default-page.pug

@@ -1,5 +1,3 @@
-if theme.douban && theme.douban.meta && doubanExist
-  meta(name="referrer" content="no-referrer")
 #article-container
   if top_img === false
     h1.page-title= page.title

layout/includes/rightside.pug

@@ -1,4 +1,4 @@
-section#rightside
+#rightside
   #rightside-config-hide
     if is_post() && theme.readmode
       button#readmode(type="button" title=_p('rightside.readmode_title'))
@@ -8,15 +8,15 @@ section#rightside
     if theme.darkmode.enable && theme.darkmode.button
       button#darkmode(type="button" title=_p('rightside.night_mode_title'))
         i.fas.fa-adjust
+    if theme.aside.enable && theme.aside.button && page.aside !== false
+      button#hide-aside-btn(type="button")
+        i.fas.fa-arrows-alt-h
   #rightside-config-show
     if is_post()
       if (theme.readmode || theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button))
         button#rightside_config(type="button" title=_p("rightside.setting"))
           i.fas.fa-cog
-      if commentsJsLoad
+      if showToc && theme.aside.mobile
-        a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
-          i.fas.fa-comments
-      if showToc
         button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
           i.fas.fa-list-ul
     else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button)
@@ -26,6 +26,8 @@ section#rightside
     if theme.chat_btn
       button#chat_btn(type="button" title=_p("rightside.chat_btn"))
         i.fas.fa-sms
-
+    if commentsJsLoad
+      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
+        i.fas.fa-comments
     button#go-up(type="button" title=_p("rightside.back_to_top"))
       i.fas.fa-arrow-up

layout/includes/sidebar.pug

@@ -1,21 +1,31 @@
--
+#sidebar
-  let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
+  #menu-mask
-  let autoOpenPostSet = page.auto_open == undefined ? theme.toc.auto_open : page.auto_open
+  #sidebar-menus
-  let autoOpenSidebar = autoOpenPostSet ? 'on' : ''
+    .author-avatar
--
+      if theme.lazyload.enable
+        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+      else
+        img.avatar-img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
+    .site-data
+      if site.posts.length
+        .data-item.is-center
+          .data-item-link
+            a(href=url_for(config.archive_dir) + '/')
+              .headline= _p('aside.articles') 
+              .length-num= site.posts.length
 
-if(showToc)
+      if site.tags.length
-  #sidebar
+        .data-item.is-center
-    i.fas.fa-arrow-right#toggle-sidebar(class=autoOpenSidebar)
+          .data-item-link
-    .sidebar-toc
+            a(href=url_for(config.tag_dir) + '/' )
-      div.sidebar-toc__title= _p('sidebar.catalog')
+              .headline= _p('aside.tags')
-      div.sidebar-toc__progress
+              .length-num= site.tags.length
-        span.progress-notice= _p('sidebar.have_read')
+
-        span.progress-num 0
+      if site.categories.length
-        span.progress-percentage %
+        .data-item.is-center
-        div.sidebar-toc__progress-bar      
+          .data-item-link
-      if (page.encrypt == true)
+            a(href=url_for(config.category_dir) + '/')
-        div.sidebar-toc__content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
+              .headline= _p('aside.categories') 
-      else 
+              .length-num= site.categories.length
-        div.sidebar-toc__content!=toc(page.content, {list_number: tocNumber})
+    hr
-        
+    !=fragment_cache('menus', function(){return partial('includes/header/menu_item')})

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

@@ -1,3 +1,4 @@
+- let disqusjsApi = theme.disqusjs.api || 'https://disqus.skk.moe/disqus/'
 script.
   function loadDisqusjs () {
     function addDisqusjsCSS () {
@@ -15,7 +16,7 @@ script.
         identifier: '!{ page.path }',
         url: '!{ page.permalink }',
         title: '!{ page.title }',
-        api: '!{theme.disqusjs.api}',
+        api: '!{disqusjsApi}',
         apikey: '!{theme.disqusjs.apikey}',
         nocomment: '!{theme.disqusjs.nocomment}',
         admin: '!{theme.disqusjs.admin}',

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

@@ -7,11 +7,9 @@ hr
       span= ' ' + _p('comment')
     
     if theme.comments.use.length > 1
-      .comment-switch
+      #comment-switch
         span.first-comment=defaultComment
-        label
+        span.switch-btn
-          input#switch-comments-btn(type="checkbox")
-          span.slider
         span.second-comment=theme.comments.use[1]
 
 
@@ -31,6 +29,8 @@ hr
             #gitalk-container
           when 'Utterances'
             #utterances-wrap
+          when 'Twikoo'
+            #twikoo
           when 'Facebook Comments'
             .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
                         data-numposts= theme.facebook_comments.pageSize || 10

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

@@ -12,5 +12,7 @@ each name in theme.comments.use
       include ./gitalk.pug
     when 'Utterances'
       !=partial('includes/third-party/comments/utterances', {}, {cache:theme.fragment_cache})
+    when 'Twikoo'
+      !=partial('includes/third-party/comments/twikoo', {}, {cache:theme.fragment_cache})
     when 'Facebook Comments'
       !=partial('includes/third-party/comments/facebook_comments', {}, {cache:theme.fragment_cache})

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

@@ -0,0 +1,24 @@
+script.
+  function loadTwikoo () {
+    function init () {
+      twikoo.init({ 
+        envId: '!{theme.twikoo}' 
+      })
+    }
+
+    if (typeof twikoo.init === 'function') {
+      init()
+    } else {
+      $.getScript('!{theme.CDN.twikoo}', init)
+    }
+  }
+
+  if ('!{theme.comments.use[0]}' === 'Twikoo' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('twikoo'), loadTwikoo)
+    else loadTwikoo()
+  } else {
+    function loadOtherComment () {
+      loadTwikoo()
+    }
+  }
+

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

@@ -1,3 +1,4 @@
+- let option = theme.valine.option ? JSON.stringify(theme.valine.option) : false
 - let emojiMaps = '""'
 if site.data.valine
   - emojiMaps = JSON.stringify(site.data.valine)
@@ -5,7 +6,7 @@ if site.data.valine
 script.
   function loadValine () {
     function initValine () {
-      const initData = {
+      let initData = {
         el: '#vcomment',
         appId: '#{theme.valine.appId}',
         appKey: '#{theme.valine.appKey}',
@@ -25,7 +26,12 @@ script.
       if (!{Boolean(theme.valine.requiredFields)}) { 
         initData.requiredFields= ('!{theme.valine.requiredFields}'.split(','))
       }
-
+      
+      if (!{Boolean(option)}) {
+        const otherData = !{option}
+        initData = Object.assign({}, initData, otherData)
+      }
+      
       const valine = new Valine(initData)
     }
 

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

@@ -41,7 +41,7 @@ script.
       }
     }
     
-    var script = document.createElement('script')
+    const script = document.createElement('script')
     script.src = '!{theme.CDN.mathjax}'
     script.id = 'MathJax-script'
     script.async = true

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

@@ -1,12 +1,13 @@
-#algolia-search.search-dialog
+#algolia-search
-  #algolia-search-title.search-dialog__title Algolia
+  .search-dialog
-  #algolia-input-panel
+    #algolia-search-title.search-dialog__title Algolia
-    #algolia-search-input
+    #algolia-input-panel
-  hr
+      #algolia-search-input
-  #algolia-search-results
+    hr
-    #algolia-hits
+    #algolia-search-results
-    #algolia-pagination
+      #algolia-hits
-    #algolia-stats
+      #algolia-pagination
-  span.search-close-button
+      #algolia-stats
-    i.fas.fa-times
+    span.search-close-button
-#search-mask
+      i.fas.fa-times
+  #search-mask

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

@@ -1,23 +1,24 @@
-#local-search.search-dialog
+#local-search
-  #local-search-title.search-dialog__title=_p("local_search.label")
+  .search-dialog
-  #local-input-panel
+    #local-search-title.search-dialog__title=_p("local_search.label")
-    #local-search-input
+    #local-input-panel
-      .local-search-box
+      #local-search-input
-        input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
+        .local-search-box
-  hr
+          input(placeholder=_p("local_search.input_placeholder") type="text").local-search-box--input
-  #local-search-results
+    hr
-    #local-hits
+    #local-search-results
-    #local-stats
+      #local-hits
-      #hr.local-search-stats__hr
+      #local-stats
-        case config.language
+        #hr.local-search-stats__hr
-          when "zh-CN"
+          case config.language
-            span=_p("local_search.by")
+            when "zh-CN"
-            |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
+              span=_p("local_search.by")
-            |  #[span=_p("local_search.powered")]
+              |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
-          when "en"
+              |  #[span=_p("local_search.powered")]
-          default
+            when "en"
-            span=_p("local_search.powered_by")
+            default
-            |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
+              span=_p("local_search.powered_by")
-  span.search-close-button
+              |  #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
-    i.fas.fa-times
+    span.search-close-button
-#search-mask
+      i.fas.fa-times
+  #search-mask

layout/includes/third-party/subtitle.pug

@@ -1,97 +1,40 @@
 - var source = theme.subtitle.source
-if source == '1'
+case source
-  script.
+  when 1
-    function subtitleType () {
+    script.
-      $.getJSON('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',function (data) {
+      function subtitleType () {
-        if (!{theme.subtitle.effect}) {
+        $.getJSON('https://api.btstu.cn/yan/api.php?charset=utf-8&encode=json',function (data) {
-          var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-          var both = sub.unshift(data.text)
-          typed = new Typed('#subtitle', {
-            strings: sub,
-            startDelay: 300,
-            typeSpeed: 150,
-            loop: !{theme.subtitle.loop},
-            backSpeed: 50,
-          })
-        } else {
-          document.getElementById('subtitle').innerHTML = data.text
-        }
-      })
-    }
-
-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
-
-else if source == '2'
-  script.
-    function subtitleType () {
-      $.getJSON('https://v1.hitokoto.cn', function (data) {
-        if (!{theme.subtitle.effect}) {
-          var from = '出自 ' + data.from
-          var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-          var both = sub.unshift(data.hitokoto, from)
-          var typed = new Typed('#subtitle', {
-            strings: sub,
-            startDelay: 300,
-            typeSpeed: 150,
-            loop: !{theme.subtitle.loop},
-            backSpeed: 50,
-          })
-        } else {
-          document.getElementById('subtitle').innerHTML = data.hitokoto
-        }
-      })
-    }
-
-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
-
-else if source == '3'
-  script.
-    function subtitleType () {
-      $.getScript('http://yijuzhan.com/api/word.php?m=js', function () {
-        var con = str[0]
-        if (!{theme.subtitle.effect}) {
-          var from = '出自 ' + str[1]
-          var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-          var both = sub.unshift(con, from)
-          var typed = new Typed('#subtitle', {
-            strings: sub,
-            startDelay: 300,
-            typeSpeed: 150,
-            loop: !{theme.subtitle.loop},
-            backSpeed: 50,
-          })
-        } else {
-          document.getElementById('subtitle').innerHTML = con
-        }
-      })
-    }
-
-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
-
-else if source == '4'
-  script.
-    function subtitleType () {
-      $.getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
-        jinrishici.load(function (result) {
           if (!{theme.subtitle.effect}) {
             var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
-            var content = result.data.content
+            var both = sub.unshift(data.text)
-            var both = sub.unshift(content)
+            typed = new Typed('#subtitle', {
+              strings: sub,
+              startDelay: 300,
+              typeSpeed: 150,
+              loop: !{theme.subtitle.loop},
+              backSpeed: 50,
+            })
+          } else {
+            document.getElementById('subtitle').innerHTML = data.text
+          }
+        })
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') subtitleType()
+        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+      } else {
+        subtitleType()
+      }
+
+  when 2
+    script.
+      function subtitleType () {
+        $.getJSON('https://v1.hitokoto.cn', function (data) {
+          if (!{theme.subtitle.effect}) {
+            var from = '出自 ' + data.from
+            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+            var both = sub.unshift(data.hitokoto, from)
             var typed = new Typed('#subtitle', {
               strings: sub,
               startDelay: 300,
@@ -100,38 +43,96 @@ else if source == '4'
               backSpeed: 50,
             })
           } else {
-            document.getElementById('subtitle').innerHTML = result.data.content
+            document.getElementById('subtitle').innerHTML = data.hitokoto
           }
         })
-      })
-    }
-
-    if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
-      subtitleType()
-    }
-
-else
-  script.
-    function subtitleType () {
-      if (!{theme.subtitle.effect}) { 
-        var typed = new Typed("#subtitle", {
-          strings: "!{theme.subtitle.sub}".split(","),
-          startDelay: 300,
-          typeSpeed: 150,
-          loop: !{theme.subtitle.loop},
-          backSpeed: 50
-        })
-      } else {
-        document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}'
       }
-    }
 
-    if (!{theme.subtitle.effect}) {
+      if (!{theme.subtitle.effect}) {
-      if (typeof Typed === 'function') subtitleType()
+        if (typeof Typed === 'function') subtitleType()
-      else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
-    } else {
+      } else {
-      subtitleType()
+        subtitleType()
-    }
+      }
+
+  when 3
+    script.
+      function subtitleType () {
+        $.getScript('http://yijuzhan.com/api/word.php?m=js', function () {
+          var con = str[0]
+          if (!{theme.subtitle.effect}) {
+            var from = '出自 ' + str[1]
+            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+            var both = sub.unshift(con, from)
+            var typed = new Typed('#subtitle', {
+              strings: sub,
+              startDelay: 300,
+              typeSpeed: 150,
+              loop: !{theme.subtitle.loop},
+              backSpeed: 50,
+            })
+          } else {
+            document.getElementById('subtitle').innerHTML = con
+          }
+        })
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') subtitleType()
+        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+      } else {
+        subtitleType()
+      }
+
+  when 4
+    script.
+      function subtitleType () {
+        $.getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js',function () {
+          jinrishici.load(function (result) {
+            if (!{theme.subtitle.effect}) {
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
+              var content = result.data.content
+              var both = sub.unshift(content)
+              var typed = new Typed('#subtitle', {
+                strings: sub,
+                startDelay: 300,
+                typeSpeed: 150,
+                loop: !{theme.subtitle.loop},
+                backSpeed: 50,
+              })
+            } else {
+              document.getElementById('subtitle').innerHTML = result.data.content
+            }
+          })
+        })
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') subtitleType()
+        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+      } else {
+        subtitleType()
+      }
+
+  default
+    script.
+      function subtitleType () {
+        if (!{theme.subtitle.effect}) { 
+          var typed = new Typed("#subtitle", {
+            strings: "!{theme.subtitle.sub}".split(","),
+            startDelay: 300,
+            typeSpeed: 150,
+            loop: !{theme.subtitle.loop},
+            backSpeed: 50
+          })
+        } else {
+          document.getElementById("subtitle").innerHTML = '!{theme.subtitle.sub[0]}'
+        }
+      }
+
+      if (!{theme.subtitle.effect}) {
+        if (typeof Typed === 'function') subtitleType()
+        else $.getScript('!{url_for(theme.CDN.typed)}', subtitleType)
+      } else {
+        subtitleType()
+      }

layout/includes/widget/card_author.pug

@@ -13,19 +13,19 @@
         .card-info-data-item.is-center
           a(href=url_for(config.archive_dir) + '/')
             .headline= _p('aside.articles') 
-            .length_num= site.posts.length
+            .length-num= site.posts.length
 
       if site.tags.length
         .card-info-data-item.is-center
           a(href=url_for(config.tag_dir) + '/')
             .headline= _p('aside.tags')
-            .length_num= site.tags.length
+            .length-num= site.tags.length
 
       if site.categories.length
         .card-info-data-item.is-center
           a(href=url_for(config.category_dir) + '/')
             .headline= _p('aside.categories') 
-            .length_num= site.categories.length
+            .length-num= site.categories.length
 
     a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
       i(class=theme.aside.card_author.button.icon)

layout/includes/widget/card_newest_comment.pug

@@ -2,6 +2,6 @@
   .card-content
     .item-headline
       i.fas.fa-bolt
-      span= _p('aside.card_newest_comments.heading')
+      span= _p('aside.card_newest_comments.headline')
     .aside-list
       span= _p('aside.card_newest_comments.loading_text')

layout/includes/widget/card_post_toc.pug

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

layout/includes/widget/index.pug

@@ -1,20 +1,28 @@
 #aside_content.aside_content
   if theme.aside.card_author.enable
-    include ./card_author.pug
+    !=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
+  if theme.aside.card_announcement.enable
+    !=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
   .sticky_layout
-    if theme.aside.card_announcement.enable
+    if is_post()
-      include ./card_announcement.pug
+      if showToc
-    if theme.aside.card_recent_post.enable
+        include ./card_post_toc.pug
-      include ./card_recent_post.pug
+      if theme.aside.card_recent_post.enable
-    if theme.newest_comments.enable
+        !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
-      include ./card_newest_comment.pug
+      if theme.ad && theme.ad.aside
-    if theme.ad && theme.ad.aside
+        !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
-      include ./card_ad.pug
+    else
-    if theme.aside.card_categories.enable
+      if theme.aside.card_recent_post.enable
-      include ./card_categories.pug
+        !=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
-    if theme.aside.card_tags.enable
+      if theme.ad && theme.ad.aside
-      include ./card_tags.pug
+        !=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
-    if theme.aside.card_archives.enable
+      if theme.newest_comments.enable
-      include ./card_archives.pug
+        !=partial('includes/widget/card_newest_comment', {}, {cache:theme.fragment_cache})
-    if theme.aside.card_webinfo.enable
+      if theme.aside.card_categories.enable
-      include ./card_webinfo.pug
+        !=partial('includes/widget/card_categories', {}, {cache:theme.fragment_cache})
+      if theme.aside.card_tags.enable
+        !=partial('includes/widget/card_tags', {}, {cache:theme.fragment_cache})
+      if theme.aside.card_archives.enable
+        !=partial('includes/widget/card_archives', {}, {cache:theme.fragment_cache})
+      if theme.aside.card_webinfo.enable
+        !=partial('includes/widget/card_webinfo', {}, {cache:theme.fragment_cache})

layout/post.pug

@@ -1,11 +1,11 @@
 extends includes/layout.pug
 
 block content
-  article#post(class="")
+  #post
     if top_img === false
       include includes/header/post-info.pug
 
-    #article-container.post-content!=page.content
+    article#article-container.post-content!=page.content
     include includes/post/post-copyright.pug
     .tag_share
       if (theme.post_meta.post.tags)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {

scripts/events/check_hexo.js

@@ -1,12 +0,0 @@
-const logger = require('hexo-log')()
-
-hexo.extend.filter.register('before_generate', () => {
-  // Get first two digits of the Hexo version number
-  var hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
-
-  if (hexoVer < 4.2) {
-    logger.error('Please update Hexo to V4.2.0 or higher!')
-    logger.error('請把 Hexo 升級到 V4.2.0 或更高的版本！')
-    process.exit(-1)
-  }
-})

scripts/events/init.js

@@ -0,0 +1,27 @@
+const logger = require('hexo-log')()
+
+hexo.extend.filter.register('before_generate', () => {
+  // Get first two digits of the Hexo version number
+  var hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
+
+  if (hexoVer < 5) {
+    logger.error('Please update Hexo to V5.0.0 or higher!')
+    logger.error('請把 Hexo 升級到 V5.0.0 或更高的版本！')
+    process.exit(-1)
+  }
+
+  if (hexo.locals.get) {
+    const data = hexo.locals.get('data')
+    if (data && data.butterfly) {
+      logger.error(" 'butterfly.yml' is deprecated. Please use '_config.butterfly.yml' ")
+      logger.error(" 'butterfly.yml' 已經棄用，請使用 '_config.butterfly.yml' ")
+      process.exit(-1)
+    }
+  }
+
+  // let stylus to get the hexo highlight config
+  const themeConfig = hexo.theme.config
+  const hexoConfig = hexo.config
+  themeConfig.highlight_settings = hexoConfig.highlight
+  themeConfig.prismjs_settings = hexoConfig.prismjs
+})

scripts/events/replace_config.js

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

scripts/filters/random_cover.js

@@ -6,7 +6,8 @@
 'use strict'
 
 hexo.extend.filter.register('before_post_render', function (data) {
-  if (hexo.theme.config.rootConfig.post_asset_folder) {
+  const { config } = this
+  if (config.post_asset_folder) {
     const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/
     const topImg = data.top_img
     const cover = data.cover

scripts/helpers/page.js

@@ -2,13 +2,12 @@
  * Butterfly
  * @example
  *  page_description()
- *  injectHtml(data)
  *  cloudTags(source, minfontsize, maxfontsize, limit)
  */
 
 'use strict'
 
-const { stripHTML, escapeHTML } = require('hexo-util')
+const { stripHTML, escapeHTML, prettyUrls } = require('hexo-util')
 const crypto = require('crypto')
 
 hexo.extend.helper.register('page_description', function () {
@@ -23,15 +22,6 @@ hexo.extend.helper.register('page_description', function () {
   }
 })
 
-hexo.extend.helper.register('injectHtml', function (data) {
-  let result = ''
-  if (!data) return ''
-  for (let i = 0; i < data.length; i++) {
-    result += data[i]
-  }
-  return result
-})
-
 hexo.extend.helper.register('cloudTags', function (options = {}) {
   const env = this
   let source = options.source
@@ -65,18 +55,18 @@ hexo.extend.helper.register('cloudTags', function (options = {}) {
 })
 
 hexo.extend.helper.register('urlNoIndex', function () {
-  const { permalink } = hexo.config
+  return prettyUrls(this.url, { trailing_index: false, trailing_html: false })
-  let url = this.url.replace(/index\.html$/, '')
-  if (!permalink.endsWith('.html')) {
-    url = url.replace(/\.html$/, '')
-  }
-  return url
 })
 
 hexo.extend.helper.register('md5', function (path) {
   return crypto.createHash('md5').update(decodeURI(this.url_for(path))).digest('hex')
 })
 
-hexo.extend.helper.register('get_hexo_version', function () {
+hexo.extend.helper.register('injectHtml', function (data) {
-  return hexo.version
+  let result = ''
+  if (!data) return ''
+  for (let i = 0; i < data.length; i++) {
+    result += data[i]
+  }
+  return result
 })

scripts/helpers/related_post.js

@@ -35,7 +35,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
     return ''
   }
   let result = ''
-  const hexoConfig = hexo.theme.config.rootConfig
+  const hexoConfig = hexo.config
   const config = hexo.theme.config
 
   const limitNum = config.related_post.limit || 6
@@ -71,7 +71,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
         lazySrc +
         '="' +
         this.url_for(cover) +
-        '">'
+        '" alt="cover">'
       if (dateType === 'created') {
         result +=
           '<div class="content is-center"><div class="date"><i class="far fa-calendar-alt fa-fw"></i>' +

scripts/tag/mermaid.js

@@ -6,8 +6,10 @@
 
 'use strict'
 
+const { escapeHTML } = require('hexo-util')
+
 function mermaid (args, content) {
-  return `<div class="mermaid">${content}</div>`
+  return `<div class="mermaid">${escapeHTML(content)}</div>`
 }
 
 hexo.extend.tag.register('mermaid', mermaid, { ends: true })

source/css/_global/function.styl

@@ -68,27 +68,7 @@ if hexo-config('enter_transitions')
   #ribbon-canvas
     animation: ribbon_to_show 4s
 
-  .tocOpenPc
+  #sidebar-menus
-    .sidebar-toc__title
-      animation: tocsidebarLtoR .5s
-
-    .sidebar-toc__progress
-      animation: tocsidebarLtoR .7s
-
-    .sidebar-toc__content
-      animation: tocsidebarLtoR .9s
-
-  .tocOpenMobile
-    .sidebar-toc__title
-      animation: tocsidebarRtoL .4s
-
-    .sidebar-toc__progress
-      animation: tocsidebarRtoL .6s
-
-    .sidebar-toc__content
-      animation: tocsidebarRtoL .7s
-
-  #mobile-sidebar-menus
     &.open
       for i in 1 2 3 4
         > :nth-child({i})
@@ -215,19 +195,5 @@ if hexo-config('avatar.effect') == true
   0%
     transform: translateX(200px)
 
-  100%
-    transform: translateX(0)
-
-@keyframes tocsidebarRtoL
-  0%
-    transform: translateX(200px)
-
-  100%
-    transform: translateX(0)
-
-@keyframes tocsidebarLtoR
-  0%
-    transform: translateX(-200px)
-
   100%
     transform: translateX(0)

source/css/_global/index.styl

@@ -25,7 +25,7 @@
   --blockquote-color: $blockquote-color
   --blockquote-bg: $blockquote-background-color
   --reward-pop: $reward-pop-up-bg
-  --sidebar-icon-color: $sidebar-icon-color
+  --toc-link-color: $toc-link-color
 
 html
   height: 100%
@@ -140,13 +140,24 @@ button
   background: none
   cursor: pointer
 
+a
+  color: $a-link-color
+  text-decoration: none
+  word-wrap: break-word
+  transition: all .2s
+  overflow-wrap: break-word
+
+  &:hover
+    color: $light-blue
+
 // font
-#site-title,
+if $site-name-font
-#site-subtitle,
+  #site-title,
-#site-name,
+  #site-subtitle,
-#aside_content .author-info__name,
+  #site-name,
-#aside_content .author-info__description
+  #aside_content .author-info__name,
-  font-family: $site-name-font
+  #aside_content .author-info__description
+    font-family: $site-name-font
 
 .is-center
   text-align: center
@@ -183,6 +194,10 @@ button
       transition-timing-function: cubic-bezier(.45, 1.64, .47, .66)
       transform: scaleX(1)
 
+img
+  max-width: 100%
+  transition: all .2s
+
 img[src=''],
 img:not([src])
   opacity: 0

source/css/_highlight/highlight.styl

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

source/css/_highlight/highlight/index.styl

@@ -22,9 +22,9 @@ if $highlight_theme != false
       overflow: auto
       border: none
 
-    td
+      td
-      padding: 0
+        padding: 0
-      border: none
+        border: none
 
     .gutter pre
       padding-right: .5rem

source/css/_highlight/prismjs/index.styl

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

source/css/_layout/404.styl

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

source/css/_layout/aside.styl

@@ -1,10 +1,27 @@
 #aside_content
   width: 25%
 
+  +minWidth900()
+    if hexo-config('aside.position') == 'right'
+      padding-left: 15px
+    else
+      padding-right: 15px
+
+  +maxWidth900()
+    width: 100%
+
+  if hexo-config('aside.mobile') == false
+    +maxWidth768()
+      display: none
+
   > .card-widget:first-child
     margin-top: 0
 
+    +maxWidth900()
+      margin-top: 1rem
+
   .card-widget
+    position: relative
     overflow: hidden
     margin-top: 1rem
     border-radius: 8px
@@ -48,7 +65,7 @@
             color: var(--font-color)
             font-size: 1em
 
-          .length_num
+          .length-num
             margin-top: -.3rem
             color: var(--text-highlight-color)
             font-size: 1.4em
@@ -82,15 +99,12 @@
     padding: 1rem 1.2rem
 
   .item-headline
+    padding-bottom: .3rem
     font-size: 1.2em
 
     span
       margin-left: .5rem
 
-    & + div,
-    & + ul
-      padding: .3rem 0 0
-
   .sticky_layout
     +minWidth900()
       position: sticky
@@ -171,6 +185,7 @@
   .card-archives ul.card-archive-list,
   .card-categories ul.card-category-list
     margin: 0
+    padding: 0
     list-style: none
 
   .card-archives ul.card-archive-list > .card-archive-list-item,
@@ -248,23 +263,78 @@
             flex: 1
             padding-right: 1rem
 
-+maxWidth900()
+  // toc
-  #aside_content
+  #card-toc
-    width: 100% !important
+    +maxWidth900()
+      position: fixed
+      right: 45px
+      bottom: 30px
+      z-index: 100
+      display: none
+      width: $toc-mobile-width
+      transform-origin: right bottom
+      animation: toc-open .3s
 
-  #aside_content
+      .toc-child
-    .card-widget:first-child
+        display: block !important
-      margin-top: 1rem
+
+    .toc-content
+      overflow-y: auto
+      max-height: calc(100vh - 120px)
+
+      ol,
+      li
+        list-style: none
+
+      > ol
+        padding: 0 !important
+
+      ol
+        margin: 0
+        padding-left: .4rem
+
+      .toc-link
+        display: block
+        padding-left: .3rem
+        border-left: 3px solid transparent
+        color: var(--toc-link-color)
+        transition: all .2s ease-in-out
+
+        &.active
+          border-left-color: darken($theme-toc-color, 20%)
+          background: $theme-toc-color
+          color: $toc-active-color
+
+      &:before
+        position: absolute
+        top: .6rem
+        right: 1.2rem
+        color: #a9a9a9
+        content: attr(progress-percentage)
+        font-style: italic
+        font-size: 1.2rem
+
+@keyframes toc-open
+  0%
+    transform: scale(.7)
+
+  100%
+    transform: scale(1)
+
+@keyframes toc-close
+  0%
+    transform: scale(1)
+
+  100%
+    transform: scale(.7)
 
 +minWidth900()
-  #aside_content
+  html.hide-aside
-    .card-widget
+    .layout
-      if hexo-config('aside.position') == 'right'
+      justify-content: center
-        margin-left: 15px
-      else
-        margin-right: 15px
 
-if hexo-config('aside.mobile') == false
+      > .aside_content
-  +maxWidth768()
+        display: none
-    #aside_content
+
-      display: none
+      > div:first-child
+        width: 80%

source/css/_layout/comments.styl

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

source/css/_layout/head.styl

@@ -116,29 +116,32 @@
 
   #post-info
     position: absolute
-    bottom: 1.5rem
+    bottom: 5rem
     padding: 0 8%
     width: 100%
-    text-align: left
+    text-align: center
+
+    +maxWidth900()
+      bottom: 1.5rem
+      text-align: left
 
     +maxWidth768()
       bottom: 1.1rem
       padding: 0 1.1rem
 
 #post-info
-  #post-title
+  .post-title
+    @extend .limit-more-line
     margin-bottom: .4rem
-    font-size: 2.15em
+    font-size: 2.5em
+    font-weight: normal
+    color: var(--white)
+    line-height: 1.5
+    -webkit-line-clamp: 3
 
     +maxWidth768()
       font-size: 1.72em
 
-    .posttitle
-      @extend .limit-more-line
-      color: var(--white)
-      line-height: 1.5
-      -webkit-line-clamp: 3
-
   #post-meta
     color: var(--light-grey)
     font-size: 95%
@@ -185,7 +188,7 @@
   & > #post-info
     margin-bottom: 1.5rem
 
-    .posttitle
+    .post-title
       padding-bottom: .2rem
       border-bottom: 1px solid var(--light-grey)
       color: var(--text-highlight-color)

source/css/_layout/mobile-sidebar.styl

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

source/css/_layout/pagination.styl

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

source/css/_layout/post.styl

@@ -142,6 +142,24 @@ no-beautify()
       padding-left: .3rem
 
 #article-container
+  word-wrap: break-word
+  overflow-wrap: break-word
+
+  a
+    color: $theme-link-color
+
+    &:hover
+      text-decoration: underline
+
+  img
+    margin: 0 auto .8rem
+
+  p
+    margin: 0 0 .8rem
+
+  iframe
+    margin: 0 0 1rem
+
   if hexo-config('beautify.enable') && hexo-config('beautify.field') == 'site'
     beautify()
   else if hexo-config('beautify.enable') && hexo-config('beautify.field') == 'post'
@@ -152,42 +170,7 @@ no-beautify()
   else
     no-beautify()
 
-a
+#post
-  color: $a-link-color
-  text-decoration: none
-  word-wrap: break-word
-  transition: all .2s
-  overflow-wrap: break-word
-
-  &:hover
-    color: $light-blue
-
-a.fancybox
-  outline: none
-
-  &:focus
-    outline: none
-
-  display: inline-block
-  width: 100%
-  text-align: center
-
-img
-  max-width: 100%
-  transition: all .2s
-
-.katex-wrap
-  overflow: auto
-
-  if hexo-config('katex') && hexo-config('katex.hide_scrollbar')
-    &::-webkit-scrollbar
-      display: none
-
-.layout_post
-  margin: 0 auto
-  padding: 2rem 15px
-  max-width: 1000px
-
   img
     display: block
 
@@ -272,25 +255,6 @@ img
           &:hover
             text-decoration: none
 
-#article-container
-  word-wrap: break-word
-  overflow-wrap: break-word
-
-  a
-    color: $theme-link-color
-
-    &:hover
-      text-decoration: underline
-
-  img
-    margin: 0 auto .8rem
-
-  p
-    margin: 0 0 .8rem
-
-  iframe
-    margin: 0 0 1rem
-
   .post-outdate-notice
     position: relative
     margin: 0 0 1rem
@@ -311,25 +275,3 @@ img
         color: $noticeOutdate-border
         content: '\f071'
         transform: translateY(-50%)
-
-+maxWidth1024()
-  .layout_post
-    width: auto
-
-+maxWidth768()
-  .layout_post
-    padding: 1rem 5px
-
-    & > #post
-      padding: 1.8rem .7rem
-
-// adjust the layout width in big screen
-+minWidth2000()
-  .layout_post
-    max-width: 1300px
-
-  .layout_page
-    max-width: 1500px
-
-    &.hide-aside
-      max-width: 1300px

source/css/_layout/rightside.styl

@@ -36,5 +36,9 @@
   #mobile-toc-button
     display: none
 
-    +maxWidth1024()
+    +maxWidth900()
       display: block
+
+  +maxWidth900()
+    #hide-aside-btn
+      display: none

source/css/_layout/sidebar.styl

@@ -1,88 +1,97 @@
-#toggle-sidebar
-  position: fixed
-  bottom: $sidebar-icon-top
-  left: $sidebar-icon-left
-  z-index: 100
-  color: var(--sidebar-icon-color)
-  font-size: $sidebar-icon-size
-  cursor: pointer
-  transition: all .2s
-
-  +maxWidth1024()
-    display: none
-
 #sidebar
-  position: fixed
+  #menu-mask
-  top: 0
+    position: fixed
-  left: -($sidebar-width)
+    z-index: 102
-  z-index: 10
+    display: none
-  padding: 1rem 0 2rem .5rem
+    width: 100%
-  width: $sidebar-width
+    height: 100%
-  height: 100%
+    background: alpha($dark-black, .8)
-  background: var(--sidebar-bg)
-  opacity: .9
 
-  &.tocOpenPc
+  #sidebar-menus
-    & > #toggle-sidebar
+    position: fixed
-      color: #99a9bf
+    top: 0
-      transform: rotateZ(180deg)
+    right: -($sidebar-width)
-
-  +maxWidth1024()
-    right: -($mobile-sidebar-width)
-    left: auto
     z-index: 103
-    width: $mobile-sidebar-width
+    overflow-x: hidden
-    box-shadow: none
+    overflow-y: auto
-    opacity: 1
+    width: $sidebar-width
-    transition: all .4s
+    height: 100%
+    background: var(--sidebar-bg)
+    transition: all .5s
 
-    .toc-child
+    &.open
-      display: block !important
+      transform: translate3d(-100%, 0, 0)
 
-  .sidebar-toc
+    & > .author-avatar
-    ol,
+      padding: 1.3rem 1.5rem 0
-    li
-      list-style: none
-
-    ol
-      margin-top: .2rem
-      padding-left: .4rem
-
-    &__title
-      padding-right: .5rem
       text-align: center
-      font-size: 1.3em
 
-    &__content
+      img
-      overflow-y: scroll
+        width: 110px
-      padding-bottom: 5rem
+        height: 110px
-      height: 90vh
+        border-radius: 70px
+        transition: all .5s
 
-    .toc-link
+        &:hover
-      display: block
+          transform: rotate(360deg)
-      padding-left: .2rem
-      border-right: 3px solid transparent
-      transition: all .2s ease-in-out
 
-      &.active
+    .site-data
-        border-right-color: darken($theme-toc-color, 20%)
+      display: table
-        background: $theme-toc-color
+      padding: .6rem .5rem 0
-        color: $sidebar-active-color
+      width: 100%
+      table-layout: fixed
 
-    &__progress
+      .data-item
-      position: relative
+        display: table-cell
-      margin-bottom: .3rem
-      padding-left: .6rem
-      color: $theme-toc-color
 
-      .progress-notice
+        .data-item-link
-        margin-right: .4rem
+          & > a > div
+            @extend .limit-one-line
 
-      .progress-num
+          .length-num
-        display: inline-block
+            color: var(--text-highlight-color)
-        min-width: .9rem
+            font-size: 1.28em
 
-      &-bar
+          .headline
-        width: 0
+            color: var(--font-color)
-        height: 1px
+
-        background: $theme-toc-color
+    hr
+      margin: 1rem auto
+
+    .menus_items
+      padding: 0 .5rem 2rem
+
+      .site-page
+        @extend .limit-one-line
+        position: relative
+        display: block
+        padding: .3rem 1.5rem
+        color: var(--font-color)
+        font-size: 1.15em
+        cursor: pointer
+
+        i:first-child
+          width: 25%
+          text-align: left
+
+        span
+          width: 75%
+
+          &:hover
+            color: $light-blue
+
+      .expand
+        position: absolute
+        top: .78em
+        right: .4rem
+        transition: transform .3s
+
+        &.hide
+          transform: rotate(90deg) !important
+
+      .menus_item_child
+        margin: 0
+        list-style: none
+
+        if hexo-config('hide_sidebar_menu_child')
+          display: none

source/css/_layout/third-party.styl

@@ -14,7 +14,7 @@
       background: url(hexo-config('valine.bg')) 100% 100% no-repeat
 
       &:focus
-        background: none
+        background-image: none
 
   .vimg
     transition: all .3s
@@ -61,6 +61,13 @@
     margin: 0 0 .8em
     padding: .3rem 0 .8em
 
+.katex-wrap
+  overflow: auto
+
+  if hexo-config('katex') && hexo-config('katex.hide_scrollbar')
+    &::-webkit-scrollbar
+      display: none
+
 // mathjax
 .mathjax-overflow
   overflow-x: auto

source/css/_mode/darkmode.styl

@@ -26,7 +26,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
     --blockquote-color: alpha(#FFFFFF, .7)
     --blockquote-bg: lighten(#121212, 10)
     --reward-pop: lighten(#121212, 10)
-    --sidebar-icon-color: alpha(#FFFFFF, .7)
+    --toc-link-color: alpha(#FFFFFF, .6)
 
     #web_bg:before,
     #footer:before,
@@ -48,6 +48,9 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
         code
           background: $code-background
 
+      .aplayer
+        filter: brightness(.8)
+
     // 頭部
     #page-header
       & > #nav.fixed,
@@ -65,7 +68,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
       figure.highlight
         box-shadow: none
 
-        if hexo-config('rootConfig.highlight') && hexo-config('rootConfig.highlight.enable')
+        if hexo-config('highlight_settings') && hexo-config('highlight_settings.enable')
           table::-webkit-scrollbar-thumb
             background: lighten(#121212, 5)
 
@@ -83,11 +86,11 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
           color: #90a4ae !important
 
     #post-comment
-      .comment-switch
+      #comment-switch
         if hexo-config('comments.text')
           background: #2c2c2c !important
 
-        label
+        .switch-btn
           filter: brightness(.8)
 
     // note
@@ -103,8 +106,7 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
     .error-img,
     #article-container iframe,
     img,
-    .gist,
+    .gist
-    .aplayer
       filter: brightness(.8)
 
     #aside_content .aside-list > .aside-list-item:not(:last-child)

source/css/_mode/readmode.styl

@@ -12,18 +12,21 @@ if hexo-config('readmode')
 
   [data-theme='dark']
     .read-mode
-      --font-color: rgba(255, 255, 255, .6)
+      --font-color: rgba(255, 255, 255, .7)
       --readmode-light-color: #0d0d0d
-      --white: rgba(255, 255, 255, .8)
+      --white: rgba(255, 255, 255, .9)
-      --light-grey: rgba(255, 255, 255, .6)
+      --light-grey: rgba(255, 255, 255, .7)
-      --gray: rgba(255, 255, 255, .6)
+      --gray: rgba(255, 255, 255, .7)
-      --hr-border: rgba(255, 255, 255, .3)
+      --hr-border: rgba(255, 255, 255, .5)
-      --hr-before-color: rgba(255, 255, 255, .6)
+      --hr-before-color: rgba(255, 255, 255, .7)
       -highlight-bg: #171717
 
   .read-mode
     background: var(--readmode-light-color)
 
+    #aside_content
+      display: none
+
     #body-wrap
       padding-left: 0 !important
 
@@ -38,23 +41,21 @@ if hexo-config('readmode')
         padding: 0
         text-align: center
 
-    .layout_post
+    #post
-      > #post
+      margin: 0 auto
-        background: transparent
+      background: transparent
-        box-shadow: none
+      box-shadow: none
 
-        &:hover
+      &:hover
-          box-shadow: none
+        box-shadow: none
 
     & > canvas
       display: none !important
 
     .highlight-tools,
     #footer,
-    #post > *:not(:first-child),
+    #post > *:not(#post-info):not(.post-content),
     #to_comment,
-    #sidebar,
-    #toggle-sidebar,
     #mobile-toc-button,
     #nav,
     .post-outdate-notice,
@@ -179,6 +180,7 @@ if hexo-config('readmode')
 
       .note
         border: 2px solid var(--gray)
+        border-left-color: var(--gray) !important
         filter: none
-        background-color: var(--readmode-light-color)
+        background-color: var(--readmode-light-color) !important
         color: var(--font-color)

source/css/_page/common.styl

@@ -1,4 +1,4 @@
-.layout_page
+.layout
   display: flex
   margin: 0 auto
   padding: 2rem 15px
@@ -10,41 +10,43 @@
   +maxWidth768()
     padding: 1rem 5px !important
 
+  +minWidth2000()
+    max-width: 1500px
+
   & > div:first-child:not(.recent-posts)
+    align-self: flex-start
+    padding: 50px 40px
+    border-radius: 8px
+    background: var(--card-bg)
+    box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
+
+    &:hover
+      box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
+
     +maxWidth768()
       padding: 1.8rem .7rem !important
 
   & > div:first-child
     width: 75%
+    transition: all .3s
 
     +maxWidth900()
       width: 100% !important
 
+    if hexo-config('aside.position') == 'left'
+      +minWidth900()
+        order: 2
+
   // 隱藏aside
   &.hide-aside
     max-width: 1000px
 
+    +minWidth2000()
+      max-width: 1300px
+
     & > div
       width: 100% !important
 
-.layout_post > #post,
-.layout_page > div:first-child:not(.recent-posts)
-  align-self: flex-start
-  padding: 50px 40px
-  border-radius: 8px
-  background: var(--card-bg)
-  box-shadow: 0 4px 8px 6px rgba(7, 17, 27, .06)
-  transition: all .3s
-
-  &:hover
-    box-shadow: 0 4px 12px 12px rgba(7, 17, 27, .15)
-
-if hexo-config('aside.position') == 'left'
-  +minWidth900()
-    .layout_page
-      & > div:first-child
-        order: 2
-
 #page
   h1.page-title
     margin-top: .4rem

source/css/_search/algolia.styl

@@ -1,76 +1,77 @@
 #algolia-search
-  animation: titlescale .5s
+  .search-dialog
+    animation: titlescale .5s
 
-  .ais-search-box
+    .ais-search-box
-    margin: 0 auto
+      margin: 0 auto
-    max-width: 100%
+      max-width: 100%
-    width: 100%
+      width: 100%
 
-    input
+      input
-      padding: .25rem .7rem
+        padding: .25rem .7rem
-      outline: none
+        outline: none
-      border: 2px solid $search-color
+        border: 2px solid $search-color
-      border-radius: 2rem
+        border-radius: 2rem
-      background: var(--search-bg)
+        background: var(--search-bg)
-      color: var(--search-input-color)
+        color: var(--search-input-color)
 
-  .ais-hits--item.algolia-hit-item
+    .ais-hits--item.algolia-hit-item
-    position: relative
+      position: relative
-    padding-left: 1.2rem
+      padding-left: 1.2rem
-
-    &:hover
-      &:before
-        border-color: $pseudo-hover
-
-    &:before
-      $w = .5em
-      position: absolute
-      top: .53em
-      left: 0
-      width: w = $w
-      height: h = w
-      border: .15rem solid $search-color
-      border-radius: w
-      background: transparent
-      content: ''
-      line-height: h
-      transition: all .2s ease-in-out
-
-    a
-      display: block
-      color: var(--search-result-title)
-      cursor: pointer
 
       &:hover
-        color: $search-color
+        &:before
+          border-color: $pseudo-hover
 
-    em
+      &:before
-      color: $search-keyword-highlight
+        $w = .5em
-      font-weight: bold
+        position: absolute
+        top: .53em
+        left: 0
+        width: w = $w
+        height: h = w
+        border: .15rem solid $search-color
+        border-radius: w
+        background: transparent
+        content: ''
+        line-height: h
+        transition: all .2s ease-in-out
 
-  .ais-pagination.pagination
+      a
-    margin: .8rem 0 0
+        display: block
-    padding: 0
+        color: var(--search-result-title)
-    text-align: center
+        cursor: pointer
 
-    .ais-pagination--item
+        &:hover
-      margin: 0 .2rem
+          color: $search-color
+
+      em
+        color: $search-keyword-highlight
+        font-weight: bold
+
+    .ais-pagination.pagination
+      margin: .8rem 0 0
       padding: 0
+      text-align: center
 
-      a
+      .ais-pagination--item
-        display: inline-block
+        margin: 0 .2rem
-        min-width: 1.2rem
+        padding: 0
-        height: 1.2rem
-        text-align: center
-        line-height: 1.2rem
 
-    .ais-pagination--item.current
+        a
-      a
+          display: inline-block
-        background: $theme-paginator-color
+          min-width: 1.2rem
-        color: #eee
+          height: 1.2rem
-        cursor: default
+          text-align: center
+          line-height: 1.2rem
 
-  .algolia-logo
+      .ais-pagination--item.current
-    padding-top: 2px
+        a
-    width: 4rem
+          background: $theme-paginator-color
-    height: 1.5rem
+          color: #eee
+          cursor: default
+
+    .algolia-logo
+      padding-top: 2px
+      width: 4rem
+      height: 1.5rem

source/css/_search/local-search.styl

@@ -1,68 +1,69 @@
 #local-search
-  animation: titlescale .5s
+  .search-dialog
+    animation: titlescale .5s
 
-  .local-search-box
+    .local-search-box
-    margin: 0 auto
+      margin: 0 auto
-    max-width: 100%
+      max-width: 100%
-    width: 100%
-
-    input
-      padding: .25rem .7rem
       width: 100%
-      outline: none
-      border: 2px solid $search-color
-      border-radius: 2rem
-      background: var(--search-bg)
-      color: var(--search-input-color)
-      -webkit-appearance: none
 
-  .local-search__hit-item
+      input
-    position: relative
+        padding: .25rem .7rem
-    padding-left: 1.2rem
+        width: 100%
-    line-height: 1.7
+        outline: none
+        border: 2px solid $search-color
+        border-radius: 2rem
+        background: var(--search-bg)
+        color: var(--search-input-color)
+        -webkit-appearance: none
 
-    &:hover
+    .local-search__hit-item
-      &:before
+      position: relative
-        border-color: $pseudo-hover
+      padding-left: 1.2rem
-
+      line-height: 1.7
-    &:before
-      $w = .5em
-      position: absolute
-      top: .45em
-      left: 0
-      width: w = $w
-      height: h = w
-      border: .15rem solid $search-color
-      border-radius: w
-      background: transparent
-      content: ''
-      line-height: h
-      transition: all .2s ease-in-out
-
-    a
-      display: block
-      color: var(--search-result-title)
-      font-weight: 600
-      cursor: pointer
 
       &:hover
-        color: $search-color
+        &:before
+          border-color: $pseudo-hover
 
-    .search-result
+      &:before
-      margin: 0 0 .4rem
+        $w = .5em
-      word-break: break-all
+        position: absolute
+        top: .45em
+        left: 0
+        width: w = $w
+        height: h = w
+        border: .15rem solid $search-color
+        border-radius: w
+        background: transparent
+        content: ''
+        line-height: h
+        transition: all .2s ease-in-out
 
-    .search-keyword
+      a
-      color: $search-keyword-highlight
+        display: block
-      font-weight: bold
+        color: var(--search-result-title)
+        font-weight: 600
+        cursor: pointer
 
-  .local-search-stats__hr
+        &:hover
-    display: none !important
+          color: $search-color
 
-  .search-result-list
+      .search-result
-    overflow-y: auto
+        margin: 0 0 .4rem
-    max-height: 10.5rem
+        word-break: break-all
 
-    +maxWidth768()
+      .search-keyword
-      padding-bottom: 2rem
+        color: $search-keyword-highlight
-      max-height: 75vh !important
+        font-weight: bold
+
+    .local-search-stats__hr
+      display: none !important
+
+    .search-result-list
+      overflow-y: auto
+      max-height: 10.5rem
+
+      +maxWidth768()
+        padding-bottom: 2rem
+        max-height: 75vh !important

source/css/var.styl

@@ -17,7 +17,7 @@ $dafault-font-family = -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica
 $dafault-code-font = consolas, Menlo, 'PingFang SC', 'Microsoft YaHei', sans-serif
 $font-family = hexo-config('font.font-family') ? unquote(hexo-config('font.font-family')) : $dafault-font-family
 $code-font-family = hexo-config('font.code-font-family') ? unquote(hexo-config('font.code-font-family')) : $dafault-code-font
-$site-name-font = hexo-config('blog_title_font.font-family') ? unquote(hexo-config('blog_title_font.font-family')) : $font-family
+$site-name-font = hexo-config('blog_title_font.font-family') && unquote(hexo-config('blog_title_font.font-family'))
 // hr
 $hrEnable = hexo-config('hr_icon') && hexo-config('hr_icon.enable')
 $hr-icon = $hrEnable && hexo-config('hr_icon.icon') ? hexo-config('hr_icon.icon') : '\f0c4'
@@ -58,14 +58,12 @@ $a-link-color = #99a9bf
 $sticky-color = $light-orange
 $theme-meta-color = $themeColorEnable && hexo-config('theme_color.meta_color') ? convert(hexo-config('theme_color.meta_color')) : #858585
 // sidebar
-$sidebar-icon-top = 20px
-$sidebar-icon-left = $sidebar-icon-top - 4px
-$sidebar-icon-size = 16px
-$sidebar-icon-color = #1F2D3D
-$sidebar-width = 300px
 $sidebar-background = #f6f8fa
-$sidebar-active-color = #fff
+$sidebar-width = 300px
-$mobile-sidebar-width = 250px
+// aside
+$toc-link-color = #666261
+$toc-mobile-width = 300px
+$toc-active-color = #fff
 // Button
 $button-color = #fff
 $button-hover-color = $themeColorEnable && hexo-config('theme_color.button_hover') ? convert(hexo-config('theme_color.button_hover')) : $light-orange

source/js/main.js

@@ -1,21 +1,11 @@
-
-/**
-  * 當menu過多時，自動適配，避免UI錯亂
-  * @param {*} n
-  * 傳入 1 sidebar打開時
-  * 傳入 2 正常狀態下
-  */
-
 $(function () {
   const blogNameWidth = $('#site-name').width()
   const menusWidth = $('#menus').width()
-  const sidebarWidth = $('#sidebar').width() || 300
 
-  const adjustMenu = function (n) {
+  const adjustMenu = () => {
     const $nav = $('#nav')
     let t
-    if (n === 0) t = true
+    if (window.innerWidth < 768) t = true
-    else if (n === 1) t = blogNameWidth + menusWidth > $nav.width() - sidebarWidth - 30
     else t = blogNameWidth + menusWidth > $nav.width() - 30
 
     if (t) {
@@ -27,157 +17,45 @@ $(function () {
 
   // 初始化header
   const initAdjust = () => {
-    if (window.innerWidth < 768) adjustMenu(0)
+    adjustMenu()
-    else adjustMenu(2)
     $('#nav').addClass('show')
   }
 
-  /**
+  // sidebar menus
- * 進入post頁sidebar處理
- */
-  const OpenSidebarAuto = () => {
-    if (window.innerWidth > 1024 && $('#toggle-sidebar').hasClass('on')) {
-      setTimeout(function () {
-        openSidebar()
-      }, 400)
-    }
-  }
-
-  /**
- * 點擊左下角箭頭,顯示sidebar
- */
-
-  const closeSidebar = () => {
-    $('#sidebar').removeClass('tocOpenPc').animate({
-      left: '-300px'
-    }, 400)
-    $('#menus').animate({
-      paddingRight: 0
-    }, 400)
-    $('#body-wrap').animate({
-      paddingLeft: 0
-    }, 400)
-    if ($('#nav').hasClass('hide-menu')) {
-      setTimeout(function () {
-        adjustMenu(2)
-      }, 400)
-    }
-  }
-
-  const openSidebar = () => {
-    if (!$('#nav').hasClass('hide-menu')) {
-      adjustMenu(1)
-    }
-    $('#sidebar').addClass('tocOpenPc').animate({
-      left: 0
-    }, 400)
-    $('#menus').animate({
-      paddingRight: 300
-    }, 400)
-    $('#body-wrap').animate({
-      paddingLeft: 300
-    }, 400)
-  }
-
-  const toggleSidebar = function () {
-    $('#toggle-sidebar').on('click', function () {
-      const isOpen = $(this).hasClass('on')
-      isOpen ? $(this).removeClass('on') : $(this).addClass('on')
-      if (isOpen) {
-        closeSidebar()
-      } else {
-        openSidebar()
-      }
-    })
-  }
-
-  /**
- * 手機menu和toc按鈕點擊
- * 顯示menu和toc的sidebar
- */
-
   const sidebarFn = () => {
     const $toggleMenu = $('#toggle-menu')
-    const $mobileSidebarMenus = $('#mobile-sidebar-menus')
+    const $mobileSidebarMenus = $('#sidebar-menus')
-    const $mobileTocButton = $('#mobile-toc-button')
+    const $menuMask = $('#menu-mask')
-    const $menuMask = $('#menu_mask')
     const $body = $('body')
-    const $sidebar = $('#sidebar')
 
-    function openMobileSidebar (name) {
+    function openMobileSidebar () {
       btf.sidebarPaddingR()
       $body.css('overflow', 'hidden')
       $menuMask.fadeIn()
-
+      $toggleMenu.removeClass('close').addClass('open')
-      if (name === 'menu') {
+      $mobileSidebarMenus.addClass('open')
-        $toggleMenu.removeClass('close').addClass('open')
-        $mobileSidebarMenus.addClass('open')
-      }
-
-      if (name === 'toc') {
-        $mobileTocButton.removeClass('close').addClass('open')
-        $sidebar.addClass('tocOpenMobile').css({ transform: 'translate3d(-100%,0,0)', left: '' })
-      }
     }
 
-    function closeMobileSidebar (name) {
+    function closeMobileSidebar () {
       $body.css({ overflow: '', 'padding-right': '' })
       $menuMask.fadeOut()
-
+      $toggleMenu.removeClass('open').addClass('close')
-      if (name === 'menu') {
+      $mobileSidebarMenus.removeClass('open')
-        $toggleMenu.removeClass('open').addClass('close')
-        $mobileSidebarMenus.removeClass('open')
-      }
-
-      if (name === 'toc') {
-        $mobileTocButton.removeClass('open').addClass('close')
-        $sidebar.removeClass('tocOpenMobile').css({ transform: '' })
-      }
     }
 
     $toggleMenu.on('click', function () {
-      openMobileSidebar('menu')
+      openMobileSidebar()
-    })
-
-    $mobileTocButton.on('click', function () {
-      openMobileSidebar('toc')
     })
 
     $menuMask.on('click touchstart', function (e) {
       if ($toggleMenu.hasClass('open')) {
-        closeMobileSidebar('menu')
+        closeMobileSidebar()
-      }
-      if ($mobileTocButton.hasClass('open')) {
-        closeMobileSidebar('toc')
       }
     })
 
     $(window).on('resize', function (e) {
       if (!$toggleMenu.is(':visible')) {
-        if ($toggleMenu.hasClass('open')) closeMobileSidebar('menu')
+        if ($toggleMenu.hasClass('open')) closeMobileSidebar()
-      }
-    })
-
-    const mql = window.matchMedia('(max-width: 1024px)')
-    const $toggleSidebar = $('#toggle-sidebar')
-    const matchFn = (ev) => {
-      if (ev.matches) {
-        if ($sidebar.hasClass('tocOpenPc')) closeSidebar()
-      } else {
-        if ($toggleSidebar.hasClass('on')) openSidebar()
-        if ($mobileTocButton.hasClass('open')) closeMobileSidebar('toc')
-      }
-    }
-
-    mql.addListener(matchFn)
-    document.addEventListener('pjax:send', () => { mql.removeListener(matchFn) })
-
-    // toc元素點擊
-    $sidebar.find('.toc-link').on('click', function (e) {
-      e.preventDefault()
-      btf.scrollToDest(decodeURI($(this).attr('href')))
-      if (window.innerWidth < 1024) {
-        closeMobileSidebar('toc')
       }
     })
   }
@@ -427,9 +305,10 @@ $(function () {
  *  toc
  */
   const tocFn = function () {
-    const $sidebar = $('#sidebar')
+    const $cardTocLayout = $('#card-toc')
-    const $tocChild = $sidebar.find('.toc-child')
+    const $cardToc = $cardTocLayout.find('.toc-content')
-    const $tocLink = $sidebar.find('.toc-link')
+    const $tocChild = $cardToc.find('.toc-child')
+    const $tocLink = $cardToc.find('.toc-link')
     const $article = $('#article-container')
 
     $tocChild.hide()
@@ -459,10 +338,7 @@ $(function () {
       const percentage = (scrollPercentRounded > 100) ? 100
         : (scrollPercentRounded <= 0) ? 0
           : scrollPercentRounded
-      $sidebar.find('.progress-num').text(percentage)
+      $cardToc.attr('progress-percentage', percentage)
-      $sidebar.find('.sidebar-toc__progress-bar').animate({
-        width: percentage + '%'
-      }, 100)
     }
 
     // anchor
@@ -473,9 +349,39 @@ $(function () {
       }
     }
 
+    const mobileToc = {
+      open: () => {
+        $cardTocLayout.css('display', 'block')
+      },
+
+      close: () => {
+        $cardTocLayout.css('animation', 'toc-close .2s')
+        setTimeout(() => {
+          $cardTocLayout.css({ display: '', animation: '' })
+        }, 100)
+      }
+    }
+
+    $('#mobile-toc-button').on('click', () => {
+      if ($cardTocLayout.is(':visible')) {
+        mobileToc.close()
+      } else {
+        mobileToc.open()
+      }
+    })
+
+    // toc元素點擊
+    $tocLink.on('click', function (e) {
+      e.preventDefault()
+      btf.scrollToDest(decodeURI($(this).attr('href')))
+      if (window.innerWidth < 900) {
+        mobileToc.close()
+      }
+    })
+
     const autoScrollToc = function (currentTop, item) {
       const activePosition = item.offset().top
-      const $tocContent = $sidebar.find('.sidebar-toc__content')
+      const $tocContent = $cardToc
       const sidebarScrollTop = $tocContent.scrollTop()
       if (activePosition > (currentTop + $(window).height() - 100)) {
         $tocContent.scrollTop(sidebarScrollTop + 100)
@@ -489,7 +395,6 @@ $(function () {
     // DOM Hierarchy:
     // ol.toc > (li.toc-item, ...)
     // li.toc-item > (a.toc-link, ol.toc-2child > (li.toc-item, ...))
-    const versionBiggerFive = GLOBAL_CONFIG.hexoversion.split('.')[0] >= 5
     const list = $article.find('h1,h2,h3,h4,h5,h6')
 
     const findHeadPosition = function (top) {
@@ -503,8 +408,7 @@ $(function () {
       list.each(function () {
         const head = $(this)
         if (top > head.offset().top - 70) {
-          if (versionBiggerFive) currentId = '#' + encodeURI($(this).attr('id'))
+          currentId = '#' + encodeURI($(this).attr('id'))
-          else currentId = '#' + $(this).attr('id')
         }
       })
 
@@ -579,13 +483,24 @@ $(function () {
   // Back to top
   $rightsideEle.on('click', '#go-up', () => btf.scrollToDest('body'))
 
+  $rightsideEle.on('click', '#hide-aside-btn', () => {
+    const $htmlDom = $(document.documentElement)
+    if ($htmlDom.hasClass('hide-aside')) {
+      $htmlDom.removeClass('hide-aside')
+      saveToLocal.set('aside-status', 'show', 2)
+    } else {
+      $htmlDom.addClass('hide-aside')
+      saveToLocal.set('aside-status', 'hide', 2)
+    }
+  })
+
   /**
  * menu
  * 側邊欄sub-menu 展開/收縮
  * 解決menus在觸摸屏下，滑動屏幕menus_item_child不消失的問題（手機hover的bug)
  */
   const clickFnOfSubMenu = function () {
-    $('#mobile-sidebar-menus .expand').on('click', function () {
+    $('#sidebar-menus .expand').on('click', function () {
       $(this).parents('.menus_item').find('> .menus_item_child').slideToggle()
       $(this).toggleClass('hide')
     })
@@ -715,7 +630,9 @@ $(function () {
 
   const switchComments = function () {
     let switchDone = false
-    $('#switch-comments-btn').on('click', function () {
+    $('#comment-switch > .switch-btn').on('click', function () {
+      const $btn = $(this)
+      $btn.hasClass('move') ? $btn.removeClass('move') : $btn.addClass('move')
       $('#post-comment > .comment-wrap > div').each(function (i, o) {
         const $this = $(o)
         if ($this.is(':visible')) {
@@ -765,9 +682,7 @@ $(function () {
 
   const unRefreshFn = function () {
     $(window).on('resize', function () {
-      if (window.innerWidth < 768) adjustMenu(0)
+      adjustMenu()
-      else if ($('#sidebar').hasClass('tocOpenPc') && $('#nav').hasClass('fixed')) adjustMenu(1)
-      else adjustMenu(2)
     })
 
     clickFnOfSubMenu()
@@ -779,9 +694,7 @@ $(function () {
     initAdjust()
 
     if (GLOBAL_CONFIG_SITE.isPost) {
-      OpenSidebarAuto()
+      GLOBAL_CONFIG_SITE.isToc && tocFn()
-      toggleSidebar()
-      GLOBAL_CONFIG_SITE.isSidebar && tocFn()
       GLOBAL_CONFIG.noticeOutdate !== undefined && addPostOutdateNotice()
       GLOBAL_CONFIG.relativeDate.post && relativeDate($('#post-meta time'))
     } else {

source/js/search/algolia.js

@@ -1,7 +1,7 @@
 $(function () {
   const openSearch = () => {
     $('body').css({ width: '100%', overflow: 'hidden' })
-    $('#algolia-search').css('display', 'block')
+    $('#algolia-search .search-dialog').css('display', 'block')
     $('.ais-search-box--input').focus()
     $('#search-mask').fadeIn()
     // shortcut: ESC
@@ -15,12 +15,12 @@ $(function () {
 
   const closeSearch = () => {
     $('body').css({ width: '', overflow: '' })
-    $('#algolia-search').css({
+    $('#algolia-search .search-dialog').css({
       animation: 'search_close .5s'
     })
 
     setTimeout(function () {
-      $('#algolia-search').css({
+      $('#algolia-search .search-dialog').css({
         animation: '',
         display: 'none'
       })
@@ -36,7 +36,7 @@ $(function () {
 
   searchClickFn()
 
-  window.addEventListener('pjax:success', function () {
+  window.addEventListener('pjax:complete', function () {
     closeSearch()
     searchClickFn()
   })

source/js/search/local-search.js

@@ -5,7 +5,7 @@ $(function () {
       width: '100%',
       overflow: 'hidden'
     })
-    $('#local-search').css('display', 'block')
+    $('#local-search .search-dialog').css('display', 'block')
     $('#local-search-input input').focus()
     $('#search-mask').fadeIn()
     if (!loadFlag) {
@@ -27,12 +27,12 @@ $(function () {
       width: '',
       overflow: ''
     })
-    $('#local-search').css({
+    $('#local-search .search-dialog').css({
       animation: 'search_close .5s'
     })
 
     setTimeout(function () {
-      $('#local-search').css({
+      $('#local-search .search-dialog').css({
         animation: '',
         display: 'none'
       })
@@ -47,8 +47,9 @@ $(function () {
   }
 
   searchClickFn()
-  window.addEventListener('pjax:success', function () {
+
-    $('#local-search').is(':visible') && closeSearch()
+  window.addEventListener('pjax:complete', function () {
+    $('#local-search .search-dialog').is(':visible') && closeSearch()
     searchClickFn()
   })