mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-04-10 21:17:07 +08:00
feat: 只支持 hexo 5.0.0 及以上版本
feat: toc改為aside顯示,去掉sidebar feat: 手機toc ui 修改 feat: 去掉 toc auto_open 配置 feat: 文章標題改為居中 improvement: 完善note標籤在readmode上的顯示 improvement: 精簡css 和 js improvement: pjax 優化 fix: 修復當文章頁top_img設為false時,閲讀模式下文章內容不顯示的bugs
This commit is contained in:
@@ -93,7 +93,6 @@
|
||||
script.
|
||||
var GLOBAL_CONFIG = {
|
||||
root: '!{config.root}',
|
||||
hexoversion: '!{get_hexo_version()}',
|
||||
algolia: !{algolia},
|
||||
localSearch: !{localSearch},
|
||||
translate: !{translate},
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
else isHighlightShrink = theme.highlight_shrink
|
||||
|
||||
const pageToc = page.toc === true || page.toc === false ? page.toc : theme.toc.enable
|
||||
const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true )
|
||||
const showToc = is_post() && theme.aside.enable && pageToc && (toc(page.content) !== '' || page.encrypt == true )
|
||||
-
|
||||
|
||||
script#config_change
|
||||
@@ -14,6 +14,6 @@ script#config_change
|
||||
isPost: !{is_post()},
|
||||
isHome: !{is_home()},
|
||||
isHighlightShrink: !{isHighlightShrink},
|
||||
isSidebar: !{showToc},
|
||||
isToc: !{showToc},
|
||||
postUpdate: '!{full_date(page.updated)}'
|
||||
}
|
||||
|
||||
@@ -8,30 +8,22 @@ html(lang=config.language data-theme=theme.display_mode)
|
||||
if theme.preloader
|
||||
!=partial('includes/loading/loading', {}, {cache:theme.fragment_cache})
|
||||
|
||||
if theme.background
|
||||
#web_bg
|
||||
|
||||
!=partial('includes/mobile-sidebar/index', {}, {cache:theme.fragment_cache})
|
||||
|
||||
#body-wrap
|
||||
if theme.background
|
||||
#web_bg
|
||||
|
||||
include ./sidebar.pug
|
||||
include ./header/index.pug
|
||||
|
||||
if (!is_post())
|
||||
main#content-inner.layout_page(class=hideAside)
|
||||
if body
|
||||
div!= body
|
||||
else
|
||||
block content
|
||||
if theme.aside.enable && page.aside !== false
|
||||
!=partial('includes/widget/index', {}, {cache:theme.fragment_cache})
|
||||
else
|
||||
main#content-inner.layout_post
|
||||
if body
|
||||
div!= body
|
||||
else
|
||||
block content
|
||||
|
||||
main#content-inner.layout(class=hideAside)
|
||||
if body
|
||||
div!= body
|
||||
else
|
||||
block content
|
||||
if theme.aside.enable && page.aside !== false
|
||||
include widget/index.pug
|
||||
|
||||
- var footerBg = theme.footer_bg
|
||||
if (footerBg)
|
||||
if (footerBg === true)
|
||||
|
||||
@@ -16,7 +16,7 @@ section#rightside
|
||||
if commentsJsLoad
|
||||
a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
|
||||
i.fas.fa-comments
|
||||
if showToc
|
||||
if showToc && theme.aside.mobile
|
||||
button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
|
||||
i.fas.fa-list-ul
|
||||
else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button)
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
-
|
||||
let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
|
||||
let autoOpenPostSet = page.auto_open == undefined ? theme.toc.auto_open : page.auto_open
|
||||
let autoOpenSidebar = autoOpenPostSet ? 'on' : ''
|
||||
-
|
||||
|
||||
if(showToc)
|
||||
#sidebar
|
||||
i.fas.fa-arrow-right#toggle-sidebar(class=autoOpenSidebar)
|
||||
.sidebar-toc
|
||||
div.sidebar-toc__title= _p('sidebar.catalog')
|
||||
div.sidebar-toc__progress
|
||||
span.progress-notice= _p('sidebar.have_read')
|
||||
span.progress-num 0
|
||||
span.progress-percentage %
|
||||
div.sidebar-toc__progress-bar
|
||||
if (page.encrypt == true)
|
||||
div.sidebar-toc__content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
|
||||
else
|
||||
div.sidebar-toc__content!=toc(page.content, {list_number: tocNumber})
|
||||
|
||||
13
layout/includes/widget/card_post_toc.pug
Normal file
13
layout/includes/widget/card_post_toc.pug
Normal file
@@ -0,0 +1,13 @@
|
||||
- let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
|
||||
|
||||
#card-toc.card-widget
|
||||
.card-content
|
||||
.item-headline
|
||||
i.fas.fa-stream
|
||||
span= _p('aside.card_toc')
|
||||
|
||||
if (page.encrypt == true)
|
||||
.toc-content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
|
||||
else
|
||||
.toc-content!=toc(page.content, {list_number: tocNumber})
|
||||
|
||||
@@ -1,20 +1,28 @@
|
||||
#aside_content.aside_content
|
||||
if theme.aside.card_author.enable
|
||||
include ./card_author.pug
|
||||
!=partial('includes/widget/card_author', {}, {cache:theme.fragment_cache})
|
||||
if theme.aside.card_announcement.enable
|
||||
!=partial('includes/widget/card_announcement', {}, {cache:theme.fragment_cache})
|
||||
.sticky_layout
|
||||
if theme.aside.card_announcement.enable
|
||||
include ./card_announcement.pug
|
||||
if theme.aside.card_recent_post.enable
|
||||
include ./card_recent_post.pug
|
||||
if theme.newest_comments.enable
|
||||
include ./card_newest_comment.pug
|
||||
if theme.ad && theme.ad.aside
|
||||
include ./card_ad.pug
|
||||
if theme.aside.card_categories.enable
|
||||
include ./card_categories.pug
|
||||
if theme.aside.card_tags.enable
|
||||
include ./card_tags.pug
|
||||
if theme.aside.card_archives.enable
|
||||
include ./card_archives.pug
|
||||
if theme.aside.card_webinfo.enable
|
||||
include ./card_webinfo.pug
|
||||
if is_post()
|
||||
if showToc
|
||||
include ./card_post_toc.pug
|
||||
if theme.aside.card_recent_post.enable
|
||||
!=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
|
||||
if theme.ad && theme.ad.aside
|
||||
!=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
|
||||
else
|
||||
if theme.aside.card_recent_post.enable
|
||||
!=partial('includes/widget/card_recent_post', {}, {cache:theme.fragment_cache})
|
||||
if theme.ad && theme.ad.aside
|
||||
!=partial('includes/widget/card_ad', {}, {cache:theme.fragment_cache})
|
||||
if theme.newest_comments.enable
|
||||
!=partial('includes/widget/card_newest_comment', {}, {cache:theme.fragment_cache})
|
||||
if theme.aside.card_categories.enable
|
||||
!=partial('includes/widget/card_categories', {}, {cache:theme.fragment_cache})
|
||||
if theme.aside.card_tags.enable
|
||||
!=partial('includes/widget/card_tags', {}, {cache:theme.fragment_cache})
|
||||
if theme.aside.card_archives.enable
|
||||
!=partial('includes/widget/card_archives', {}, {cache:theme.fragment_cache})
|
||||
if theme.aside.card_webinfo.enable
|
||||
!=partial('includes/widget/card_webinfo', {}, {cache:theme.fragment_cache})
|
||||
@@ -1,11 +1,11 @@
|
||||
extends includes/layout.pug
|
||||
|
||||
block content
|
||||
article#post(class="")
|
||||
#post
|
||||
if top_img === false
|
||||
include includes/header/post-info.pug
|
||||
|
||||
#article-container.post-content!=page.content
|
||||
article#article-container.post-content!=page.content
|
||||
include includes/post/post-copyright.pug
|
||||
.tag_share
|
||||
if (theme.post_meta.post.tags)
|
||||
|
||||
Reference in New Issue
Block a user