mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-04-16 17:40:55 +08:00
breaking change:
1. 部分配置更改 feat: 1. 移除 messenger 聊天插件 2. 更新 fackbook 版本號 3. 增加 香港繁體、日文和韓語 4. 使用的新的複製api 代替舊的 5. 增加 umami 分析 6. 增加 umami 獲取訪問量/訪客數 7. snackbar 增加透明度 8. 文章頁下, nav fixed 下 顯示文章標題 improvement: 1. 代碼優化 2. 修改部分用語 3. 回復之前的相對時間邏輯 4. timeline tag 樣式優化 5. 優化 seo 6. 優化 artalk 的最新評論 fix: 1. tag-hide toggle 圓角問題 2. lazyload 為 false 時,artalk 無法正常加載評論的 bug 3. 修復 gallery 出現抖動的 bug
This commit is contained in:
@@ -25,11 +25,10 @@ if !theme.disable_top_img && page.top_img !== false
|
||||
|
||||
if top_img !== false
|
||||
- bg_img = getBgPath(top_img)
|
||||
- headerClassName = is_home() ? 'full_page' : 'not-home-page'
|
||||
- headerClassName = is_post() ? 'post-bg' : headerClassName
|
||||
- headerClassName = is_home() ? 'full_page' : is_post() ? 'post-bg' : 'not-home-page'
|
||||
|
||||
header#page-header(class=`${headerClassName+isFixedClass}` style=bg_img)
|
||||
!=partial('includes/header/nav', {}, {cache: true})
|
||||
header#page-header(class=`${headerClassName + isFixedClass}` style=bg_img)
|
||||
include ./nav.pug
|
||||
if top_img !== false
|
||||
if is_post()
|
||||
include ./post-info.pug
|
||||
@@ -40,11 +39,15 @@ header#page-header(class=`${headerClassName+isFixedClass}` style=bg_img)
|
||||
- var loadSubJs = true
|
||||
#site-subtitle
|
||||
span#subtitle
|
||||
if(theme.social)
|
||||
if theme.social
|
||||
#site_social_icons
|
||||
!=partial('includes/header/social', {}, {cache: true})
|
||||
#scroll-down
|
||||
i.fas.fa-angle-down.scroll-down-effects
|
||||
else
|
||||
#page-site-info
|
||||
h1#site-title=page.title || page.tag || page.category
|
||||
h1#site-title=page.title || page.tag || page.category
|
||||
else
|
||||
//- improvement seo
|
||||
if !is_post()
|
||||
h1.title-seo=page.title || page.tag || page.category || config.title
|
||||
@@ -3,25 +3,25 @@ if theme.menu
|
||||
each value, label in theme.menu
|
||||
if typeof value !== 'object'
|
||||
.menus_item
|
||||
- const valueArray = value.split('||')
|
||||
a.site-page(href=url_for(trim(valueArray[0])))
|
||||
if valueArray[1]
|
||||
i.fa-fw(class=trim(valueArray[1]))
|
||||
span=' '+label
|
||||
- const [link, icon] = value.split('||').map(part => trim(part))
|
||||
a.site-page(href=url_for(link))
|
||||
if icon
|
||||
i.fa-fw(class=icon)
|
||||
span= ' ' + label
|
||||
else
|
||||
.menus_item
|
||||
- const labelArray = label.split('||')
|
||||
- const hideClass = labelArray[2] && trim(labelArray[2]) === 'hide' ? 'hide' : ''
|
||||
span.site-page.group(class=`${hideClass}`)
|
||||
if labelArray[1]
|
||||
i.fa-fw(class=trim(labelArray[1]))
|
||||
span=' '+ trim(labelArray[0])
|
||||
- const [groupLabel, groupIcon, groupClass] = label.split('||').map(part => trim(part))
|
||||
- const hideClass = groupClass === 'hide' ? 'hide' : ''
|
||||
span.site-page.group(class=hideClass)
|
||||
if groupIcon
|
||||
i.fa-fw(class=groupIcon)
|
||||
span= ' ' + groupLabel
|
||||
i.fas.fa-chevron-down
|
||||
ul.menus_item_child
|
||||
each val,lab in value
|
||||
- const valArray = val.split('||')
|
||||
each val, lab in value
|
||||
- const [childLink, childIcon] = val.split('||').map(part => trim(part))
|
||||
li
|
||||
a.site-page.child(href=url_for(trim(valArray[0])))
|
||||
if valArray[1]
|
||||
i.fa-fw(class=trim(valArray[1]))
|
||||
span=' '+ lab
|
||||
a.site-page.child(href=url_for(childLink))
|
||||
if childIcon
|
||||
i.fa-fw(class=childIcon)
|
||||
span= ' ' + lab
|
||||
@@ -1,22 +1,22 @@
|
||||
nav#nav
|
||||
span#blog-info
|
||||
a(href=url_for('/') title=config.title)
|
||||
a.nav-site-title(href=url_for('/'))
|
||||
if theme.nav.logo
|
||||
img.site-icon(src=url_for(theme.nav.logo) alt='Logo')
|
||||
if theme.nav.display_title
|
||||
span.site-name=config.title
|
||||
|
||||
if is_post()
|
||||
a.nav-page-title(href=url_for('/'))
|
||||
span.site-name=(page.title || config.title)
|
||||
#menus
|
||||
if (theme.search.use)
|
||||
if theme.search.use
|
||||
#search-button
|
||||
span.site-page.social-icon.search
|
||||
i.fas.fa-search.fa-fw
|
||||
span=' '+_p('search.title')
|
||||
span= ' ' + _p('search.title')
|
||||
if theme.menu
|
||||
!=partial('includes/header/menu_item', {}, {cache: true})
|
||||
!= partial('includes/header/menu_item', {}, {cache: true})
|
||||
|
||||
#toggle-menu
|
||||
span.site-page
|
||||
i.fas.fa-bars.fa-fw
|
||||
|
||||
|
||||
i.fas.fa-bars.fa-fw
|
||||
@@ -4,41 +4,40 @@
|
||||
if theme.post_edit.enable
|
||||
a.post-edit-link(href=theme.post_edit.url + page.source title=_p('post.edit') target="_blank")
|
||||
i.fas.fa-pencil-alt
|
||||
|
||||
|
||||
#post-meta
|
||||
.meta-firstline
|
||||
if (theme.post_meta.post.date_type)
|
||||
if theme.post_meta.post.date_type
|
||||
span.post-meta-date
|
||||
if (theme.post_meta.post.date_type === 'both')
|
||||
if theme.post_meta.post.date_type === 'both'
|
||||
i.far.fa-calendar-alt.fa-fw.post-meta-icon
|
||||
span.post-meta-label= _p('post.created')
|
||||
time.post-meta-date-created(datetime=date_xml(page.date) title=_p('post.created') + ' ' + full_date(page.date))=date(page.date, config.date_format)
|
||||
time.post-meta-date-created(datetime=date_xml(page.date) title=_p('post.created') + ' ' + full_date(page.date))= date(page.date, config.date_format)
|
||||
span.post-meta-separator |
|
||||
i.fas.fa-history.fa-fw.post-meta-icon
|
||||
span.post-meta-label= _p('post.updated')
|
||||
time.post-meta-date-updated(datetime=date_xml(page.updated) title=_p('post.updated') + ' ' + full_date(page.updated))=date(page.updated, config.date_format)
|
||||
time.post-meta-date-updated(datetime=date_xml(page.updated) title=_p('post.updated') + ' ' + full_date(page.updated))= date(page.updated, config.date_format)
|
||||
else
|
||||
- let data_type_update = theme.post_meta.post.date_type === 'updated'
|
||||
- let date_type = data_type_update ? 'updated' : 'date'
|
||||
- let date_icon = data_type_update ? 'fas fa-history' :'far fa-calendar-alt'
|
||||
- let date_icon = data_type_update ? 'fas fa-history' : 'far fa-calendar-alt'
|
||||
- let date_title = data_type_update ? _p('post.updated') : _p('post.created')
|
||||
i.fa-fw.post-meta-icon(class=date_icon)
|
||||
span.post-meta-label= date_title
|
||||
time(datetime=date_xml(page[date_type]) title=date_title + ' ' + full_date(page[date_type]))=date(page[date_type], config.date_format)
|
||||
if (theme.post_meta.post.categories && page.categories.data.length > 0)
|
||||
time(datetime=date_xml(page[date_type]) title=date_title + ' ' + full_date(page[date_type]))= date(page[date_type], config.date_format)
|
||||
if theme.post_meta.post.categories && page.categories.data.length > 0
|
||||
span.post-meta-categories
|
||||
if (theme.post_meta.post.date_type)
|
||||
if theme.post_meta.post.date_type
|
||||
span.post-meta-separator |
|
||||
|
||||
each item, index in page.categories.data
|
||||
i.fas.fa-inbox.fa-fw.post-meta-icon
|
||||
a(href=url_for(item.path)).post-meta-categories #[=item.name]
|
||||
if (index < page.categories.data.length - 1)
|
||||
if index < page.categories.data.length - 1
|
||||
i.fas.fa-angle-right.post-meta-separator
|
||||
|
||||
.meta-secondline
|
||||
- let postWordcount = theme.wordcount.enable && (theme.wordcount.post_wordcount || theme.wordcount.min2read)
|
||||
if (postWordcount)
|
||||
if postWordcount
|
||||
span.post-meta-separator |
|
||||
span.post-meta-wordcount
|
||||
if theme.wordcount.post_wordcount
|
||||
@@ -51,42 +50,57 @@
|
||||
i.far.fa-clock.fa-fw.post-meta-icon
|
||||
span.post-meta-label= _p('post.min2read') + ':'
|
||||
span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
|
||||
|
||||
|
||||
//- for pv and count
|
||||
mixin pvBlock(parent_id,parent_class,parent_title)
|
||||
mixin pvBlock(parent_id, parent_class, parent_title)
|
||||
span.post-meta-separator |
|
||||
span(class=parent_class id=parent_id data-flag-title=page.title)
|
||||
span(class=parent_class id=parent_id data-flag-title=parent_title)
|
||||
i.far.fa-eye.fa-fw.post-meta-icon
|
||||
span.post-meta-label=_p('post.page_pv') + ':'
|
||||
span.post-meta-label= _p('post.page_pv') + ':'
|
||||
if block
|
||||
block
|
||||
|
||||
- const commentUse = comments.use
|
||||
- const commentUse = comments.use && comments.use[0]
|
||||
if page.comments !== false && commentUse && !comments.lazyload
|
||||
if commentUse[0] === 'Valine' && theme.valine.visitor
|
||||
+pvBlock(url_for(page.path),'leancloud_visitors',page.title)
|
||||
span.leancloud-visitors-count
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
else if commentUse[0] === 'Waline' && theme.waline.pageview
|
||||
+pvBlock('','','')
|
||||
span.waline-pageview-count(data-path=url_for(page.path))
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
else if commentUse[0] === 'Twikoo' && theme.twikoo.visitor
|
||||
+pvBlock('','','')
|
||||
span#twikoo_visitors
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
else if commentUse[0] === 'Artalk' && theme.artalk.visitor
|
||||
+pvBlock('','','')
|
||||
span#ArtalkPV
|
||||
case commentUse
|
||||
when 'Valine'
|
||||
if theme.valine.visitor
|
||||
+pvBlock(url_for(page.path), 'leancloud_visitors', page.title)
|
||||
span.leancloud-visitors-count
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
when 'Waline'
|
||||
if theme.waline.pageview
|
||||
+pvBlock('', '', '')
|
||||
span.waline-pageview-count(data-path=url_for(page.path))
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
when 'Twikoo'
|
||||
if theme.twikoo.visitor
|
||||
+pvBlock('', '', '')
|
||||
span#twikoo_visitors
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
when 'Artalk'
|
||||
if theme.artalk.visitor
|
||||
+pvBlock('', '', '')
|
||||
span#ArtalkPV
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
default
|
||||
if theme.umami_analytics.enable && theme.umami_analytics.UV_PV.page_pv
|
||||
+pvBlock('', '', '')
|
||||
span#umamiPV(data-path=url_for(page.path))
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
else if theme.busuanzi.page_pv
|
||||
+pvBlock('', 'post-meta-pv-cv', '')
|
||||
span#busuanzi_value_page_pv
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
else
|
||||
if theme.umami_analytics.enable && theme.umami_analytics.UV_PV.page_pv
|
||||
+pvBlock('', '', '')
|
||||
span#umamiPV(data-path=url_for(page.path))
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
else if theme.busuanzi.page_pv
|
||||
+pvBlock('','post-meta-pv-cv','')
|
||||
+pvBlock('', 'post-meta-pv-cv', '')
|
||||
span#busuanzi_value_page_pv
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
else if theme.busuanzi.page_pv
|
||||
+pvBlock('','post-meta-pv-cv','')
|
||||
span#busuanzi_value_page_pv
|
||||
i.fa-solid.fa-spinner.fa-spin
|
||||
|
||||
if comments.count && !comments.lazyload && page.comments !== false && comments.use
|
||||
- var whichCount = comments.use[0]
|
||||
@@ -98,7 +112,7 @@
|
||||
span.post-meta-label= _p('post.comments') + ':'
|
||||
if block
|
||||
block
|
||||
|
||||
|
||||
case whichCount
|
||||
when 'Disqus'
|
||||
+countBlock
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
each url, icon in theme.social
|
||||
a.social-icon(href=url_for(trim(url.split('||')[0])) target="_blank"
|
||||
title=url.split('||')[1] === undefined ? '' : trim(url.split('||')[1]))
|
||||
i(class=icon style=url.split('||')[2] === undefined ? '' : `color: ${trim(url.split('||')[2]).replace(/[\'\"]/g, '')};`)
|
||||
-
|
||||
const [link, title, color] = url.split('||').map(i => trim(i))
|
||||
const href = url_for(link)
|
||||
const iconStyle = color ? `color: ${color.replace(/[\'\"]/g, '')};` : ''
|
||||
const iconTitle = title || ''
|
||||
a.social-icon(href=href target="_blank" title=iconTitle)
|
||||
i(class=icon style=iconStyle)
|
||||
Reference in New Issue
Block a user