biss/hexo-theme-butterfly
1
0
Fork 0
mirror of https://github.com/jerryc127/hexo-theme-butterfly.git synced 2026-04-16 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

v2.1.0

Browse Source 
1. 可設置隱藏文章
2. 適配 Hexo 的 Tag Plugins Code Block With marked lines 顯示
3. 可配置首頁cover顯示的位置
4. 更改深色模式下的配色
5. activate_power_mode 增加關閉顏色和抖動
6. 增加谷歌廣告，騰訊分析
7. 相關文章增加時間顯示，調整佈局，垂直居中
8. 文章頁面，top_img增加評論數顯示
9. 可以取消點擊圖片觀看大圖
10. mathjax和kathex可設置每頁都加載還是按需加載
11. 深色模式下，滾動條顔色的適配
12. 優化gitalk 在 dark mode下的顯示
13. 文章頁，文章標題過長時，只顯示三行內容
14. 深色模式下，背景圖片加上蒙板
15. 優化深色/閲讀模式下，canvas的顯示
16. 優化打賞的特效和移動到二維碼不會立刻消失
17. 優化sub-menu樣式
18. 修改aside 的tags顔色，在深色模式下不會出現觀看困難
19. 升級 normalize.css 到最新版
20. 優化手機上toc和menu的打開動畫
21. 優化代碼框打開關閉的特效
22. 精簡js,部分操作改為css控制
23. 優化主題的一些動畫，不會過於生硬

1. 修復當圖片被a標簽包圍時，點擊圖標沒有跳轉到對應網頁而是出現大圖觀看模式的bug
2. 修復當網址有subdirectory時，menu、打賞二維碼和lodding_bg 鏈接路徑錯誤的bug
3. 修復當網址有subdirectory時,
4. 修復katex 的 CSS無法讀取bug
5. 修復搜索按鈕在文章頁不顯示的bug
6. 修復gitalk css引用失敗的bug
7. 修復 點擊特效 煙花 無效的bug
8. 修復gitalk報path.startsWith is not a function的bug
9. 修復 閲讀模式下，背景沒有變純色的bug
10. 修復閲讀模式下，header 偶爾出現沒有靠攏頂部的bug
11. 修復Hexo Tag Plugins Block Quote 裏的鏈接顯示出外面的Bug
12. 修復aside歸檔日期過長導致錯位的bug
13. 修復toc為空時，toc按鈕仍存在的bug
14. 修復關閉懶加載後，頭像無法顯示的bug
15. 修復深色模式下，切換readmode偶爾會無效的bug
16. 修復在一些手機設備上，toc和menu的按鈕顯示不對齊的bug #72
This commit is contained in:
Jerry
2019-12-20 02:19:43 +08:00
Unverified
parent 90726f1a59
commit eae694806c
104 changed files with 3220 additions and 3956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
layout/includes/additional-js.pug
View File

@@ -1,18 +1,10 @@
if (theme.medium_zoom && theme.medium_zoom.enable)
script(src=url_for(theme.CDN.medium_zoom))
else
if (theme.fancybox && theme.fancybox.enable)
script(src=url_for(theme.CDN.fancybox))
if (theme.algolia_search.enable)
script(async src=url_for(theme.CDN.algolia_js))
if (theme.mathjax && theme.mathjax.enable)
if(!is_tag() && !is_category() && !is_archive() && !is_home())
include ./third-party/mathjax.pug
if (theme.katex && theme.katex.enable)
if(!is_tag() && !is_category() && !is_archive() && !is_home())
include ./third-party/katex.pug
if (theme.local_search && theme.local_search.enable)
script(async src=url_for(theme.CDN.local_search))
include ./math/index.pug
if theme.fireworks && theme.fireworks.enable
script(src=url_for(theme.CDN.anime))
@@ -30,20 +22,17 @@ if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable)
if (theme.canvas_nest && theme.canvas_nest.enable)
include ./third-party/canvas-nest.pug
if theme.baidu_push && theme.baidu_push.enable
script(src=url_for('js/baidupush.js'))
if theme.activate_power_mode.enable
- var colorful = theme.activate_power_mode.colorful == false ? false : true
- var shake = theme.activate_power_mode.shake == false ? false : true
script(src=url_for(theme.CDN.activate_power_mode))
script.
POWERMODE.colorful = true; // make power mode colorful
POWERMODE.shake = true; // turn off shake
POWERMODE.colorful = !{colorful};
POWERMODE.shake = !{shake};
document.body.addEventListener('input', POWERMODE);
if theme.translate && theme.translate.enable
script(src=url_for(theme.CDN.translate))
script.
translateInitilization()
if is_home()
include index-js.pug

