From 36527a3b814bd91140377f1cab7afaa12bf69e88 Mon Sep 17 00:00:00 2001 From: Jerry Date: Sun, 9 May 2021 00:53:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=BE=A9=E6=A8=99=E9=A1=8C?= =?UTF-8?q?/=E5=8D=9A=E5=AE=A2=E5=90=8D=E6=9C=89=20=E2=80=98=20=E6=99=82?= =?UTF-8?q?=EF=BC=8Cpjax=20=E6=9C=83=E5=A0=B1=E9=8C=AF=E7=9A=84bug=20impro?= =?UTF-8?q?vement:=20css=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/head/config_site.pug | 4 +++- package.json | 2 +- source/css/_layout/post.styl | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/layout/includes/head/config_site.pug b/layout/includes/head/config_site.pug index 2dbd463..1d78e98 100644 --- a/layout/includes/head/config_site.pug +++ b/layout/includes/head/config_site.pug @@ -6,11 +6,13 @@ var pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable var showToc = is_post() && theme.aside.enable && pageToc && (toc(page.content) !== '' || page.encrypt == true ) + + let titleVal = pageTitle.replace(/'/ig,"\\'") - script#config-diff. var GLOBAL_CONFIG_SITE = { - title: '!{pageTitle}', + title: '!{titleVal}', isPost: !{is_post()}, isHome: !{is_home()}, isHighlightShrink: !{isHighlightShrink}, diff --git a/package.json b/package.json index e61a077..9b224fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "3.7.5", + "version": "3.7.6", "description": "A Simple and Card UI Design theme for Hexo", "main": "package.json", "scripts": { diff --git a/source/css/_layout/post.styl b/source/css/_layout/post.styl index c4f9099..2785ae1 100644 --- a/source/css/_layout/post.styl +++ b/source/css/_layout/post.styl @@ -185,6 +185,9 @@ no-beautify() else no-beautify() + > :last-child + margin-bottom: 0 !important + #post .tag_share .post-meta From 9e6958f25ba32b50ec16422b01db1291fd0b5b98 Mon Sep 17 00:00:00 2001 From: Jerry Date: Tue, 11 May 2021 22:17:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?improvement:=20=E9=80=82=E9=85=8D=E6=96=B0?= =?UTF-8?q?=E7=89=88=E7=9A=84=20waline=20=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/third-party/comments/waline.pug | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/layout/includes/third-party/comments/waline.pug b/layout/includes/third-party/comments/waline.pug index 9588049..0804536 100644 --- a/layout/includes/third-party/comments/waline.pug +++ b/layout/includes/third-party/comments/waline.pug @@ -12,7 +12,8 @@ script. path: location.pathname, emojiCDN: '#{theme.waline.emojiCDN}', emojiMaps: !{emojiMaps}, - visitor: #{theme.waline.visitor} + visitor: #{theme.waline.visitor}, + dark: '[data-theme="dark"]' }, !{JSON.stringify(theme.waline.option)})) } diff --git a/package.json b/package.json index 9b224fa..0bbc312 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "3.7.6", + "version": "3.7.7", "description": "A Simple and Card UI Design theme for Hexo", "main": "package.json", "scripts": {