From 81fc48df4054f2fae00242f6d0ff046fd99ea0b8 Mon Sep 17 00:00:00 2001 From: Jerry Date: Sun, 3 Jan 2021 00:04:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=20?= =?UTF-8?q?disable=5Ftop=5Fimg=EF=BC=8C=E7=A6=81=E7=94=A8=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=9A=84top=5Fimg=20fix:=20=E4=BF=AE=E5=BE=A9=20backg?= =?UTF-8?q?round-image=20=E9=81=87=E5=88=B0=E9=80=A3=E7=B5=90=E6=9C=89?= =?UTF-8?q?=E6=8B=AC=E8=99=9F=E6=99=82=E6=9C=83=E7=84=A1=E6=B3=95=E9=A1=AF?= =?UTF-8?q?=E7=A4=BA=E7=9A=84bug=20fix:=20Readmode=20=E6=A8=99=E9=A1=8C?= =?UTF-8?q?=E9=82=8A=E8=B7=9D=20fix:=20=E4=BF=AE=E5=BE=A9twikoo=20?= =?UTF-8?q?=E8=A9=95=E8=AB=96=E6=95=B8=E7=8D=B2=E5=8F=96=E6=9C=83=E5=9B=A0?= =?UTF-8?q?=E7=82=BA=E5=9C=B0=E5=9F=9F=E5=95=8F=E9=A1=8C=E5=A0=B1=E9=8C=AF?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.yml | 3 +++ layout/includes/header/index.pug | 2 +- layout/includes/third-party/comments/twikoo.pug | 1 + package.json | 2 +- source/css/_layout/third-party.styl | 10 ++++++---- source/css/_mode/readmode.styl | 1 - 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/_config.yml b/_config.yml index d6f20b9..aa44089 100644 --- a/_config.yml +++ b/_config.yml @@ -86,6 +86,9 @@ avatar: img: effect: false +# Disable all banner image +disable_top_img: false + # The banner image of home page index_img: diff --git a/layout/includes/header/index.pug b/layout/includes/header/index.pug index 7c99d45..bb821f5 100644 --- a/layout/includes/header/index.pug +++ b/layout/includes/header/index.pug @@ -1,4 +1,4 @@ -if page.top_img !== false +if !theme.disable_top_img && page.top_img !== false if is_post() - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img else if is_page() diff --git a/layout/includes/third-party/comments/twikoo.pug b/layout/includes/third-party/comments/twikoo.pug index e28233c..d47a5d5 100644 --- a/layout/includes/third-party/comments/twikoo.pug +++ b/layout/includes/third-party/comments/twikoo.pug @@ -21,6 +21,7 @@ script. const getCount = () => { twikoo.getCommentsCount({ envId: '!{theme.twikoo.envId}', + region: '!{theme.twikoo.region}', urls: [window.location.pathname], includeReply: false }).then(function (res) { diff --git a/package.json b/package.json index 2b6d80d..f3dda9d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "3.5.1", + "version": "3.6.0-b1", "description": "A Simple and Card UI Design theme for Hexo", "main": "package.json", "scripts": { diff --git a/source/css/_layout/third-party.styl b/source/css/_layout/third-party.styl index 334c4a4..af709f3 100644 --- a/source/css/_layout/third-party.styl +++ b/source/css/_layout/third-party.styl @@ -10,10 +10,6 @@ &:hover background: var(--btn-hover-color) - textarea - &:focus - background-image: none - .vimg transition: all .3s @@ -30,11 +26,17 @@ if hexo-config('valine.bg') textarea background: url(hexo-config('valine.bg')) 100% 100% no-repeat + &:focus + background-image: none + if hexo-config('waline.bg') #waline-wrap textarea background: url(hexo-config('waline.bg')) 100% 100% no-repeat + &:focus + background-image: none + .fireworks position: fixed top: 0 diff --git a/source/css/_mode/readmode.styl b/source/css/_mode/readmode.styl index b1ee497..77a5d84 100644 --- a/source/css/_mode/readmode.styl +++ b/source/css/_mode/readmode.styl @@ -60,7 +60,6 @@ if hexo-config('readmode') opacity: 0 & > #post-info - padding: 0 text-align: center #post