Merge branch 'dev' into master

This commit is contained in:
Jerry committed 2020-08-11 21:20:01 +08:00
commit d73960f2a2
6 files changed
+20 -7

No files matched your search

+1
View File
@@ -88,6 +88,7 @@
script.
var GLOBAL_CONFIG = {
root: '!{config.root}',
hexoversion: '!{get_hexo_version()}',
algolia: !{algolia},
localSearch: !{localSearch},
translate: !{translate},
+10 -4
View File
@@ -1,8 +1,6 @@
script(src=url_for(theme.CDN.pjax))
script.
var pjax = new Pjax({
elements: 'a:not([target="_blank"])',
selectors: [
let pjaxSelectors = [
'title',
'meta[name=description]',
'#config_change',
@@ -10,7 +8,15 @@ script.
'#rightside-config-hide',
'#rightside-config-show',
'.js-pjax'
],
]
if (!{theme.Open_Graph_meta && theme.comments.use && theme.comments.use.includes('Livere')}) {
pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
}
const pjax = new Pjax({
elements: 'a:not([target="_blank"])',
selectors: pjaxSelectors,
cacheBust: false,
})
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "hexo-theme-butterfly",
"version": "3.0.0",
"version": "3.0.1",
"description": "A Simple and Card UI Design theme for Hexo",
"main": "package.json",
"scripts": {
Loaded 3 of 6 files, more files were not shown because too many files have changed in this diff. Show more