Merge branch 'dev'

feat: 適配 fortawesome v7
improvement: 優化 loading 加載

layout/includes/footer.pug

@@ -22,9 +22,9 @@ if nav
       - const sinceYear = owner.since
       span.copyright
         if sinceYear && sinceYear != currentYear
-          != `©${sinceYear} - ${currentYear} By ${config.author}`
+          != `© ${sinceYear} - ${currentYear} By ${config.author}`
         else
-          != `©${currentYear} By ${config.author}`
+          != `© ${currentYear} By ${config.author}`
     if copyright.enable
       - const v = copyright.version ? getVersion() : false
       span.framework-info

layout/includes/loading/fullpage-loading.pug

@@ -14,6 +14,7 @@ script.
     const $body = document.body
     const preloader = {
       endLoading: () => {
+        if ($loadingBox.classList.contains('loaded')) return
         $body.style.overflow = ''
         $loadingBox.classList.add('loaded')
       },
@@ -24,7 +25,15 @@ script.
     }
 
     preloader.initLoading()
-    window.addEventListener('load', preloader.endLoading)
+
+    if (document.readyState === 'complete') {
+      preloader.endLoading()
+    } else {
+      window.addEventListener('load', preloader.endLoading)
+      document.addEventListener('DOMContentLoaded', preloader.endLoading)
+      // Add timeout protection: force end after 7 seconds
+      setTimeout(preloader.endLoading, 7000)
+    }
 
     if (!{theme.pjax && theme.pjax.enable}) {
       btf.addGlobalFn('pjaxSend', preloader.initLoading, 'preloader_init')

layout/includes/third-party/abcjs/abcjs.pug

@@ -1,5 +1,5 @@
 script.
-  (() = {
+  (() => {
     const abcjsInit = () => {
       const abcjsFn = () => {
         setTimeout(() => {

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

@@ -18,7 +18,9 @@ script.
           includeReply: false
         }).then(function (res) {
           document.querySelectorAll('#recent-posts .twikoo-count').forEach((item,index) => {
-            item.textContent = res[index].count
+            if (res[index]) {
+              item.textContent = res[index].count
+            }
           })
         }).catch(function (err) {
           console.log(err)

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

@@ -3,7 +3,7 @@
 script.
   (() => {
     const isShuoshuo = GLOBAL_CONFIG_SITE.pageType === 'shuoshuo'
-    const option = !{JSON.stringify(option)}
+    const options = !{JSON.stringify(option)}
 
     const loadScript = src => {
       const script = document.createElement('script')
@@ -42,8 +42,8 @@ script.
         host: '!{host}',
         site_id: '!{siteId}',
         theme: document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light',
-        ...option,
-        url: isShuoshuo ? window.location.origin + path : (option && option.url) || window.location.origin + window.location.pathname
+        ...options,
+        url: isShuoshuo ? window.location.origin + path : (options && options.url) || window.location.origin + window.location.pathname
       }
 
       if (window.REMARK42) {

package.json

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

plugins.yml

@@ -9,7 +9,7 @@ activate_power_mode:
 algolia_search:
   name: algoliasearch
   file: dist/lite/builds/browser.umd.js
-  version: 5.30.0
+  version: 5.34.1
 aplayer_css:
   name: aplayer
   file: dist/APlayer.min.css
@@ -80,12 +80,12 @@ egjs_infinitegrid:
 fancybox:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.umd.js
-  version: 6.0.7
+  version: 6.0.17
   other_name: fancyapps-ui
 fancybox_css:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.css
-  version: 6.0.7
+  version: 6.0.17
   other_name: fancyapps-ui
 fireworks:
   name: butterfly-extsrc
@@ -111,7 +111,7 @@ instantpage:
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.79.0
+  version: 4.79.2
 katex:
   name: katex
   file: dist/katex.min.css
@@ -137,7 +137,7 @@ medium_zoom:
 mermaid:
   name: mermaid
   file: dist/mermaid.min.js
-  version: 11.8.0
+  version: 11.9.0
 meting_js:
   name: butterfly-extsrc
   file: metingjs/dist/Meting.min.js
@@ -203,9 +203,9 @@ waline_css:
   name: '@waline/client'
   file: dist/waline.css
   other_name: waline
-  version: 3.5.7
+  version: 3.6.0
 waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 3.5.7
+  version: 3.6.0

source/css/_global/function.styl

@@ -11,7 +11,7 @@
 .fontawesomeIcon
   display: inline-block
   font-weight: 600
-  font-family: 'Font Awesome 6 Free'
+  font-family: 'Font Awesome 7 Free', 'Font Awesome 6 Free'
   text-rendering: auto
   -webkit-font-smoothing: antialiased
 

source/css/_global/index.styl

@@ -222,3 +222,7 @@ blockquote
 
   & > :last-child
     margin-bottom: 0 !important
+
+.fa-fw
+  width: 1.25em
+  text-align: center

source/css/_layout/aside.styl

@@ -23,8 +23,8 @@
         &:not(#card-toc)
           display: none
 
-    &:last-child
-      margin-bottom: 0
+    // &:last-child
+    //   margin-bottom: 0
 
   .card-info
     .author-info