From a50a63905dd8047d3cb13ee40137596035dbddd1 Mon Sep 17 00:00:00 2001 From: Jerry Date: Mon, 1 Feb 2021 16:01:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=96=87=E7=AB=A0=E9=A0=81=E6=9C=89?= =?UTF-8?q?toc=E7=9A=84=E7=95=8C=E9=9D=A2=E5=87=BA=E7=8F=BE=E6=BB=BE?= =?UTF-8?q?=E5=8B=95=E6=A2=9D=20fix:=20=E5=9C=A8layout=E6=A8=99=E7=B0=BD?= =?UTF-8?q?=E5=85=A7=E7=9A=84=E5=85=83=E7=B4=A0=EF=BC=8C=E5=A6=82=E6=98=AF?= =?UTF-8?q?position:=20fixed=EF=BC=8C=E5=85=B6=E7=9B=B8=E5=B0=8D=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E6=9C=83=E6=9B=B4=E6=94=B9=20#482=20#483?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- README_CN.md | 2 +- package.json | 2 +- source/css/_global/function.styl | 9 ++++----- source/css/_page/common.styl | 6 +----- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 9a1d6c2..b1d6def 100644 --- a/README.md +++ b/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/) diff --git a/README_CN.md b/README_CN.md index f0081e9..4ed5d2e 100644 --- a/README_CN.md +++ b/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/) diff --git a/package.json b/package.json index 3ae4979..247f08b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "3.6.0", + "version": "3.6.1-b1", "description": "A Simple and Card UI Design theme for Hexo", "main": "package.json", "scripts": { diff --git a/source/css/_global/function.styl b/source/css/_global/function.styl index a8c1063..9173ce7 100644 --- a/source/css/_global/function.styl +++ b/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% diff --git a/source/css/_page/common.styl b/source/css/_page/common.styl index 5868fb9..4fd0049 100644 --- a/source/css/_page/common.styl +++ b/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) \ No newline at end of file From 45b093cda7473c04845b6375c7bba2730c54182d Mon Sep 17 00:00:00 2001 From: Jerry Date: Mon, 1 Feb 2021 16:35:11 +0800 Subject: [PATCH 2/2] label:3.6.1 --- _config.yml | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_config.yml b/_config.yml index 1a1b290..b4761c6 100644 --- a/_config.yml +++ b/_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 -# apple_touch_icon: /image/pwa/apple-touch-icon.png -# favicon_32_32: /image/pwa/32.png -# favicon_16_16: /image/pwa/16.png -# mask_icon: /image/pwa/safari-pinned-tab.svg +# manifest: /pwa/manifest.json +# apple_touch_icon: /pwa/apple-touch-icon.png +# favicon_32_32: /pwa/32.png +# favicon_16_16: /pwa/16.png +# mask_icon: /pwa/safari-pinned-tab.svg # Open graph meta tags # https://developers.facebook.com/docs/sharing/webmasters/ diff --git a/package.json b/package.json index 247f08b..f906044 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "3.6.1-b1", + "version": "3.6.1", "description": "A Simple and Card UI Design theme for Hexo", "main": "package.json", "scripts": {