Merge branch 'dev'

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')

package.json

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