🏷️ 更新2.3.0

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

View File

@@ -10,16 +10,10 @@
- var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
- var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
<<<<<<< HEAD
- var pageDescription = page.description || page.title || config.description
- var pageKeywords
- if (page.tags && page.tags.data) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
=======
- var pageDescription = page_description()
- var pageKeywords
- if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') : ([]).join(',') || page.keywords
- else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
>>>>>>> dev
- else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','): ([]).join(',') || config.keywords
- var pageAuthor = config.email ? config.author + ',' + config.email : config.author
- var pageCopyright = config.copyright || config.author
@@ -106,8 +100,5 @@ if theme.blog_title_font.font_link
include ./head/config_site.pug
include ./head/noscript.pug
<<<<<<< HEAD
=======
!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})
>>>>>>> dev
!=fragment_cache('injectHead', function(){return injectHtml(theme.inject.head)})