21
layout/includes/aside.pug
View File

@@ -1,21 +0,0 @@
if theme.aside.card_author
include widget/card_author.pug
if theme.aside.card_announcement
include widget/card_announcement.pug
if theme.aside.card_recent_post
include widget/card_recent_post.pug
if theme.aside.card_categories
include widget/card_categories.pug
if theme.aside.card_tags
include widget/card_tags.pug
if theme.aside.card_archives
include widget/card_archives.pug
if theme.aside.card_webinfo
include widget/card_webinfo.pug

11
layout/includes/comments/gitalk.pug
View File

@@ -8,6 +8,13 @@ if theme.gitalk && theme.gitalk.enable
owner: '!{theme.gitalk.owner}',
admin: '!{theme.gitalk.admin}',
id: md5(decodeURI(location.pathname)),
language: '!{theme.gitalk.language}'
language: '!{theme.gitalk.language}',
updateCountCallback: commentCount
})
gitalk.render('gitalk-container')
gitalk.render('gitalk-container')
function commentCount(n){
document.getElementsByClassName('gitalk-comment-count')[0].innerHTML= n
}

23
layout/includes/config.pug
View File

@@ -49,8 +49,6 @@
})
}
var copy_copyright_js = theme.copy.enable && theme.copy.copyright;
var ClickShowText = 'undefined';
if (theme.ClickShowText && theme.ClickShowText.enable) {
ClickShowText = JSON.stringify({
@@ -78,15 +76,20 @@
})
}
var runtime = theme.runtimeshow.enable
var fancybox = theme.fancybox.enable
var medium_zoom = theme.medium_zoom.enable
var baiduPush = theme.baidu_push && theme.baidu_push.enable
var isHome = is_home() ? true : false
var isPost = is_post() ? true : false
script.
var GLOBAL_CONFIG = {
root: '!{config.root}',
algolia: !{algolia},
localSearch: !{localSearch},
translate: !{translate},
highlight_copy: '!{theme.highlight_copy}',
highlight_lang: '!{theme.highlight_lang}',
highlight_shrink: '!{theme.highlight_shrink}',
copy: {
success: '!{_p("copy.success")}',
error: '!{_p("copy.error")}',
@@ -98,11 +101,15 @@ script.
message_next: '!{_p("Snackbar.bookmark.message_next")}'
},
runtime_unit: '!{_p("runtime_unit")}',
runtime: !{runtime},
copyright: !{copyright},
copy_copyright_js: !{copy_copyright_js},
ClickShowText: !{ClickShowText},
medium_zoom: '!{theme.medium_zoom.enable}',
Snackbar: !{Snackbar}
medium_zoom: !{medium_zoom},
fancybox: !{fancybox},
Snackbar: !{Snackbar},
baiduPush: !{baiduPush},
isHome: !{isHome},
isPost: !{isPost}
}

81
layout/includes/head.pug
View File

