🏷️ 2.3.0發佈

This commit is contained in:
Jerry
2020-04-26 23:37:37 +08:00
Unverified
79 changed files with 1642 additions and 744 deletions

View File

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

View File

@@ -33,7 +33,11 @@ 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()

View File

@@ -1,18 +1,19 @@
each value, label in theme.menu
if !Array.isArray(value)
.menus_item
a.site-page(href=url_for(trim(value.split('||')[0])))
i.fa-fw(class=trim(value.split('||')[1]))
span=' '+label
else
.menus_item
a.site-page
i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true")
span=' '+ trim(label.split('||')[0])
i.fa.fa-chevron-down.menus-expand(aria-hidden="true")
ul.menus_item_child
each i in value
li
a.site-page(href=url_for(trim(i.split('||')[1])))
i.fa-fw(class=trim(i.split('||')[2]))
span=' '+trim(i.split('||')[0])
.menus_items
each value, label in theme.menu
if !Array.isArray(value)
.menus_item
a.site-page(href=url_for(trim(value.split('||')[0])))
i.fa-fw(class=trim(value.split('||')[1]))
span=' '+label
else
.menus_item
a.site-page
i.fa-fw(class=trim(label.split('||')[1]) aria-hidden="true")
span=' '+ trim(label.split('||')[0])
i.fa.fa-chevron-down.menus-expand(aria-hidden="true")
ul.menus_item_child
each i in value
li
a.site-page(href=url_for(trim(i.split('||')[1])))
i.fa-fw(class=trim(i.split('||')[2]))
span=' '+trim(i.split('||')[0])

View File

@@ -62,23 +62,38 @@
span.post-meta-commentcount
- var commentCount = theme.fontawesome_v5 && theme.fontawesome_v5.enable ? 'far fa-comments' : 'fa fa-comment-o'
if ((theme.disqus && theme.disqus.enable && theme.disqus.count && page.comments !== false) || (theme.disqusjs && theme.disqusjs.enable && theme.disqusjs.count && page.comments !== false))
if (theme.busuanzi && theme.busuanzi.page_pv)
if (postWordcount || theme.busuanzi.page_pv)
span.post-meta__separator |
i.post-meta__icon(class=commentCount aria-hidden="true")
span= _p('post.comments') + ':'
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') + ':'
a(href=url_for(page.path) + '#post-comment')
span.gitalk-comment-count.comment-count
else if theme.facebook_comments.enable && theme.facebook_comments.count && page.comments !== false
if (postWordcount || theme.busuanzi.page_pv)
span.post-meta__separator |
i.post-meta__icon(class=commentCount aria-hidden="true")
span= _p('post.comments') + ':'
a.comment-count(href=url_for(page.path) + '#post-comment')
span.fb-comments-count(data-href=urlNoIndex())