mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-04-12 22:17:06 +08:00
1. Fix: random cover of prev post and next post
2. Feature: add the option to change the site name font-family 3. Feature: add the option to close instant-page 4. Fix: Display null when the sutitle not set
This commit is contained in:
25
_config.yml
25
_config.yml
@@ -121,7 +121,6 @@ cdn:
|
|||||||
css:
|
css:
|
||||||
fontawesome: https://cdn.jsdelivr.net/npm/font-awesome@latest/css/font-awesome.min.css
|
fontawesome: https://cdn.jsdelivr.net/npm/font-awesome@latest/css/font-awesome.min.css
|
||||||
# fontawesomeV5: https://use.fontawesome.com/releases/v5.8.1/css/all.css
|
# fontawesomeV5: https://use.fontawesome.com/releases/v5.8.1/css/all.css
|
||||||
googlefont: https://fonts.googleapis.com/css?family=Titillium+Web
|
|
||||||
fancybox: https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@latest/dist/jquery.fancybox.min.css
|
fancybox: https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@latest/dist/jquery.fancybox.min.css
|
||||||
js:
|
js:
|
||||||
jquery: https://cdn.jsdelivr.net/npm/jquery@latest/dist/jquery.min.js
|
jquery: https://cdn.jsdelivr.net/npm/jquery@latest/dist/jquery.min.js
|
||||||
@@ -241,7 +240,7 @@ valine:
|
|||||||
verify: false # valine verify code (true/false)
|
verify: false # valine verify code (true/false)
|
||||||
pageSize: 10 # comment list page size
|
pageSize: 10 # comment list page size
|
||||||
avatar: monsterid # gravatar style https://valine.js.org/#/avatar
|
avatar: monsterid # gravatar style https://valine.js.org/#/avatar
|
||||||
lang: en # i18n: zh-cn/en/tw
|
lang: en # i18n: zh-cn/en
|
||||||
placeholder: Please leave your footprints # valine comment input placeholder(like: Please leave your footprints )
|
placeholder: Please leave your footprints # valine comment input placeholder(like: Please leave your footprints )
|
||||||
guest_info: nick,mail,link #valine comment header inf
|
guest_info: nick,mail,link #valine comment header inf
|
||||||
|
|
||||||
@@ -329,7 +328,7 @@ related_post:
|
|||||||
# canvas_ribbon
|
# canvas_ribbon
|
||||||
# See: https://github.com/hustcc/ribbon.js
|
# See: https://github.com/hustcc/ribbon.js
|
||||||
canvas_ribbon:
|
canvas_ribbon:
|
||||||
enable: false
|
enable: true
|
||||||
size: 150
|
size: 150
|
||||||
alpha: 0.6
|
alpha: 0.6
|
||||||
zIndex: -1
|
zIndex: -1
|
||||||
@@ -337,7 +336,7 @@ canvas_ribbon:
|
|||||||
|
|
||||||
|
|
||||||
canvas_ribbon_piao:
|
canvas_ribbon_piao:
|
||||||
enable: true
|
enable: false
|
||||||
|
|
||||||
|
|
||||||
# 避免重複網址分散seo
|
# 避免重複網址分散seo
|
||||||
@@ -353,11 +352,18 @@ Open_Graph_meta: true
|
|||||||
readmode:
|
readmode:
|
||||||
enable: true
|
enable: true
|
||||||
|
|
||||||
|
#全局字體
|
||||||
font:
|
font:
|
||||||
enable: false
|
enable: false
|
||||||
font-family: Lato, Helvetica Neue For Number, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, PingFang SC, Hiragino Sans GB,"Microsoft JhengHei", "MicrMicrosoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif
|
font-family: Lato, Helvetica Neue For Number, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, PingFang SC, Hiragino Sans GB,"Microsoft JhengHei", "MicrMicrosoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif
|
||||||
code-font: consolas, Menlo, "PingFang SC", "Microsoft JhengHei","Microsoft YaHei", monospace, Helvetica Neue For Number
|
code-font: consolas, Menlo, "PingFang SC", "Microsoft JhengHei","Microsoft YaHei", monospace, Helvetica Neue For Number
|
||||||
|
|
||||||
|
#網站名字字體
|
||||||
|
#左上角網站名字 主頁居中網站名字
|
||||||
|
blog_title_font:
|
||||||
|
#字體鏈接
|
||||||
|
font_link: https://fonts.googleapis.com/css?family=Titillium+Web
|
||||||
|
font-family: Titillium Web, PingFang SC, Hiragino Sans GB, "Microsoft JhengHei", "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif
|
||||||
|
|
||||||
#水平分隔綫
|
#水平分隔綫
|
||||||
hr:
|
hr:
|
||||||
@@ -387,13 +393,13 @@ aside:
|
|||||||
translate:
|
translate:
|
||||||
enable: true
|
enable: true
|
||||||
# 默認按鈕顯示文字
|
# 默認按鈕顯示文字
|
||||||
default: 簡
|
default: 繁
|
||||||
#网站默认语言,1: 繁體中文, 2: 简体中文
|
#网站默认语言,1: 繁體中文, 2: 简体中文
|
||||||
defaultEncoding: 1
|
defaultEncoding: 2
|
||||||
#延迟时间,若不在前, 要设定延迟翻译时间, 如100表示100ms,默认为0
|
#延迟时间,若不在前, 要设定延迟翻译时间, 如100表示100ms,默认为0
|
||||||
translateDelay: 0
|
translateDelay: 0
|
||||||
#博客网址
|
#博客网址
|
||||||
cookieDomain: "https://jerryc.me/"
|
cookieDomain: "https://xxx/"
|
||||||
#當文字是簡體時,按鈕顯示的文字
|
#當文字是簡體時,按鈕顯示的文字
|
||||||
msgToTraditionalChinese: "繁"
|
msgToTraditionalChinese: "繁"
|
||||||
#當文字是繁體時,按鈕顯示的文字
|
#當文字是繁體時,按鈕顯示的文字
|
||||||
@@ -407,3 +413,8 @@ fireworks:
|
|||||||
#百度推送
|
#百度推送
|
||||||
baidu_push:
|
baidu_push:
|
||||||
enable: false
|
enable: false
|
||||||
|
|
||||||
|
#https://instant.page/
|
||||||
|
#prefetch預加載
|
||||||
|
instantpage:
|
||||||
|
enable: true
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
each item in i.link_list
|
each item in i.link_list
|
||||||
li.md-links-item
|
li.md-links-item
|
||||||
a(href=item.link title=item.name target="_blank")
|
a(href=item.link title=item.name target="_blank")
|
||||||
img.lozad(data-src=item.avatar alt=item.name onerror=`onerror=null;src='${theme.lodding_bg.flink}'` height="72px")
|
img.lozad(data-src=item.avatar onerror=`onerror=null;src='${theme.lodding_bg.flink}'` height="72px")
|
||||||
div(class="md-links-title")= item.name
|
div(class="md-links-title")= item.name
|
||||||
<br/>
|
<br/>
|
||||||
div(class="md-links-des")=item.descr
|
div(class="md-links-des")=item.descr
|
||||||
|
|||||||
@@ -88,4 +88,5 @@ if is_home()
|
|||||||
if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
|
if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
|
||||||
script(async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js")
|
script(async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js")
|
||||||
|
|
||||||
script(src="https://cdn.jsdelivr.net/npm/instant.page@1.2.2/instantpage.min.js" type="module")
|
if theme.instantpage.enable
|
||||||
|
script(src="https://cdn.jsdelivr.net/npm/instant.page@1.2.2/instantpage.min.js" type="module")
|
||||||
|
|||||||
@@ -113,3 +113,6 @@ if (is_archive() && preload_archive_img)
|
|||||||
link(rel="preload" href=url_for(preload_archive_img) as="image" )
|
link(rel="preload" href=url_for(preload_archive_img) as="image" )
|
||||||
else if (!is_post() && preload_img)
|
else if (!is_post() && preload_img)
|
||||||
link(rel="preload" href=url_for(preload_img) as="image" )
|
link(rel="preload" href=url_for(preload_img) as="image" )
|
||||||
|
|
||||||
|
if theme.blog_title_font.font_link
|
||||||
|
link(rel='stylesheet', href=url_for(theme.blog_title_font.font_link))
|
||||||
@@ -7,12 +7,15 @@
|
|||||||
- if (is_year()) pageTitle += ': ' + page.year
|
- if (is_year()) pageTitle += ': ' + page.year
|
||||||
- var pageTitle_saved //- 暫時存儲pageTitle
|
- var pageTitle_saved //- 暫時存儲pageTitle
|
||||||
- var pageTitle_no_include_blog_name //- 存儲pageTitle, 不帶 " | ",meta用
|
- var pageTitle_no_include_blog_name //- 存儲pageTitle, 不帶 " | ",meta用
|
||||||
|
- var home_subtitle_true //有subtitle
|
||||||
//- home時顯示config.title (JerryC),其他顯示 pageTitle。meta用
|
//- home時顯示config.title (JerryC),其他顯示 pageTitle。meta用
|
||||||
- is_home() ? pageTitle_no_include_blog_name = config.title : pageTitle_no_include_blog_name = pageTitle
|
- is_home() ? pageTitle_no_include_blog_name = config.title : pageTitle_no_include_blog_name = pageTitle
|
||||||
//- 暫時存儲pageTitle
|
//- 暫時存儲pageTitle
|
||||||
- pageTitle ? pageTitle_saved = pageTitle + ' | ' + config.title : pageTitle_saved = config.title
|
- pageTitle ? pageTitle_saved = pageTitle + ' | ' + config.title : pageTitle_saved = config.title
|
||||||
|
//- 是否有 config.subtitle 是各自显示
|
||||||
|
- config.subtitle ? home_subtitle_true = ' - ' + config.subtitle : home_subtitle_true = ''
|
||||||
//- home時pageTitle顯示 JerryC - subtitle,其他顯示 pageTitle | JerryC
|
//- home時pageTitle顯示 JerryC - subtitle,其他顯示 pageTitle | JerryC
|
||||||
- is_home() ? pageTitle = config.title + ' - ' + config.subtitle : pageTitle = pageTitle_saved
|
- is_home() ? pageTitle = config.title + home_subtitle_true : pageTitle = pageTitle_saved
|
||||||
|
|
||||||
- var pageDescription = page.description || page.title || config.description || ''
|
- var pageDescription = page.description || page.title || config.description || ''
|
||||||
- var pageKeywords = (config.keywords || []).join(',')
|
- var pageKeywords = (config.keywords || []).join(',')
|
||||||
|
|||||||
@@ -14,21 +14,19 @@ else
|
|||||||
if(page.prev)
|
if(page.prev)
|
||||||
if(page.next)
|
if(page.next)
|
||||||
.prev-post.pull-left
|
.prev-post.pull-left
|
||||||
- var pagination_cover = page.prev.cover || theme.default_cover
|
- var pagination_cover = page.prev.cover || random_cover()
|
||||||
a(href=url_for(page.prev.path))
|
a(href=url_for(page.prev.path))
|
||||||
img.prev_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` )
|
img.prev_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` )
|
||||||
.label=_p('pagination.prev')
|
.label=_p('pagination.prev')
|
||||||
.prev_info
|
.prev_info
|
||||||
//- i.fa.fa-chevron-left
|
|
||||||
span=page.prev.title
|
span=page.prev.title
|
||||||
else
|
else
|
||||||
.prev-post.pull-full
|
.prev-post.pull-full
|
||||||
- var pagination_cover = page.prev.cover || theme.default_cover
|
- var pagination_cover = page.prev.cover || random_cover()
|
||||||
a(href=url_for(page.prev.path))
|
a(href=url_for(page.prev.path))
|
||||||
img.prev_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
|
img.prev_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
|
||||||
.label=_p('pagination.prev')
|
.label=_p('pagination.prev')
|
||||||
.prev_info
|
.prev_info
|
||||||
//- i.fa.fa-chevron-left
|
|
||||||
span=page.prev.title
|
span=page.prev.title
|
||||||
|
|
||||||
|
|
||||||
@@ -36,21 +34,18 @@ else
|
|||||||
if(page.next)
|
if(page.next)
|
||||||
if(page.prev)
|
if(page.prev)
|
||||||
.next-post.pull-right
|
.next-post.pull-right
|
||||||
- var pagination_cover = page.next.cover || theme.default_cover
|
- var pagination_cover = page.next.cover || random_cover()
|
||||||
a(href=url_for(page.next.path))
|
a(href=url_for(page.next.path))
|
||||||
img.next_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
|
img.next_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
|
||||||
.label=_p('pagination.next')
|
.label=_p('pagination.next')
|
||||||
.next_info
|
.next_info
|
||||||
span=page.next.title
|
span=page.next.title
|
||||||
//- i.fa.fa-chevron-right
|
|
||||||
else
|
else
|
||||||
.next-post.pull-full
|
.next-post.pull-full
|
||||||
- var pagination_cover = page.next.cover || theme.default_cover
|
- var pagination_cover = page.next.cover || random_cover()
|
||||||
a(href=url_for(page.next.path))
|
a(href=url_for(page.next.path))
|
||||||
img.next_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
|
img.next_cover.lozad(data-src=`${pagination_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
|
||||||
.label=_p('pagination.next')
|
.label=_p('pagination.next')
|
||||||
.next_info
|
.next_info
|
||||||
span=page.next.title
|
span=page.next.title
|
||||||
//- i.fa.fa-chevron-right
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ block content
|
|||||||
.tag-cloud__title= _p('page.tag')
|
.tag-cloud__title= _p('page.tag')
|
||||||
| -
|
| -
|
||||||
span.tag-cloud__amount= site.tags.length
|
span.tag-cloud__amount= site.tags.length
|
||||||
.tag-cloud-tags!= tagcloud({min_font: 20, max_font: 43, amount: 200, color: true, start_color: '#A4D8FA', end_color: '#0790E8'})
|
.tag-cloud-tags!= tags(site.tags)
|
||||||
if page.comments !== false
|
if page.comments !== false
|
||||||
include includes/comments/index.pug
|
include includes/comments/index.pug
|
||||||
#aside_content.aside_content
|
#aside_content.aside_content
|
||||||
|
|||||||
16
scripts/tags.js
Normal file
16
scripts/tags.js
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
hexo.extend.helper.register('tags', function (site_tags) {
|
||||||
|
var result = "";
|
||||||
|
site_tags.sort('path').each(function (tags) {
|
||||||
|
var fontSize = Math.floor(Math.random() * 15 + 15) + "px"; //15 ~ 30
|
||||||
|
var color =
|
||||||
|
"rgb(" +
|
||||||
|
Math.floor(Math.random() * 201) +
|
||||||
|
", " +
|
||||||
|
Math.floor(Math.random() * 201) +
|
||||||
|
", " +
|
||||||
|
Math.floor(Math.random() * 201) +
|
||||||
|
")"; // 0,0,0 -> 200,200,200
|
||||||
|
result += '<a href="' + hexo.theme.config.rootConfig.root + tags.path + '" style="font-size:' + fontSize + ';color:' + color + '">' + tags.name + '</a>'
|
||||||
|
})
|
||||||
|
return result;
|
||||||
|
})
|
||||||
@@ -206,7 +206,7 @@ table
|
|||||||
#site-name,
|
#site-name,
|
||||||
#aside_content .author-info__name,
|
#aside_content .author-info__name,
|
||||||
#aside_content .author-info__description
|
#aside_content .author-info__description
|
||||||
font-family: 'Titillium Web',Lato,PingFang SC, Hiragino Sans GB, "Microsoft JhengHei", "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif
|
font-family: $site-name-font
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ $theme-hr-color = #A4D8FA
|
|||||||
$theme-read-mode-bg-color = #FAF9DE
|
$theme-read-mode-bg-color = #FAF9DE
|
||||||
$font-family= Lato, Helvetica Neue For Number, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, PingFang SC, Hiragino Sans GB, "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif
|
$font-family= Lato, Helvetica Neue For Number, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, PingFang SC, Hiragino Sans GB, "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif
|
||||||
$code-font = consolas, Menlo, "PingFang SC", "Microsoft YaHei", monospace, Helvetica Neue For Number
|
$code-font = consolas, Menlo, "PingFang SC", "Microsoft YaHei", monospace, Helvetica Neue For Number
|
||||||
|
$site-name-font = "Titillium Web", Lato,PingFang SC, Hiragino Sans GB, "Microsoft JhengHei", "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif
|
||||||
//hr icon
|
//hr icon
|
||||||
$hr-icon = '\f0c4'
|
$hr-icon = '\f0c4'
|
||||||
$hr-icon-top = -10px
|
$hr-icon-top = -10px
|
||||||
@@ -27,6 +28,10 @@ if hexo-config("font") && hexo-config("font.enable")
|
|||||||
$font-family = convert(hexo-config("font.font-family")) || 'Lato, Helvetica Neue For Number, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, PingFang SC, Hiragino Sans GB, "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif'
|
$font-family = convert(hexo-config("font.font-family")) || 'Lato, Helvetica Neue For Number, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, PingFang SC, Hiragino Sans GB, "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif'
|
||||||
$code-font = convert(hexo-config("font.code-font")) || 'consolas, Menlo, "PingFang SC", "Microsoft YaHei", monospace, Helvetica Neue For Number'
|
$code-font = convert(hexo-config("font.code-font")) || 'consolas, Menlo, "PingFang SC", "Microsoft YaHei", monospace, Helvetica Neue For Number'
|
||||||
|
|
||||||
|
if hexo-config("blog_title_font.font-family")
|
||||||
|
$site-name-font = convert(hexo-config("blog_title_font.font-family")) || '"Titillium Web",Lato,PingFang SC, Hiragino Sans GB, "Microsoft JhengHei", "Microsoft YaHei", Helvetica Neue, Helvetica, Arial, sans-serif'
|
||||||
|
|
||||||
|
|
||||||
if hexo-config("hr") && hexo-config("hr.enable")
|
if hexo-config("hr") && hexo-config("hr.enable")
|
||||||
$hr-icon = hexo-config("hr.icon") || '\f0c4'
|
$hr-icon = hexo-config("hr.icon") || '\f0c4'
|
||||||
$hr-icon-top = convert(hexo-config("hr.icon-top")) || -10px
|
$hr-icon-top = convert(hexo-config("hr.icon-top")) || -10px
|
||||||
@@ -38,6 +43,7 @@ $font-color = #1F2D3D
|
|||||||
$rem = 20px
|
$rem = 20px
|
||||||
$font-family = $font-family
|
$font-family = $font-family
|
||||||
$code-font = $code-font
|
$code-font = $code-font
|
||||||
|
$site-name-font = $site-name-font
|
||||||
$text-line-height = 2
|
$text-line-height = 2
|
||||||
$sm = 768px
|
$sm = 768px
|
||||||
$bg = 1024px
|
$bg = 1024px
|
||||||
|
|||||||
@@ -94,37 +94,6 @@ $(function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------------
|
|
||||||
// tags 隨機大小 顔色
|
|
||||||
var list = document.querySelectorAll(".tag-cloud .tag-cloud-tags a");
|
|
||||||
|
|
||||||
if ($(window).width() > 768) {
|
|
||||||
Array.prototype.forEach.call(list, (item, index) => {
|
|
||||||
item.style.fontSize = Math.floor(Math.random() * 20 + 15) + "px"; //15 ~ 35
|
|
||||||
item.style.color =
|
|
||||||
"rgb(" +
|
|
||||||
Math.floor(Math.random() * 201) +
|
|
||||||
", " +
|
|
||||||
Math.floor(Math.random() * 201) +
|
|
||||||
", " +
|
|
||||||
Math.floor(Math.random() * 201) +
|
|
||||||
")"; // 0,0,0 -> 200,200,200
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
Array.prototype.forEach.call(list, (item, index) => {
|
|
||||||
item.style.fontSize = Math.floor(Math.random() * 13 + 15) + "px"; //15 ~ 28
|
|
||||||
item.style.color =
|
|
||||||
"rgb(" +
|
|
||||||
Math.floor(Math.random() * 201) +
|
|
||||||
", " +
|
|
||||||
Math.floor(Math.random() * 201) +
|
|
||||||
", " +
|
|
||||||
Math.floor(Math.random() * 201) +
|
|
||||||
")"; // 0,0,0 -> 200,200,200
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------------
|
||||||
// bookmark
|
// bookmark
|
||||||
$.fancyConfirm = function (opts) {
|
$.fancyConfirm = function (opts) {
|
||||||
|
|||||||
Reference in New Issue
Block a user