@@ -13,71 +13,36 @@ else if !is_post()
- var without_index = url.replace('index.html', '')
- var without_html = without_index.replace('.html', '')
- var photo_check = is_post() ? page.cover || theme.avatar : theme.avatar
- var photo_link = url_check (photo_check) ? photo_check : config.url + photo_check
//- 預解析
link(rel="preconnect" href="//cdn.jsdelivr.net")
include ./head/dns_prefetch.pug
//- PWA
if (theme.pwa && theme.pwa.enable)
link(rel="manifest" href=theme.pwa.manifest)
if(theme.pwa.theme_color)
meta(name="theme-color" content=theme.pwa.theme_color)
if(theme.pwa.theme_color)
meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
if(theme.pwa.apple_touch_icon)
link(rel="apple-touch-icon" sizes="180x180" href=theme.pwa.apple_touch_icon)
if(theme.pwa.favicon_32_32)
link(rel="icon" type="image/png" sizes="32x32" href=theme.pwa.favicon_32_32)
if(theme.pwa.favicon_16_16)
link(rel="icon" type="image/png" sizes="16x16" href=theme.pwa.favicon_16_16)
if(theme.pwa.mask_icon)
link(rel="mask-icon" href=theme.pwa.mask_icon color="#5bbad5")
include ./head/pwa.pug
//- 網站驗證
if theme.google_site_verification
meta(name="google-site-verification" content=theme.google_site_verification)
if theme.bing_site_verification
meta(name="msvalidate.01" content=theme.bing_site_verification)
if theme.baidu_site_verification
meta(name="baidu-site-verification" content=theme.baidu_site_verification)
if theme.qihu_site_verification
meta(name="360-site-verification" content=theme.qihu_site_verification)
//- twitter meta
if theme.twitter_meta
meta(name="twitter:card" content="summary_large_image")
meta(name="twitter:title" content=pageTitle_no_include_blog_name)
meta(name="twitter:description" content=pageDescription)
meta(name="twitter:image" content=photo_link)
include ./head/site_verification.pug
//- Open_Graph
if theme.Open_Graph_meta
- var contentType = is_post() ? 'article' : 'website'
meta(property="og:type" content=contentType)
meta(property="og:title" content=pageTitle_no_include_blog_name)
meta(property="og:url" content=without_html)
meta(property="og:site_name" content=config.title)
meta(property="og:description" content=pageDescription)
meta(property="og:image" content=photo_link)
include ./head/Open_Graph.pug
if theme.disable_baidu_transformation
meta(http-equiv="Cache-Control" content="no-transform")
meta(http-equiv="Cache-Control" content="no-siteapp")
if page.hide == true
meta(name="robots" content="noindex")
script(src=url_for(theme.CDN.js_cookies))
if (theme.darkmode && theme.darkmode.enable) || theme.autoChangeMode !== false
include ./darkmode
include ./head/darkmode.pug
each item in theme.CDN_USE.css
link(rel='stylesheet', href=url_for(item))
if (theme.medium_zoom && !theme.medium_zoom.enable)
if (theme.fancybox && theme.fancybox.enable)
link(rel='stylesheet', href=url_for(theme.CDN.fancybox_css))
if (theme.snackbar && theme.snackbar.enable)
@@ -98,30 +63,14 @@ if theme.algolia_search.enable
if (theme.gitalk && theme.gitalk.enable)
link(rel="stylesheet" type="text/css" href=url_for(theme.CDN.gitalk_css))
script(src=url_for(theme.CDN.gitalk))
script(src=url_for(theme.CDN.blueimp_md5))
script(src=url_for(theme.CDN.gitalk) defer)
script(src=url_for(theme.CDN.blueimp_md5) defer)
if theme.baidu_analytics
link(rel="dns-prefetch" href="https://hm.baidu.com")
script.
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?!{theme.baidu_analytics}";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
//- google_adsense
include ./head/google_adsense.pug
if theme.google_analytics
link(rel="dns-prefetch" href="https://www.google-analytics.com")
script.
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '!{theme.google_analytics}', 'auto');
ga('send', 'pageview');
//- analytics
include ./head/analytics.pug
if !is_post()
link(rel="preload" href=url_for(top_img) as="image" )

19
layout/includes/head/Open_Graph.pug Normal file
View File

@@ -0,0 +1,19 @@
- var photo_check = is_post() ? page.cover || theme.avatar : theme.avatar
- var photo_link = url_check (photo_check) ? photo_check : config.url + photo_check
- var contentType = is_post() ? 'article' : 'website'
//- twitter meta
if theme.twitter_meta
meta(name="twitter:card" content="summary")
meta(name="twitter:title" content=pageTitle_no_include_blog_name)
meta(name="twitter:description" content=pageDescription)
meta(name="twitter:image" content=photo_link)
//- Open_Graph
if theme.Open_Graph_meta
meta(property="og:type" content=contentType)
meta(property="og:title" content=pageTitle_no_include_blog_name)
meta(property="og:url" content=without_html)
meta(property="og:site_name" content=config.title)
meta(property="og:description" content=pageDescription)
meta(property="og:image" content=photo_link)

22
layout/includes/head/analytics.pug Normal file
View File

@@ -0,0 +1,22 @@
if theme.baidu_analytics
script.
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?!{theme.baidu_analytics}";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
if theme.google_analytics
script.
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '!{theme.google_analytics}', 'auto');
ga('send', 'pageview');
if theme.tencent_analytics
script(src=`http://tajs.qq.com/stats?sId=` + theme.tencent_analytics charset="UTF-8")

0
layout/includes/darkmode.pug → layout/includes/head/darkmode.pug
View File

16
layout/includes/head/dns_prefetch.pug Normal file
View File

@@ -0,0 +1,16 @@
link(rel="preconnect" href="//cdn.jsdelivr.net")
if theme.google_analytics
link(rel="preconnect" href="https://www.google-analytics.com" crossorigin)
if theme.baidu_analytics
link(rel="preconnect" href="https://hm.baidu.com")
if theme.tencent_analytics
link(rel="preconnect" href="http://ta.qq.com")
if theme.blog_title_font.font_link
link(rel="preconnect" href="https://fonts.googleapis.com" crossorigin)
if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
link(rel="preconnect" href="//busuanzi.ibruce.info")

