biss/hexo-theme-butterfly
1
0
Fork 0
mirror of https://github.com/jerryc127/hexo-theme-butterfly.git synced 2026-06-05 21:01:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
hwy0127@gmail.com
2019-06-17 21:25:18 +08:00
Unverified
parent 79971d49db
commit 5a3363e0e4
37 changed files with 2955 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/flink.pug
+22 -157
View File
@@ -1,163 +1,28 @@
style.
.md-links {
min-height: calc(100% - 120px - 5pc - 6em);
text-align: center;
overflow: auto;
padding: 0;
margin: 0 auto;
}
.md-links-item {
height: 90px;
line-height: 17px;
margin: 20px 7px;
padding: 0px 0px;
transition: box-shadow 0.25s;
text-overflow: ellipsis;
overflow: hidden;
border-radius: 8px;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgba(0, 0, 0, 0);
position: relative;
-webkit-transition-property: color;
transition-property: color;
-webkit-transition-duration: 0.3s;
transition-duration: 0.3s;
}
.md-links a {
color: #333;
text-decoration: none;
}
.md-links li {
width: calc(100%/3 - 14px);
float: left;
list-style: none;
}
.md-links-item img {
float: left;
border-radius: 35px;
margin: 11px 10px;
width: 70px;
height: 70px;
border: 0px solid #eaeefb;
}
.md-links-item:hover img{
filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-moz-transform: rotate(540deg);
-o-transform: rotate(540deg);
-webkit-transform: rotate(540deg);
transform: rotate(540deg);
}
.md-links-des{
padding: 16px 10px;
font-size:13px;
overflow: hidden;
height:50px;
white-space: nowrap;
text-overflow: ellipsis;
}
.md-links-item:before {
content: "";
position: absolute;
z-index: -1;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: #2098D1 !important;
-webkit-transform: scale(0);
transform: scale(0);
-webkit-transition-property: transform;
transition-property: transform;
-webkit-transition-duration: 0.3s;
transition-duration: 0.3s;
-webkit-transition-timing-function: ease-out;
transition-timing-function: ease-out;
}
.md-links-item:hover, .md-links-item:focus, .md-links-item:active {
color: white;
}
.md-links-item:hover:before, .md-links-item:focus:before, .md-links-item:active:before {
-webkit-transform: scale(1);
transform: scale(1);
}
.md-links-item a:hover{
cursor: pointer;
}
.md-links-title {
padding-top: 16px;
padding-right: 10px;
font-size: 20px;
font-weight: bold;
height:40px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
#scheme-Paradox .mdl-mini-footer{
clear: left;
}
#bottom{
position: relative;
}
.post-cards {
margin-top: 5px;
margin-bottom: 75px;
min-height: 100px;
padding: 15px;
/*background: #fff;*/
border-radius: 15px;
}
.comment-word{
font-weight:bold;
font-size:1.7em;
}
@media screen and (max-width:1100px){
.post-cards {
position: relative;
margin: -20px -16px 0;
border-radius: 18px;
padding: 16px;
}
.md-links li {
width: calc(100%/2 - 14px);
}
}
@media screen and (max-width:600px) {
.md-links li {
width: calc(100%/1 - 14px);
}
}
.flink
p(class="comment-word")= theme.Flink.headline
each i in site.data.link
p.comment-word= i.class_name
.post-cards
ul.md-links
each item in i.link_list
li.md-links-item
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")
div(class="md-links-title")= item.name
<br/>
div(class="md-links-des")=item.descr
div(class="post-cards")
ul(class="md-links")
- var data = theme.flinks
- var i = 0
each item in data
li(class="md-links-item")
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")
div(class="md-links-title")=item.name
<br/>
div(class="md-links-des")=item.descr
hr
div
p(style="font-size:15px;font-weight:bold")= theme.Flink.info_headline
ul
li= theme.Flink.name
li= theme.Flink.address
li= theme.Flink.avatar
li= theme.Flink.info
<hr>
div
p(style="font-size:15px;font-weight:bold")= theme.Flink.info_headline
ul
li= theme.Flink.name
li= theme.Flink.address
li= theme.Flink.avatar
li= theme.Flink.info
<hr>
div(class="comment_int")
p(class="comment-word")= theme.Flink.comment
hr
.comment_int
p.comment-word= theme.Flink.comment
layout/includes/additional-js.pug
+9 -2
View File
@@ -9,6 +9,9 @@ if (theme.katex && theme.katex.enable)
if (theme.local_search && theme.local_search.enable)
script(async src=url_for('/js/search/local-search.js'))
if theme.fireworks && theme.fireworks.enable
script(src='https://cdn.jsdelivr.net/npm/animejs@latest/anime.min.js')
script(src=url_for('/js/third-party/fireworks.js'))
if theme.nightshift.enable
script(src=url_for('js/nightshift.js'))
@@ -19,6 +22,9 @@ if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
if (theme.canvas_ribbon_piao && theme.canvas_ribbon_piao.enable)
include ./third-party/canvas-ribbon-piao.pug
if theme.baidu_push && theme.baidu_push.enable
script(src=url_for('js/baidupush.js'))
if theme.activate_power_mode.enable
script(src=url_for('js/activate-power-mode.js'))
script.
@@ -79,6 +85,7 @@ if is_home()
}
})
script(async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js")
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(src="https://cdn.jsdelivr.net/npm/instant.page@1.2.2/instantpage.min.js" type="module")
layout/includes/comments/valine.pug
+1 -1
View File
@@ -65,5 +65,5 @@ if theme.valine && theme.valine.enable
guest_info:guest_info,
pageSize:'#{theme.valine.pageSize}',
lang:'#{theme.valine.lang}',
visitor: true
recordIP: true
});
layout/includes/config.pug
+4 -2
View File
@@ -26,7 +26,7 @@
}
})
}
var translate = 'undefined';
if (theme.translate && theme.translate.enable){
var defaultEncoding;
translate = JSON.stringify({
@@ -58,7 +58,9 @@ script.
title: '!{_p("bookmark.title")}',
message_prev: '!{_p("bookmark.message_prev")}',
message_next: '!{_p("bookmark.message_next")}'
}
},
runtime_unit: '!{_p("runtime_unit")}'
}
layout/includes/head.pug
+5 -4
View File
@@ -104,9 +104,10 @@ if theme.qihu_site_verification
meta(name="360-site-verification" content=theme.qihu_site_verification)
if (is_archive())
- var preload_img = theme.archive_img ||theme.top_img || config.top_img
- var preload_archive_img = theme.archive_img ||theme.top_img || config.top_img
- var preload_img = page.top_img || theme.top_img || config.top_img
if (is_archive() && preload_archive_img)
link(rel="preload" href=preload_img as="image" )
else if (!is_post())
- var preload_img = page.top_img||theme.top_img || config.top_img
else if (!is_post() && preload_img)
link(rel="preload" href=preload_img as="image" )
layout/includes/layout.pug
+7 -5
View File
@@ -5,13 +5,13 @@
- if (is_category()) pageTitle = _p('page.category') + ': ' + page.category
- if (is_month()) pageTitle += ': ' + page.month + '/' + page.year
- if (is_year()) pageTitle += ': ' + page.year
- var pageTitle_saved //- 暂时存储pageTitle
- var pageTitle_no_include_blog_name //- 存储pageTitle， 不带 " | "，meta用
//- home时显示config.title (JerryC)，其他显示 pageTitle。meta用
- var pageTitle_saved //- 暫時存儲pageTitle
- var pageTitle_no_include_blog_name //- 存儲pageTitle， 不帶 " | "，meta用
//- home時顯示config.title (JerryC)，其他顯示 pageTitle。meta用
- 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
//- home时pageTitle显示 JerryC - subtitle，其他显示 pageTitle | JerryC
//- home時pageTitle顯示 JerryC - subtitle，其他顯示 pageTitle | JerryC
- is_home() ? pageTitle = config.title + ' - ' + config.subtitle : pageTitle = pageTitle_saved
- var pageDescription = page.description || page.title || config.description || ''
@@ -42,6 +42,8 @@ html(lang=config.language)
include ./head.pug
include ./config.pug
body
if theme.fireworks && theme.fireworks.enable
canvas.fireworks
if (is_post() && page.toc != false && theme.toc.enable)
i.fa.fa-arrow-right#toggle-sidebar(aria-hidden="true")
include ./sidebar.pug
layout/includes/nav.pug
+2 -3
View File
@@ -4,11 +4,10 @@ else
- var top_img = page.top_img||theme.top_img || config.top_img
- var bg_img = top_img && top_img !== true ? `background-image: url(${top_img})` : ''
- var flag = top_img === true ? 'no-bg' : ''
if is_home()
nav#nav.full_page(style=bg_img class=flag)
nav#nav.full_page(style=bg_img)
include ./header.pug
#site-info
#site-title
@@ -26,7 +25,7 @@ if is_home()
i.fa.fa-angle-down.scroll-down-effects
else
nav#nav.bg_local(style=bg_img class=flag)
nav#nav.bg_local(style=bg_img)
include ./header.pug
#page_site-info
#site-title
layout/includes/recent-posts.pug
+1 -1
View File
@@ -54,6 +54,6 @@ each article , index in page.posts.data
.more_setting
a.more.more--border.more--primary.more--animated(href=url_for(link) + '#more' style="margin-top: 14px")= _p('read_more')
else
.content!= post_description
.content!= article.description
layout/includes/related-posts.pug
+6
View File
@@ -0,0 +1,6 @@
.relatedPosts
.relatedPosts_headline
i.fa.fa-thumbs-up(aria-hidden="true")
span=' ' + _p('relatedPosts_headline')
.relatedPosts_list!= related_posts(page,site.posts)
.clear_both
layout/includes/search/local-search.pug
+1 -1
View File
@@ -10,7 +10,7 @@
#local-stats
#hr.local-search-stats__hr
case config.language
when "zh-Hans"
when "zh-CN"
span=_p("local_search.by")
| #[a(href="https://github.com/wzpan/hexo-generator-search" style={'color': '#49B1F5'}) hexo-generator-search]
| #[span=_p("local_search.powered")]
layout/includes/share/add-this.pug
+1 -1
View File
@@ -1,2 +1,2 @@
.addthis_inline_share_toolbox.pull-right
.addthis_inline_share_toolbox
script(src=`//s7.addthis.com/js/300/addthis_widget.js#pubid=${theme.addThis.pubid}` async)
layout/includes/share/addtoany.pug
+5 -9
View File
@@ -1,13 +1,9 @@
.addtoany
.a2a_kit.a2a_kit_size_32.a2a_default_style
a.a2a_button_facebook
a.a2a_button_twitter
a.a2a_button_wechat
a.a2a_button_sina_weibo
a.a2a_button_facebook_messenger
a.a2a_button_email
a.a2a_button_copy_link
a.a2a_dd(href="https://www.addtoany.com/share")
.a2a_kit.a2a_kit_size_32.a2a_default_style
each name in theme.addtoany.item
a(class="a2a_button_" + name)
a.a2a_dd(href="https://www.addtoany.com/share")
script(async src="https://static.addtoany.com/menu/page.js")
layout/post.pug
+17 -81
View File
@@ -1,68 +1,13 @@
extends includes/layout.pug
block top_img
- var top_img = page.top_img || page.cover || theme.post_meta.top_img || theme.post_img || config.top_img
if (top_img && page.top_img !== false)
- var bg_img = top_img !== true ? `background-image: url(${top_img})` : ''
- var flag = top_img === true ? 'no-bg' : ''
div#top-container(style=bg_img class=flag)
include ./includes/header.pug
#post-info
#post-title
.posttitle=page.title || _p('no_title')
#post-meta
if (theme.post_meta.date_type)
if (theme.post_meta.date_type === 'both')
time.post-meta__date
i.fa.fa-calendar(aria-hidden="true")
=' '+_p('post.created')+' '+date(page.date, config.date_format)
span.post-meta__separator |
i.fa.fa-history(aria-hidden="true")
=' '+_p('post.updated')+' '+date(page.updated, config.date_format)
else
- var date_type = theme.post_meta.date_type === 'updated' ? 'updated' : 'date'
time.post-meta__date #[i.fa.fa-calendar(aria-hidden="true")] #[=date(page[date_type], config.date_format)]
if (theme.post_meta.categories && page.categories.data.length > 0)
if (theme.post_meta.date_type)
span.post-meta__separator.mobile_hidden |
span.mobile_hidden
each item, index in page.categories.data
i.fa.fa-inbox.post-meta__icon(aria-hidden="true")
a(href=url_for(item.path)).post-meta__categories #[=item.name]
if (index < page.categories.data.length - 1)
i.fa.fa-angle-right(aria-hidden="true")
//- if (theme.disqus.enable && theme.disqus.count)
//- if (theme.post_meta.date_type || theme.post_meta.categories && page.categories.data.length > 0)
//- span.post-meta__separator |
//- i.fa.fa-comment-o.post-meta__icon(aria-hidden="true")
//- a(href=url_for(page.path) + '#disqus_thread')
//- span.disqus-comment-count(data-disqus-identifier=page.path)
//- if theme.valine && theme.valine.enable
//- if (theme.post_meta.date_type || theme.post_meta.categories && page.categories.data.length > 0)
//- span.post-meta__separator |
//- i.fa.fa-comment-o.post-meta__icon(aria-hidden="true")
//- a(href=url_for(page.path) + '#vcomment')
//- pan.valine-comment-count(data-xid=url_for(page.path))
if (theme.wordcount && theme.wordcount.enable)
.post-meta-wordcount
span= _p('post.wordcount') + ': '
span.word-count= wordcount(page.content)
span.post-meta__separator |
span= _p('post.min2read', min2read(page.content, {cn: 350, en: 160}))
if theme.busuanzi.page_pv
span.post-meta__separator |
span= _p('post.page_pv') + ': '
span#busuanzi_value_page_pv
else
div#top-container.plain
include ./includes/header.pug
block content
article#post(class="")
if (!top_img)
#post-title.plain= page.title || _p('no_title')
- var top_img = page.top_img || page.cover || theme.post_meta.top_img || theme.post_img || theme.top_img || config.top_img
- var bg_img = top_img !== true ? `background-image: url(${top_img})` : ''
div#top-container(style=bg_img)
include ./includes/header.pug
#post-info
#post-title
.posttitle=page.title || _p('no_title')
#post-meta
if (theme.post_meta.date_type)
if (theme.post_meta.date_type === 'both')
@@ -75,7 +20,7 @@ block content
else
- var date_type = theme.post_meta.date_type === 'updated' ? 'updated' : 'date'
time.post-meta__date #[i.fa.fa-calendar(aria-hidden="true")] #[=date(page[date_type], config.date_format)]
if (theme.post_meta.categories && page.categories.data.length > 0)
if (theme.post_meta.date_type)
span.post-meta__separator.mobile_hidden |
@@ -85,27 +30,20 @@ block content
a(href=url_for(item.path)).post-meta__categories #[=item.name]
if (index < page.categories.data.length - 1)
i.fa.fa-angle-right(aria-hidden="true")
//- if (theme.disqus.enable && theme.disqus.count)
//- if (theme.post_meta.date_type || theme.post_meta.categories && page.categories.data.length > 0)
//- span.post-meta__separator |
//- i.fa.fa-comment-o(aria-hidden="true")
//- a(href=url_for(page.path) + '#disqus_thread')
//- span.disqus-comment-count(data-disqus-identifier=page.path)
//- if theme.valine && theme.valine.enable
//- if (theme.post_meta.date_type || theme.post_meta.categories && page.categories.data.length > 0)
//- span.post-meta__separator |
//- i.fa.fa-comment-o(aria-hidden="true")
//- a(href=url_for(page.path) + '#vcomment')
//- span.valine-comment-count(data-xid=url_for(page.path))
if (theme.wordcount && theme.wordcount.enable)
span.post-meta__separator |
span.post-meta-wordcount
.post-meta-wordcount
span= _p('post.wordcount') + ': '
span.word-count= wordcount(page.content)
span.post-meta__separator |
span= _p('post.min2read', min2read(page.content, {cn: 350, en: 160}))
if theme.busuanzi.page_pv
span.post-meta__separator |
span= _p('post.page_pv') + ': '
span#busuanzi_value_page_pv
block content
article#post(class="")
#post-content.article-container!= page.content
if (theme.post_copyright && theme.post_copyright.enable)
.post-copyright
@@ -131,10 +69,8 @@ block content
if theme.reward.enable
include includes/reward.pug
include includes/pagination.pug
if theme.related_post && theme.related_post.enable
div.relatedPosts!= related_posts(page,site.posts)
if (theme.adv && theme.adv.enable)
.post-adv!= theme.adv.info
include includes/related-posts.pug
if page.comments !== false
include includes/comments/index.pug