diff --git a/_config.yml b/_config.yml
index 7ef34e1..bc7d22a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -13,9 +13,10 @@ menu:
# Link: /link/ || fas fa-link
# About: /about/ || fas fa-heart
-nav_info:
+nav:
logo: # image
- display_title: true # true or false
+ display_title: true
+ fixed: false # fixed navigation bar
# Code Blocks (代碼相關)
# --------------------------------------
diff --git a/languages/default.yml b/languages/default.yml
index 833fb6c..a491719 100644
--- a/languages/default.yml
+++ b/languages/default.yml
@@ -117,5 +117,6 @@ Snackbar:
night_to_day: Light Mode Activated Manually
loading: Loading...
+load_more: Load More
error404: Page not found
diff --git a/languages/en.yml b/languages/en.yml
index 9d303e0..49120c2 100644
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -117,5 +117,6 @@ Snackbar:
night_to_day: Light Mode Activated Manually
loading: Loading...
+load_more: Load More
error404: Page not found
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
index 55900d2..9c2919a 100644
--- a/languages/zh-CN.yml
+++ b/languages/zh-CN.yml
@@ -118,5 +118,6 @@ Snackbar:
night_to_day: 你已切换为浅色模式
loading: 加载中...
+load_more: 加载更多
error404: 页面没有找到
diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
index 61d667f..86623c0 100644
--- a/languages/zh-TW.yml
+++ b/languages/zh-TW.yml
@@ -118,5 +118,6 @@ Snackbar:
night_to_day: 你已切換為淺色模式
loading: 載入中...
+load_more: 載入更多
error404: 頁面沒有找到
diff --git a/layout/includes/additional-js.pug b/layout/includes/additional-js.pug
index 3ef0223..4ec9ac1 100644
--- a/layout/includes/additional-js.pug
+++ b/layout/includes/additional-js.pug
@@ -66,4 +66,4 @@ div
!= partial("includes/third-party/pjax", {}, { cache: true })
if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
- script(async data-pjax src='//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
+ script(async data-pjax src= theme.asset.busuanzi || '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
diff --git a/layout/includes/head.pug b/layout/includes/head.pug
index 8d0674b..0089ad2 100644
--- a/layout/includes/head.pug
+++ b/layout/includes/head.pug
@@ -15,7 +15,7 @@
meta(charset='UTF-8')
meta(http-equiv="X-UA-Compatible" content="IE=edge")
-meta(name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no")
+meta(name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0")
title= tabTitle
meta(name="author" content=pageAuthor)
meta(name="copyright" content=pageCopyright)
diff --git a/layout/includes/head/preconnect.pug b/layout/includes/head/preconnect.pug
index 2c9d201..04d3b48 100644
--- a/layout/includes/head/preconnect.pug
+++ b/layout/includes/head/preconnect.pug
@@ -15,5 +15,5 @@ if theme.microsoft_clarity
if theme.blog_title_font && theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
link(rel="preconnect" href="//fonts.googleapis.com" crossorigin='')
-if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+if !theme.asset.busuanzi && (theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv)
link(rel="preconnect" href="//busuanzi.ibruce.info")
\ No newline at end of file
diff --git a/layout/includes/header/nav.pug b/layout/includes/header/nav.pug
index 0db6982..a81a2a3 100644
--- a/layout/includes/header/nav.pug
+++ b/layout/includes/header/nav.pug
@@ -1,21 +1,22 @@
-nav#nav
+- const isFixedClass = theme.nav.fixed ? 'fixed' : ''
+nav#nav(class=isFixedClass)
span#blog-info
a(href=url_for('/') title=config.title)
- if theme.nav_info.logo
- img.site-icon(src=url_for(theme.nav_info.logo))
- if theme.nav_info.display_title
+ if theme.nav.logo
+ img.site-icon(src=url_for(theme.nav.logo))
+ if theme.nav.display_title
span.site-name=config.title
#menus
if (theme.algolia_search.enable || theme.local_search.enable)
#search-button
- a.site-page.social-icon.search
+ a.site-page.social-icon.search(href="javascript:void(0);")
i.fas.fa-search.fa-fw
span=' '+_p('search.title')
!=partial('includes/header/menu_item', {}, {cache: true})
#toggle-menu
- a.site-page
+ a.site-page(href="javascript:void(0);")
i.fas.fa-bars.fa-fw
diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug
index 8ec4ed6..549b67a 100644
--- a/layout/includes/page/flink.pug
+++ b/layout/includes/page/flink.pug
@@ -36,6 +36,7 @@
}
document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
+ window.lazyLoadInstance && window.lazyLoadInstance.update()
})
})()
diff --git a/package.json b/package.json
index 6a1150e..38f6ca7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "hexo-theme-butterfly",
- "version": "4.6.0-b3",
+ "version": "4.6.0-b4",
"description": "A Simple and Card UI Design theme for Hexo",
"main": "package.json",
"scripts": {
diff --git a/plugins.yml b/plugins.yml
index 9590b68..115c124 100644
--- a/plugins.yml
+++ b/plugins.yml
@@ -1,11 +1,11 @@
algolia_search_v4:
name: algoliasearch
file: dist/algoliasearch-lite.umd.js
- version: 4.14.2
+ version: 4.14.3
instantsearch_v4:
name: instantsearch.js
file: dist/instantsearch.production.min.js
- version: 4.49.0
+ version: 4.49.4
pjax:
name: pjax
file: pjax.min.js
@@ -37,17 +37,17 @@ disqusjs_css:
twikoo:
name: twikoo
file: dist/twikoo.all.min.js
- version: 1.6.7
+ version: 1.6.8
waline_js:
name: '@waline/client'
file: dist/waline.js
other_name: waline
- version: 2.13.0
+ version: 2.14.6
waline_css:
name: '@waline/client'
file: dist/waline.css
other_name: waline
- version: 2.13.0
+ version: 2.14.6
sharejs:
name: butterfly-extsrc
file: sharejs/dist/js/social-share.min.js
@@ -64,16 +64,16 @@ katex:
name: katex
file: dist/katex.min.css
other_name: KaTeX
- version: 0.16.3
+ version: 0.16.4
katex_copytex:
name: katex
file: dist/contrib/copy-tex.min.js
other_name: KaTeX
- version: 0.16.3
+ version: 0.16.4
mermaid:
name: mermaid
file: dist/mermaid.min.js
- version: 9.1.7
+ version: 9.3.0
canvas_ribbon:
name: butterfly-extsrc
file: dist/canvas-ribbon.min.js
@@ -131,7 +131,7 @@ fancybox_v4:
medium_zoom:
name: medium-zoom
file: dist/medium-zoom.min.js
- version: 1.0.6
+ version: 1.0.8
snackbar_css:
name: node-snackbar
file: dist/snackbar.min.css
@@ -144,7 +144,7 @@ fontawesomeV6:
name: '@fortawesome/fontawesome-free'
file: css/all.min.css
other_name: font-awesome
- version: 6.2.0
+ version: 6.2.1
flickr_justified_gallery_js:
name: flickr-justified-gallery
file: dist/fjGallery.min.js
@@ -183,11 +183,11 @@ prismjs_autoloader:
artalk_js:
name: artalk
file: dist/Artalk.js
- version: 2.4.3
+ version: 2.4.4
artalk_css:
name: artalk
file: dist/Artalk.css
- version: 2.4.3
+ version: 2.4.4
pace_js:
name: pace-js
other_name: pace
diff --git a/scripts/events/cdn.js b/scripts/events/cdn.js
index 7d77e63..9c1b2c1 100644
--- a/scripts/events/cdn.js
+++ b/scripts/events/cdn.js
@@ -12,7 +12,7 @@ hexo.extend.filter.register('before_generate', () => {
const themeConfig = hexo.theme.config
const { CDN } = themeConfig
- const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir,'/plugins.yml'), engine: 'yaml'})
+ const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' })
const internalSrc = {
main: {
name: 'hexo-theme-butterfly',
@@ -46,7 +46,7 @@ hexo.extend.filter.register('before_generate', () => {
}
const createCDNLink = (data, type, cond = '') => {
- Object.keys(data).map(key => {
+ Object.keys(data).forEach(key => {
let { name, version, file, other_name } = data[key]
const min_file = minFile(file)
@@ -65,6 +65,7 @@ hexo.extend.filter.register('before_generate', () => {
min_cdnjs_file,
cdnjs_name
}
+
const cdnSource = {
local: cond === 'internal' ? cdnjs_file : `/pluginsSrc/${name}/${file}`,
jsdelivr: `https://cdn.jsdelivr.net/npm/${name}${verType}/${min_file}`,
@@ -72,11 +73,11 @@ hexo.extend.filter.register('before_generate', () => {
cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
custom: (CDN.custom_format || '').replace(/\$\{(.+?)\}/g, (match, $1) => value[$1])
}
-
+
data[key] = cdnSource[type]
})
- if (cond === 'internal') data['main_css'] = 'css/index.css'
+ if (cond === 'internal') data.main_css = 'css/index.css'
return data
}
@@ -89,6 +90,6 @@ hexo.extend.filter.register('before_generate', () => {
return obj
}
- themeConfig.asset = Object.assign(createCDNLink(internalSrc,CDN.internal_provider,'internal'),
- createCDNLink(thirdPartySrc,CDN.third_party_provider), deleteNullValue(CDN.option))
+ themeConfig.asset = Object.assign(createCDNLink(internalSrc, CDN.internal_provider, 'internal'),
+ createCDNLink(thirdPartySrc, CDN.third_party_provider), deleteNullValue(CDN.option))
})
diff --git a/scripts/events/comment.js b/scripts/events/comment.js
index b1ef856..ebbe439 100644
--- a/scripts/events/comment.js
+++ b/scripts/events/comment.js
@@ -11,4 +11,4 @@ hexo.extend.filter.register('before_generate', () => {
}
const newArray = use.map(item => item.toLowerCase().replace(/\b[a-z]/g, s => s.toUpperCase()))
themeConfig.comments.use = newArray
-})
\ No newline at end of file
+})
diff --git a/scripts/filters/random_cover.js b/scripts/filters/random_cover.js
index dacf563..ffb61e4 100644
--- a/scripts/filters/random_cover.js
+++ b/scripts/filters/random_cover.js
@@ -24,7 +24,7 @@ hexo.extend.filter.register('before_post_render', function (data) {
const num = Math.floor(Math.random() * theme.cover.default_cover.length)
return theme.cover.default_cover[num]
}
-
+
if (coverVal === false) return data
// If cover is not set, use random cover
@@ -42,4 +42,4 @@ hexo.extend.filter.register('before_post_render', function (data) {
}
return data
-})
\ No newline at end of file
+})
diff --git a/scripts/helpers/findArchiveLength.js b/scripts/helpers/findArchiveLength.js
index e55dc0f..56e9bcb 100644
--- a/scripts/helpers/findArchiveLength.js
+++ b/scripts/helpers/findArchiveLength.js
@@ -1,13 +1,13 @@
hexo.extend.helper.register('findArchiveLength', function (func) {
- const allPostsLength = this.site.posts.length;
- if (hexo.config.archive_generator && hexo.config.archive_generator.enable === false ) return allPostsLength
+ const allPostsLength = this.site.posts.length
+ if (hexo.config.archive_generator && hexo.config.archive_generator.enable === false) return allPostsLength
const { yearly, monthly, daily } = hexo.config.archive_generator
const { year, month, day } = this.page
if (yearly === false || !year) return allPostsLength
const posts = this.site.posts.sort('date')
- const compareFunc = (type,y1,m1,d1,y2,m2,d2) => {
+ const compareFunc = (type, y1, m1, d1, y2, m2, d2) => {
if (type === 'year') {
return y1 === y2
} else if (type === 'month') {
@@ -18,15 +18,15 @@ hexo.extend.helper.register('findArchiveLength', function (func) {
}
const generateDateObj = (type) => {
- let dateObj = []
+ const dateObj = []
let length = 0
posts.forEach(post => {
- let date = post.date.clone()
+ const date = post.date.clone()
const year = date.year()
const month = date.month() + 1
const day = date.date()
- let lastData = dateObj[length - 1]
+ const lastData = dateObj[length - 1]
if (!lastData || !compareFunc(type, lastData.year, lastData.month, lastData.day, year, month, day)) {
const name = type === 'year' ? year : type === 'month' ? `${year}-${month}` : `${year}-${month}-${day}`
@@ -40,12 +40,12 @@ hexo.extend.helper.register('findArchiveLength', function (func) {
} else {
lastData.count++
}
- });
+ })
return dateObj
}
- const data = func('createArchiveObj', ()=> {
+ const data = func('createArchiveObj', () => {
const yearObj = yearly ? generateDateObj('year') : []
const monthObj = monthly ? generateDateObj('month') : []
const dayObj = daily ? generateDateObj('day') : []
@@ -55,4 +55,4 @@ hexo.extend.helper.register('findArchiveLength', function (func) {
const name = month ? day ? `${year}-${month}-${day}` : `${year}-${month}` : year
return data.find(item => item.name === name).count
-})
\ No newline at end of file
+})
diff --git a/scripts/helpers/inject_head_js.js b/scripts/helpers/inject_head_js.js
index 9c845d4..387c45d 100644
--- a/scripts/helpers/inject_head_js.js
+++ b/scripts/helpers/inject_head_js.js
@@ -9,8 +9,8 @@ hexo.extend.helper.register('inject_head_js', function () {
const { darkmode, aside } = this.theme
const { theme_color } = hexo.theme.config
- const themeColorLight = theme_color && theme_color.enable && theme_color.meta_theme_color_light || '#ffffff'
- const themeColorDark = theme_color && theme_color.enable && theme_color.meta_theme_color_dark || '#0d0d0d'
+ const themeColorLight = (theme_color && theme_color.enable && theme_color.meta_theme_color_light) || '#ffffff'
+ const themeColorDark = (theme_color && theme_color.enable && theme_color.meta_theme_color_dark) || '#0d0d0d'
const localStore = `
win.saveToLocal = {
diff --git a/scripts/helpers/page.js b/scripts/helpers/page.js
index 8e3f892..35e05a8 100644
--- a/scripts/helpers/page.js
+++ b/scripts/helpers/page.js
@@ -74,8 +74,8 @@ hexo.extend.helper.register('injectHtml', function (data) {
hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
if (page.year) {
const dateStr = page.month ? `${page.year}-${page.month}` : `${page.year}`
- const date_format = page.month ? hexo.theme.config.aside.card_archives.format : 'YYYY'
- return date(dateStr, date_format)
+ const dateFormat = page.month ? hexo.theme.config.aside.card_archives.format : 'YYYY'
+ return date(dateStr, dateFormat)
}
const defaultTitle = this._p('page.archives')
@@ -102,4 +102,4 @@ hexo.extend.helper.register('isImgOrUrl', function (path) {
return true
}
return false
-})
\ No newline at end of file
+})
diff --git a/scripts/tag/gallery.js b/scripts/tag/gallery.js
index acccd0b..e7c2d69 100644
--- a/scripts/tag/gallery.js
+++ b/scripts/tag/gallery.js
@@ -1,6 +1,8 @@
/**
* Butterfly
- * galleryGroup and allery
+ * galleryGroup and gallery
+ * {% galleryGroup [name] [descr] [url] [img] %}
+ * {% gallery [lazyload],[rowHeight],[limit] %}
*/
'use strict'
@@ -8,13 +10,38 @@
const urlFor = require('hexo-util').url_for.bind(hexo)
function gallery (args, content) {
- return `${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}
-
`
+ const { data, languages } = hexo.theme.i18n
+ args = args.join(' ').split(',')
+ const rowHeight = args[1] || 220
+ const limit = args[2] || 10
+ const lazyload = args[0] === 'true'
+ const regex = /!\[(.*?)\]\((.*?)\s*(?:["'](.*?)["']?)?\s*\)/g
+ const lazyloadClass = lazyload ? 'lazyload' : ''
+ let m
+ const arr = []
+ while ((m = regex.exec(content)) !== null) {
+ if (m.index === regex.lastIndex) {
+ regex.lastIndex++
+ }
+
+ arr.push({
+ url: m[2],
+ alt: m[1],
+ title: m[3]
+ })
+ }
+
+ return `
+
+ ${JSON.stringify(arr)}
+
+
+
${name}
- ${desrc}
+ ${descr}
diff --git a/source/css/_layout/head.styl b/source/css/_layout/head.styl
index dcac7f9..aba4c44 100644
--- a/source/css/_layout/head.styl
+++ b/source/css/_layout/head.styl
@@ -137,6 +137,10 @@
box-shadow: 0 5px 6px -5px alpha($grey, .6)
transition: transform .2s ease-in-out, opacity .2s ease-in-out
+ &.fixed
+ top: 0
+ transition: all .5s
+
#blog-info
color: var(--font-color)
@@ -155,7 +159,7 @@
color: $light-blue
&.nav-visible
- #nav
+ #nav:not(.fixed)
transition: all .5s
transform: translate3d(0, 100%, 0)
@@ -261,6 +265,9 @@
&.show
opacity: 1
+ &.fixed
+ position: fixed
+
#blog-info
flex: 1
color: var(--light-grey)
diff --git a/source/css/_mode/readmode.styl b/source/css/_mode/readmode.styl
index 88da5d3..baca44d 100644
--- a/source/css/_mode/readmode.styl
+++ b/source/css/_mode/readmode.styl
@@ -106,7 +106,7 @@ if hexo-config('readmode')
color: var(--font-color) !important
.hljs
- background: var(-highlight-bg) !important
+ background: var(--highlight-bg) !important
h1,
h2,
diff --git a/source/css/_search/algolia.styl b/source/css/_search/algolia.styl
index e9f06ce..69530ef 100644
--- a/source/css/_search/algolia.styl
+++ b/source/css/_search/algolia.styl
@@ -28,7 +28,7 @@
.algolia-hit-item-content
margin: 0 0 8px
- word-break: break-all
+ word-break: break-word
.ais-Pagination
margin: 20px 0 0
@@ -69,6 +69,8 @@
#algolia-hits
> div
overflow-y: scroll
+ margin: 0 -20px
+ padding: 0 22px
+minWidth768()
max-height: calc(80vh - 240px)
diff --git a/source/css/_search/local-search.styl b/source/css/_search/local-search.styl
index 36dd38d..3e707a9 100644
--- a/source/css/_search/local-search.styl
+++ b/source/css/_search/local-search.styl
@@ -51,15 +51,17 @@
color: $search-color
.search-result
- margin: 0 8px 8px 0
- word-break: break-all
+ margin: 0 0 8px
+ word-break: break-word
.search-keyword
color: $search-keyword-highlight
font-weight: bold
.search-result-list
- overflow-y: auto
+ overflow-y: overlay
+ margin: 0 -20px
+ padding: 0 22px
max-height: calc(80vh - 130px)
+maxWidth768()
diff --git a/source/css/_tags/gallery.styl b/source/css/_tags/gallery.styl
index 2be3d5d..6fe035f 100644
--- a/source/css/_tags/gallery.styl
+++ b/source/css/_tags/gallery.styl
@@ -94,9 +94,46 @@
overflow: auto
padding: 0 0 16px
- .fj-gallery
+ .gallery
margin: 0 0 16px
- opacity: 0
+ text-align: center
- .img-alt
- display: none
\ No newline at end of file
+ .fj-gallery
+ opacity: 0
+
+ .img-alt
+ display: none
+
+ &.lazyload
+ + button
+ display: inline-block
+
+ .gallery-data
+ display: none
+
+ button
+ display: none
+ margin-top: 25px
+ padding: 10px
+ width: 9em
+ border-radius: 5px
+ background: var(--btn-bg)
+ color: var(--btn-color)
+ font-weight: bold
+ font-size: 1.1em
+ transition: all .3s
+
+ & > *
+ transition: all .4s
+
+ i
+ width: 0
+ opacity: 0
+
+ &:hover
+ background: var(--btn-hover-color)
+
+ i
+ margin-left: 2px
+ width: 20px
+ opacity: 1
diff --git a/source/js/main.js b/source/js/main.js
index e57206c..595e194 100644
--- a/source/js/main.js
+++ b/source/js/main.js
@@ -232,14 +232,42 @@ document.addEventListener('DOMContentLoaded', function () {
* justified-gallery 圖庫排版
*/
const runJustifiedGallery = function (ele) {
- ele.forEach(item => {
- const $imgList = item.querySelectorAll('img')
-
- $imgList.forEach(i => {
- const dataLazySrc = i.getAttribute('data-lazy-src')
- if (dataLazySrc) i.src = dataLazySrc
- btf.wrap(i, 'div', { class: 'fj-gallery-item' })
+ const htmlStr = arr => {
+ let str = ''
+ const replaceDq = str => str.replace(/"/g, '"') // replace double quotes to "
+ arr.forEach(i => {
+ const alt = i.alt ? `alt="${replaceDq(i.alt)}"` : ''
+ const title = i.title ? `title="${replaceDq(i.title)}"` : ''
+ str += `