7
layout/includes/head/google_adsense.pug Normal file
View File

@@ -0,0 +1,7 @@
if (theme.google_adsense && theme.google_adsense.enable)
script(async src=theme.google_adsense.js)
script.
(adsbygoogle = window.adsbygoogle || []).push({
google_ad_client: '!{theme.google_adsense.client}',
enable_page_level_ads: '!{theme.google_adsense.enable_page_level_ads}'
});

13
layout/includes/head/pwa.pug Normal file
View File

@@ -0,0 +1,13 @@
link(rel="manifest" href=theme.pwa.manifest)
if(theme.pwa.theme_color)
meta(name="theme-color" content=theme.pwa.theme_color)
if(theme.pwa.theme_color)
meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
if(theme.pwa.apple_touch_icon)
link(rel="apple-touch-icon" sizes="180x180" href=theme.pwa.apple_touch_icon)
if(theme.pwa.favicon_32_32)
link(rel="icon" type="image/png" sizes="32x32" href=theme.pwa.favicon_32_32)
if(theme.pwa.favicon_16_16)
link(rel="icon" type="image/png" sizes="16x16" href=theme.pwa.favicon_16_16)
if(theme.pwa.mask_icon)
link(rel="mask-icon" href=theme.pwa.mask_icon color="#5bbad5")

11
layout/includes/head/site_verification.pug Normal file
View File

@@ -0,0 +1,11 @@
if theme.google_site_verification
meta(name="google-site-verification" content=theme.google_site_verification)
if theme.bing_site_verification
meta(name="msvalidate.01" content=theme.bing_site_verification)
if theme.baidu_site_verification
meta(name="baidu-site-verification" content=theme.baidu_site_verification)
if theme.qihu_site_verification
meta(name="360-site-verification" content=theme.qihu_site_verification)

17
layout/includes/header.pug
View File

@@ -1,13 +1,16 @@
#header
header
#page-header
span#blog_name.pull_left
a#site-name.blog_title(href=url_for('/')) #[=config.title]
i.fa.fa-bars.fa-fw.toggle-menu.pull_right.close(aria-hidden="true")
span.toggle-menu.pull_right.close
a.site-page
i.fa.fa-bars.fa-fw(aria-hidden="true")
span.pull_right.menus
.menus_items
include menu_item.pug
span#search_button.pull_right
if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable)
a.site-page.social-icon.search
i.fa.fa-search.fa-fw
span=' '+_p('search')
if (theme.algolia_search.enable || theme.local_search && theme.local_search.enable)
span#search_button.pull_right
a.site-page.social-icon.search
i.fa.fa-search.fa-fw
span=' '+_p('search')

25
layout/includes/index-js.pug
View File

@@ -1,9 +1,3 @@
script.
if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {} else {
$('.full_page .nav_bg').css('background-attachment', 'fixed');
}
if theme.subtitle.enable
script(src=url_for(theme.CDN.typed))
- var source = theme.subtitle.source
@@ -67,7 +61,7 @@ if theme.subtitle.enable
backSpeed: 50
});
else if source == '4'
script(type="text/javascript" src="https://sdk.jinrishici.com/v2/browser/jinrishici.js")
script(type="text/javascript" src="https://sdk.jinrishici.com/v2/browser/jinrishici.js" charset="utf-8")
script.
jinrishici.load(function(result) {
var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(",");
@@ -92,22 +86,5 @@ if theme.subtitle.enable
backSpeed: 50
});
if !theme.index_top_img_height && !theme.index_site_info_top
script.
//首頁fullpage
function alignContent() {
for (var n = $(window).height(), e = document.querySelectorAll(".full_page"), i = 0; i < e.length; i++)
e[i].style.height = n + "px";
$("#site-info").each(function () {
var x = $(this).height();
$(this).css("top", (n-x)/2)
})
}
alignContent();
$(window).bind("resize", function () {
alignContent()
})

10
layout/includes/layout.pug
View File

