diff --git a/layout/includes/head/config_site.pug b/layout/includes/head/config_site.pug index 01417ab..84167e8 100644 --- a/layout/includes/head/config_site.pug +++ b/layout/includes/head/config_site.pug @@ -1,10 +1,10 @@ - let isHighlightShrink if (theme.highlight_shrink == 'none') isHighlightShrink = 'undefined' - else if (page.highlight_shrink !== undefined) isHighlightShrink = page.highlight_shrink + else if (page.highlight_shrink !== null && page.toc !== undefined ) isHighlightShrink = page.highlight_shrink else isHighlightShrink = theme.highlight_shrink - const pageToc = page.toc !== undefined ? page.toc : theme.toc.enable + const pageToc = page.toc !== null && page.toc !== undefined ? page.toc : theme.toc.enable const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true ) - diff --git a/package.json b/package.json index 63a21cd..641ee07 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "3.0.0", + "version": "3.0.0-rc-1", "private": true, "engines": { "node": ">=8.10.0" diff --git a/scripts/tags/button.js b/scripts/tags/button.js index 4386cea..8e7ea43 100644 --- a/scripts/tags/button.js +++ b/scripts/tags/button.js @@ -21,8 +21,7 @@ function btn (args) { icon = icon.trim() option = option.trim() - return ` - ${icon.length > 0 ? `` : ''} ${text} ` + return `${icon.length > 0 ? `` : ''} ${text} ` } hexo.extend.tag.register('btn', btn, { ends: false }) diff --git a/source/css/_layout/mobile-sidebar.styl b/source/css/_layout/mobile-sidebar.styl index 5d599fc..2b50b8f 100644 --- a/source/css/_layout/mobile-sidebar.styl +++ b/source/css/_layout/mobile-sidebar.styl @@ -12,7 +12,8 @@ top: 0 right: -250px z-index: 103 - overflow: hidden scroll + overflow-x: hidden + overflow-y: auto width: 250px height: 100% background: #f6f8fa