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

🏷️ 更新2.3.0

Browse Source
This commit is contained in:
Jerry
2020-04-26 23:42:52 +08:00
Unverified
parent e2cb0242bb
commit 40ba3bb92f
21 changed files with 108 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
layout/includes/header/header.pug
View File

@@ -8,16 +8,6 @@
a.site-page.social-icon.search
i.fa.fa-search.fa-fw
span=' '+_p('search')
<<<<<<< HEAD
.menus_items
include ./menu_item.pug
span.toggle-menu.close
a.site-page
i.fa.fa-bars.fa-fw(aria-hidden="true")
=======
!=fragment_cache('menus', function(){return partial('includes/header/menu_item')})
span.toggle-menu.close
@@ -25,4 +15,3 @@
i.fa.fa-bars.fa-fw(aria-hidden="true")
>>>>>>> dev

4
layout/includes/header/index.pug
View File

@@ -33,11 +33,7 @@ if theme.douban
span#subtitle
if(theme.social)
#site_social_icons
<<<<<<< HEAD
!=partial('includes/header/social', {}, {cache:theme.fragment_cache})
=======
!=fragment_cache('social', function(){return partial('includes/header/social')})
>>>>>>> dev
#scroll_down
i.fa.fa-angle-down.scroll-down-effects
else if is_post()

8
layout/includes/header/post-info.pug
View File

@@ -69,22 +69,14 @@
span.disqus-comment-count.comment-count
a(href=full_url_for(page.path) + '#disqus_thread')
else if (theme.valine && theme.valine.enable && theme.valine.count && page.comments !== false)
<<<<<<< HEAD
if (theme.busuanzi && theme.busuanzi.page_pv)
=======
if (postWordcount || theme.busuanzi.page_pv)
>>>>>>> dev
span.post-meta__separator |
i.post-meta__icon(class=commentCount aria-hidden="true")
span= _p('post.comments') + ':'
a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
span.valine-comment-count.comment-count(data-xid=url_for(page.path) itemprop="commentCount")
else if (theme.gitalk && theme.gitalk.enable && theme.gitalk.count && page.comments !== false)
<<<<<<< HEAD
if (theme.busuanzi && theme.busuanzi.page_pv)
=======
if (postWordcount || theme.busuanzi.page_pv)
>>>>>>> dev
span.post-meta__separator |
i.post-meta__icon(class=commentCount aria-hidden="true")
span= _p('post.comments') + ':'