Merge branch 'dev' into master

fix: 在layout標簽內的元素，如是position: fixed，其相對定位會更改 #482 #483

README.md

@@ -6,7 +6,7 @@
 ![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [JerryC](https://jerryc.me/)
+Demo: 👍 [Butterfly](https://butterfly.js.org/)  ||   🤞 [MYW](https://immyw.com/)
 
 Docs: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 

README_CN.md

@@ -6,7 +6,7 @@
 ![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
-預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [JerryC](https://jerryc.me/)
+預覽: 👍 [Butterfly](https://butterfly.js.org/)  ||  🤞 [MYW](https://immyw.com/)
 
 文檔: 📖 [Butterfly Docs](https://butterfly.js.org/posts/21cfbf15/)
 

_config.yml

@@ -329,7 +329,7 @@ waline:
   serverURL: # Waline server address url
   avatar: monsterid # gravatar style https://zh-tw.gravatar.com/site/implement/images/#default-image
   emojiCDN: # emoji CDN
-  bg: /image/comment_bg.png # waline background
+  bg: # waline background
   option:
 
 # utterances
@@ -840,11 +840,11 @@ lazyload:
 # ---------------
 # pwa:
 #   enable: false
-#   manifest: /image/pwa/manifest.json
+#   manifest: /pwa/manifest.json
-#   apple_touch_icon: /image/pwa/apple-touch-icon.png
+#   apple_touch_icon: /pwa/apple-touch-icon.png
-#   favicon_32_32: /image/pwa/32.png
+#   favicon_32_32: /pwa/32.png
-#   favicon_16_16: /image/pwa/16.png
+#   favicon_16_16: /pwa/16.png
-#   mask_icon: /image/pwa/safari-pinned-tab.svg
+#   mask_icon: /pwa/safari-pinned-tab.svg
 
 # Open graph meta tags
 # https://developers.facebook.com/docs/sharing/webmasters/

package.json

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

source/css/_global/function.styl

@@ -53,7 +53,7 @@ minWidth2000()
 if hexo-config('enter_transitions')
   #content-inner,
   #footer
-    animation: main 1s
+    animation: bottom-top 1s
 
   #page-header
     animation: header-effect 1s
@@ -121,15 +121,14 @@ if hexo-config('avatar.effect') == true
   100%
     transform: translateY(0)
 
-@keyframes main
+@keyframes bottom-top
   0%
     opacity: 0
-    transform: translateY(50px)
+    margin-top: 50px
 
   100%
-    filter: none
     opacity: 1
-    transform: translateY(0)
+    margin-top: 0
 
 @keyframes titlescale
   0%

source/css/_page/common.styl

@@ -8,7 +8,7 @@
     flex-direction: column
 
   +maxWidth768()
-    padding: 1rem 5px !important
+    padding: 1rem 5px
 
   +minWidth2000()
     max-width: 1500px
@@ -46,7 +46,3 @@
 
     & > div
       width: 100% !important
-
-// fix chrome enter animation blur
-.layout
-  filter: blur(0)