mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-10-04 06:22:00 +08:00
breaking changes: cover 的顯示優化 #1101
feature: default_cover 可配置顏色 fix: 修復使用本地搜索時,輸入特殊符號沒有顯示結果的 bug closed #1110 fix: 修復 頂部圖和 footer 配置帶有/的顏色參數時,無法顯示顏色的 bug improvement: 鼠標移動到分頁時,文章分頁按鈕增加説明文字 improvement: 文章頁的頂部圖顯示次序為 top_img > cover > default_top_img improvement: canonical 的鏈接根據配置生成 #1111
This commit is contained in:
1 parent
4cd26d183c
commit
e2565a9f39
20 files changed
+95
-62
No files matched your search
@@ -26,7 +26,7 @@ meta(name="theme-color" content=themeColor)
|
|||||||
include ./head/Open_Graph.pug
|
include ./head/Open_Graph.pug
|
||||||
|
|
||||||
!=favicon_tag(theme.favicon || config.favicon)
|
!=favicon_tag(theme.favicon || config.favicon)
|
||||||
link(rel="canonical" href=urlNoIndex())
|
link(rel="canonical" href=urlNoIndex(null,config.pretty_urls.trailing_index,config.pretty_urls.trailing_html))
|
||||||
|
|
||||||
//- 預解析
|
//- 預解析
|
||||||
!=partial('includes/head/preconnect', {}, {cache: true})
|
!=partial('includes/head/preconnect', {}, {cache: true})
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
if theme.Open_Graph_meta.enable
|
if theme.Open_Graph_meta.enable
|
||||||
-
|
-
|
||||||
|
const coverVal = page.cover_type === 'img' ? page.cover : theme.avatar.img
|
||||||
let ogOption = Object.assign({
|
let ogOption = Object.assign({
|
||||||
type: is_post() ? 'article' : 'website',
|
type: is_post() ? 'article' : 'website',
|
||||||
image: (page.cover || theme.avatar.img) ? full_url_for(page.cover || theme.avatar.img) : '',
|
image: coverVal ? full_url_for(coverVal) : '',
|
||||||
fb_admins: theme.facebook_comments.user_id || '',
|
fb_admins: theme.facebook_comments.user_id || '',
|
||||||
fb_app_id: theme.facebook_comments.app_id || '',
|
fb_app_id: theme.facebook_comments.app_id || '',
|
||||||
}, theme.Open_Graph_meta.option)
|
}, theme.Open_Graph_meta.option)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
if !theme.disable_top_img && page.top_img !== false
|
if !theme.disable_top_img && page.top_img !== false
|
||||||
if is_post()
|
if is_post()
|
||||||
- var top_img = page.top_img || page.cover || page.randomcover
|
- var top_img = page.top_img || page.cover || theme.default_top_img
|
||||||
else if is_page()
|
else if is_page()
|
||||||
- var top_img = page.top_img || theme.default_top_img
|
- var top_img = page.top_img || theme.default_top_img
|
||||||
else if is_tag()
|
else if is_tag()
|
||||||
@@ -17,7 +17,7 @@ if !theme.disable_top_img && page.top_img !== false
|
|||||||
- var top_img = page.top_img || theme.default_top_img
|
- var top_img = page.top_img || theme.default_top_img
|
||||||
|
|
||||||
if top_img !== false
|
if top_img !== false
|
||||||
- var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
|
- var imgSource = top_img && isImgOrUrl(top_img) ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
|
||||||
- var bg_img = top_img ? imgSource : ''
|
- var bg_img = top_img ? imgSource : ''
|
||||||
- var site_title = page.title || page.tag || page.category || config.title
|
- var site_title = page.title || page.tag || page.category || config.title
|
||||||
- var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
|
- var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
|
||||||
|
|||||||
Loaded 3 of 20 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user