@@ -18,7 +18,7 @@
- is_home() ? pageTitle = config.title + home_subtitle_true : pageTitle = pageTitle_saved
//- 判断keywords
- var pageDescription = page.description || page.title || config.description || ''
- var pageDescription = page.description || page.title || config.description
- var pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','): ([]).join(',') || config.keywords
- if (page.tags && page.tags.data) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
- var pageAuthor = config.email ? config.author + ',' + config.email : config.author
@@ -29,10 +29,11 @@ html(lang=config.language data-theme=theme.display_mode)
head
meta(charset='UTF-8')
meta(http-equiv="X-UA-Compatible" content="IE=edge")
meta(name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1")
meta(name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5")
title= pageTitle
meta(name="description" content=pageDescription)
meta(name="keywords" content=pageKeywords)
if pageKeywords
meta(name="keywords" content=pageKeywords)
meta(name="author" content=pageAuthor)
meta(name="copyright" content=pageCopyright)
meta(name ="format-detection" content="telephone=no")
@@ -42,6 +43,7 @@ html(lang=config.language data-theme=theme.display_mode)
body
if theme.fireworks && theme.fireworks.enable
canvas.fireworks
//- !=partial('includes/header.pug', {}, {cache: true})
include ./header.pug
include ./mobile-sidebar.pug
#body-wrap
@@ -54,7 +56,7 @@ html(lang=config.language data-theme=theme.display_mode)
include ./sidebar.pug
if (!is_post())
include ./nav.pug
#content-outer
main#content-outer
block top_img
if (!is_post())
#content-inner.layout_page

15
layout/includes/math/index.pug Normal file
View File

@@ -0,0 +1,15 @@
if theme.mathjax && theme.mathjax.enable
if theme.mathjax.per_page
if(!is_tag() && !is_category() && !is_archive() && !is_home())
include ./mathjax.pug
else
if page.mathjax
include ./mathjax.pug
if theme.katex && theme.katex.enable
if theme.katex.per_page
if(!is_tag() && !is_category() && !is_archive() && !is_home())
include ./katex.pug
else
if page.katex
include ./katex.pug

0
layout/includes/third-party/katex.pug → layout/includes/math/katex.pug
View File

0
layout/includes/third-party/mathjax.pug → layout/includes/math/mathjax.pug
View File

4
layout/includes/menu_item.pug
View File

@@ -1,7 +1,7 @@
each value, label in theme.menu
if !Array.isArray(value)
.menus_item
a.site-page(href=trim(value.split('||')[0]))
a.site-page(href=url_for(trim(value.split('||')[0])))
i.fa-fw(class=trim(value.split('||')[1]))
span=' '+label
else
@@ -13,6 +13,6 @@ each value, label in theme.menu
ul.menus_item_child
each i in value
li
a.site-page(href=trim(i.split('||')[1]))
a.site-page(href=url_for(trim(i.split('||')[1])))
i.fa-fw(class=trim(i.split('||')[2]))
span=' '+trim(i.split('||')[0])

4
layout/includes/mixins/UI.pug
View File

@@ -3,7 +3,7 @@ mixin UI_NEW(posts)
.recent-post-item.article-container
- var link = article.link || article.path
if index%2 == 0
.post_cover.pull_left.left_radius
.post_cover.left_radius
a(href=url_for(link) title=article.title || _p('no_title'))
- var post_cover = article.cover
if theme.lazyload.enable
@@ -11,7 +11,7 @@ mixin UI_NEW(posts)
else
img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
else
.post_cover.pull_right.right_radius
.post_cover.right_radius
a(href=url_for(link) title=article.title || _p('no_title'))
- var post_cover = article.cover
if theme.lazyload.enable

2
layout/includes/mixins/article-sort.pug
View File

@@ -9,7 +9,7 @@ mixin articleSort(posts)
.article-sort-item
.article-sort-img
a.article-sort-item__img(href=url_for(article.path))
img(src=article.cover)
img(src=article.cover alt=article.title || 'No Title')
.article-sort-post
a.article-sort-item__post(href=url_for(article.path))
i.fa.fa-clock-o(aria-hidden="true")

12
layout/includes/mobile-sidebar.pug
View File

@@ -2,24 +2,24 @@
#menu_mask
#mobile-sidebar-menus
.mobile_author_icon
img.lazyload.avatar_img(src=url_for(theme.avatar) onerror=`onerror=null;src='${theme.lodding_bg.flink}'`)
img.avatar-img(src=url_for(theme.avatar) onerror=`onerror=null;src='${theme.lodding_bg.flink}'` alt="avatar")
.mobile_post_data
if site.posts.length
.mobile_data_item.is_center
.mobile_data_item.is-center
.mobile_data_link
a(href=url_for(config.archive_dir) + '/')
.headline= _p('aside.articles')
.length_num= site.posts.length
if site.tags.length
.mobile_data_item.is_center
.mobile_data_item.is-center
.mobile_data_link
a(href=url_for(config.tag_dir) + '/' )
.headline= _p('aside.tags')
.length_num= site.tags.length
if site.categories.length
.mobile_data_item.is_center
.mobile_data_item.is-center
.mobile_data_link
a(href=url_for(config.category_dir) + '/')
.headline= _p('aside.categories')
@@ -41,6 +41,6 @@
#mobile-sidebar-toc
.toc_mobile_headline= _p('sidebar.catalog')
if (page.encrypt == true)
.toc-div-class(style="display:none")!=toc(page.origin,{"class":"toc_mobile_items",list_number:tocNumber})
.sidebar-toc__content.toc-div-class(style="display:none")!=toc(page.origin,{"class":"toc_mobile_items",list_number:tocNumber})
else
!=toc(page.content,{"class":"toc_mobile_items",list_number:tocNumber})
.sidebar-toc__content!=toc(page.content,{"class":"toc_mobile_items",list_number:tocNumber})

8
layout/includes/nav.pug
View File

@@ -3,8 +3,7 @@
if is_home()
nav#nav.full_page
.nav_bg(style=bg_img)
nav#nav.full_page(style=bg_img)
#site-info
#site-title
span.blogtitle= page.title || page.tag || page.category || config.title
@@ -15,14 +14,13 @@ if is_home()
#site-social-icons
each url, icon in theme.social
a.social-icon(href=url target="_blank")
i(class=icon)
i(class=icon aria-hidden="true")
.scroll-down
i.fa.fa-angle-down.scroll-down-effects
else
nav#nav.not_index_bg
.nav_bg(style=bg_img)
nav#nav.not_index_bg(style=bg_img)
#page_site-info
#site-title
if (is_archive())

4
layout/includes/pagination.pug
View File

@@ -1,7 +1,7 @@
-
var options = {
prev_text: '<i class="fa fa-chevron-left"></i>',
next_text: '<i class="fa fa-chevron-right"></i>',
prev_text: '<i class="fa fa-fw fa-chevron-left" aria-hidden="true"></i>',
next_text: '<i class="fa fa-fw fa-chevron-right" aria-hidden="true"></i>',
mid_size: 1,
escape: false
}

19
layout/includes/recent-posts.pug
View File

@@ -1,24 +1,25 @@
each article , index in page.posts.data
.recent-post-item.article-container
- var link = article.link || article.path
- var title = article.title || _p('no_title')
if index%2 == 0
.post_cover.pull_left.left_radius
a(href=url_for(link) title=article.title || _p('no_title'))
.post_cover.left_radius
a(href=url_for(link) title=title)
- var post_cover = article.cover
if theme.lazyload.enable
img.post_bg.lazyload(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
img.post_bg.lazyload(data-src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
else
img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
img.post_bg(src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
else
.post_cover.pull_right.right_radius
a(href=url_for(link) title=article.title || _p('no_title'))
.post_cover.right_radius
a(href=url_for(link) title=title)
- var post_cover = article.cover
if theme.lazyload.enable
img.post_bg.lazyload(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
img.post_bg.lazyload(data-src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
else
img.post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'`)
img.post_bg(src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` alt=title)
.recent-post-info
a.article-title(href=url_for(link) title= article.title || _p('no_title'))= article.title || _p('no_title')
a.article-title(href=url_for(link) title=title)= title
if (article.top)
span.article-meta
i.fa.fa-thumb-tack.article-meta__icon.sticky

4
layout/includes/reward.pug
View File

@@ -1,11 +1,11 @@
.post-reward
a.reward-button
a.reward-button.button--primary.button--animated
i.fa.fa-qrcode
= ' ' + _p('donate')
.reward-main
ul.reward-all
each item in theme.reward.QR_code
li.reward-item
img.lazyload.post-qr-code__img(src=(item.itemlist||item).img)
img.lazyload.post-qr-code__img(src=url_for((item.itemlist||item).img) alt=(item.itemlist||item).text)
.post-qr-code__desc=(item.itemlist||item).text

5
layout/includes/rightside.pug
View File

@@ -2,8 +2,9 @@ section#rightside.rightside
#rightside-config-hide
if theme.readmode.enable && is_post()
i#readmode.fa.fa-book(title=_p('rightside.readmode_title'))
i#font_plus.fa.fa-plus(title=_p('rightside.font_plus_title'))
i#font_minus.fa.fa-minus(title=_p('rightside.font_minus_title'))
if is_post()
i#font_plus.fa.fa-plus(title=_p('rightside.font_plus_title'))
i#font_minus.fa.fa-minus(title=_p('rightside.font_minus_title'))
if theme.translate && theme.translate.enable
a#translateLink.translate_chn_to_cht(href="javascript:translatePage();" title=_p('rightside.translate_title') target="_self")= theme.translate.default
if theme.darkmode && theme.darkmode.enable

4
layout/includes/widget/card_announcement.pug
View File

@@ -1,6 +1,6 @@
.card_widget.card-announcement
.card-widget.card-announcement
.card-content
.item_headline
.item-headline
i.fa.fa-bullhorn.card-announcement-animation(aria-hidden="true")
span= _p('aside.card_announcement')
.announcement_content= theme.announcement.content

6
layout/includes/widget/card_archives.pug
View File

@@ -1,6 +1,6 @@
.card_widget.card-archives
.card-widget.card-archives
.card-content
.item_headline
.item-headline
i.fa.fa-archive(aria-hidden="true")
span= _p('aside.card_archives')
div.archives_item!= list_archives({type:'monthly',format: 'YYYY年MM月'})
!= list_archives({type:'monthly',format: 'YYYY年MM月'})

53
layout/includes/widget/card_author.pug
View File

@@ -1,43 +1,36 @@
.card_widget.card-author
.card-widget.card-info
.card-content
.post_data
.data-item.is_center
img.lazyload.avatar_img(src=url_for(theme.avatar) onerror=`onerror=null;src='${theme.lodding_bg.flink}'`)
p.author-info__name.is_center= config.author
p.author-info__description.is_center= config.description
.card-info-avatar.is-center
img.avatar-img(src=url_for(theme.avatar) onerror=`this.onerror=null;this.src='` + url_for(theme.lodding_bg.flink) + `'` alt="avatar")
.author-info__name= config.author
.author-info__description= config.description
.post_data.data_config
.card-info-data
if site.posts.length
.data-item.is_center
.data_link
a(href=url_for(config.archive_dir) + '/')
p.headline= _p('aside.articles')
p.length_num= site.posts.length
.card-info-data-item.is-center
a(href=url_for(config.archive_dir) + '/')
.headline= _p('aside.articles')
.length_num= site.posts.length
if site.tags.length
.data-item.is_center
.data_link
a(href=url_for(config.tag_dir) + '/' )
p.headline= _p('aside.tags')
p.length_num= site.tags.length
.card-info-data-item.is-center
a(href=url_for(config.tag_dir) + '/' )
.headline= _p('aside.tags')
.length_num= site.tags.length
if site.categories.length
.data-item.is_center
.data_link
a(href=url_for(config.category_dir) + '/')
p.headline= _p('aside.categories')
p.length_num= site.categories.length
.card-info-data-item.is-center
a(href=url_for(config.category_dir) + '/')
.headline= _p('aside.categories')
.length_num= site.categories.length
.post_data.is_center
a#bookmark-it.data-item.bookmark.bookmarke--primary.bookmark--animated(href="javascript:;" title= _p('aside.card_bookmark') target="_self")
.card-info-bookmark.is-center
a#bookmark-it.bookmark.button--primary.button--animated(href="javascript:;" title= _p('aside.card_bookmark') target="_self")
i.fa.fa-bookmark(aria-hidden="true")
span= _p('aside.card_bookmark') || 'Follow Me'
if(theme.social)
.post_data.data_config
#aside-social-icons
.card-info-social-icons.is-center
each url, icon in theme.social
a.social-icon.data-item(href=url target="_blank")
i(class=icon)
a.social-icon(href=url target="_blank")
i(class=icon aria-hidden="true")

16
layout/includes/widget/card_categories.pug
View File

@@ -1,20 +1,20 @@
if site.categories.length
.card_widget.card-categories
.card-widget.card-categories
.card-content
.item_headline
.item-headline
i.fa.fa-folder-open(aria-hidden="true")
span= _p('aside.card_categories')
ul.aside_category_item
ul.aside-category-item
mixin displayCategories(parent = undefined)
- site.categories.find({ parent }).sort("name").each(function(category) {
- var childCount = site.categories.find({ parent: category._id }).count();
li.aside_category_list
a.aside_category_list_link(href=url_for(category.path))
span.aside_category_list_name= category.name
span.aside_category_list_length= category.length
li.aside-category-list
a.aside-category-list_link(href=url_for(category.path))
span.aside-category-list_name= category.name
span.aside-category-list_length= category.length
if childCount > 0
ul.aside_category_item.child
ul.aside-category-item.child
+displayCategories(category._id)
- })

21
layout/includes/widget/card_recent_post.pug
View File

@@ -1,23 +1,24 @@
.card_widget.card-recent-post
.card-widget.card-recent-post
.card-content
.item_headline
.item-headline
i.fa.fa-history(aria-hidden="true")
span= _p('aside.card_recent_post')
.aside_recent_item
.aside-recent-item
- site.posts.sort('date', -1).limit(5).each(function(article){
.aside_recent_post
.aside-recent-post
- var link = article.link || article.path
- var title = article.title || _p('no_title')
a(href=url_for(link))
- var post_cover = article.cover
.aside_post_cover
.aside-post-cover
if theme.lazyload.enable
img.aside_post_bg.lazyload(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
img.aside-post-bg.lazyload(data-src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` title=title alt=title)
else
img.aside_post_bg(src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
div#aside_title
.aside_post_title(href=url_for(link) title=article.title || _p('no_title'))= article.title || _p('no_title')
img.aside-post-bg(src=`${post_cover}` onerror=`this.onerror=null;this.src='`+ url_for(theme.lodding_bg.post_page) + `'` title=title alt=title)
.aside-post-title
.aside-post_title(href=url_for(link) title=article.title || _p('no_title'))= article.title || _p('no_title')
if (theme.post_meta.date_type)
- var date_type = theme.post_meta.date_type == 'updated' ? 'updated' : 'date'
time.aside_post_meta.post-meta__date #[=date(article[date_type], config.date_format)]
time.aside-post_meta.post-meta__date #[=date(article[date_type], config.date_format)]
- })

6
layout/includes/widget/card_tags.pug
View File

@@ -1,7 +1,7 @@
if site.tags.length
.card_widget.card-tags
.card-widget.card-tags
.card-content
.item_headline
.item-headline
i.fa.fa-tags(aria-hidden="true")
span= _p('aside.card_tags')
.card-tag-cloud!= tagcloud({min_font: 16, max_font: 24, amount: 200, color: true, start_color: '#999', end_color: '#000'})
.card-tag-cloud!= tagcloud({min_font: 16, max_font: 24, amount: 200, color: true, start_color: '#999', end_color: '#99a9bf'})

30
layout/includes/widget/card_webinfo.pug
View File

@@ -1,24 +1,22 @@
.card_widget.card-webinfo
.card-widget.card-webinfo
.card-content
.item_headline
.item-headline
i.fa.fa-line-chart(aria-hidden="true")
span= _p('aside.card_webinfo.headline')
.webinfo
.webinfo_item
.webinfo_article_name= _p('aside.card_webinfo.article_name') + " :"
.webinfo_article_count= site.posts.length
.webinfo-item
.webinfo-article-name= _p('aside.card_webinfo.article_name') + " :"
.webinfo-article-count= site.posts.length
if theme.runtimeshow.enable
.webinfo_item
.webinfo_runtime_name= _p('aside.card_webinfo.runtime_name') + " :"
#webinfo_runtime_count.webinfo_runtime_count
script#runtionshow(src=url_for(theme.CDN.runtimeshow) start_date=theme.runtimeshow.start_date)
.webinfo-item
.webinfo-runtime-name= _p('aside.card_webinfo.runtime_name') + " :"
#webinfo-runtime-count.webinfo-runtime-count(start_date=theme.runtimeshow.start_date)
if theme.busuanzi.site_uv
.webinfo_item
.webinfo_site_uv_name= _p('aside.card_webinfo.site_uv_name') + " :"
.webinfo_site_uv_count#busuanzi_value_site_uv
.webinfo-item
.webinfo-site-uv-name= _p('aside.card_webinfo.site_uv_name') + " :"
.webinfo-site-uv-count#busuanzi_value_site_uv
if theme.busuanzi.site_pv
.webinfo_item
.webinfo_site_name= _p('aside.card_webinfo.site_pv_name') + " :"
.webinfo_site_pv_count#busuanzi_value_site_pv
.webinfo-item
.webinfo-site-name= _p('aside.card_webinfo.site_pv_name') + " :"
.webinfo-site-pv-count#busuanzi_value_site_pv

21
layout/includes/widget/index.pug Normal file
View File

@@ -0,0 +1,21 @@
if theme.aside.card_author
include ./card_author.pug
if theme.aside.card_announcement
include ./card_announcement.pug
if theme.aside.card_recent_post
include ./card_recent_post.pug
if theme.aside.card_categories
include ./card_categories.pug
if theme.aside.card_tags
include ./card_tags.pug
if theme.aside.card_archives
include ./card_archives.pug
if theme.aside.card_webinfo
include ./card_webinfo.pug