New variable CONFIG.images

This commit is contained in:
Mimi 2020-11-05 10:31:35 +08:00
parent 3640946f60
commit 88b4ae077a
7 changed files with 17 additions and 10 deletions

View File

@ -936,3 +936,9 @@ vendors:
# Canvas ribbon # Canvas ribbon
canvas_ribbon: canvas_ribbon:
# Assets
# Accelerate delivery of static files using a CDN
css: css
js: js
images: images

View File

@ -9,7 +9,7 @@
<link itemprop="mainEntityOfPage" href="{{ post.permalink }}"> <link itemprop="mainEntityOfPage" href="{{ post.permalink }}">
<span hidden itemprop="author" itemscope itemtype="http://schema.org/Person"> <span hidden itemprop="author" itemscope itemtype="http://schema.org/Person">
<meta itemprop="image" content="{{ url_for(theme.avatar.url or 'images/avatar.gif') }}"> <meta itemprop="image" content="{{ url_for(theme.avatar.url or theme.images + '/avatar.gif') }}">
<meta itemprop="name" content="{{ author }}"> <meta itemprop="name" content="{{ author }}">
<meta itemprop="description" content="{{ description }}"> <meta itemprop="description" content="{{ description }}">
</span> </span>

View File

@ -38,7 +38,7 @@
<meta name="baidu-site-verification" content="{{ theme.baidu_site_verification }}"> <meta name="baidu-site-verification" content="{{ theme.baidu_site_verification }}">
{%- endif %} {%- endif %}
<link rel="stylesheet" href="{{ url_for('css/main.css') }}"> <link rel="stylesheet" href="{{ url_for(theme.css) }}/main.css">
{{ next_font() }} {{ next_font() }}

View File

@ -89,7 +89,7 @@
{%- if theme.creative_commons.license and theme.creative_commons.sidebar %} {%- if theme.creative_commons.license and theme.creative_commons.sidebar %}
<div class="cc-license site-overview-item animated" itemprop="license"> <div class="cc-license site-overview-item animated" itemprop="license">
{%- set ccImage = '<img src="' + url_for('images/cc-' + theme.creative_commons.license + '.svg') + '" alt="Creative Commons">' %} {%- set ccImage = '<img src="' + url_for(theme.images + '/cc-' + theme.creative_commons.license + '.svg') + '" alt="Creative Commons">' %}
{{ next_url(ccURL, ccImage, {class: 'cc-opacity'}) }} {{ next_url(ccURL, ccImage, {class: 'cc-opacity'}) }}
</div> </div>
{%- endif %} {%- endif %}

View File

@ -19,7 +19,7 @@ hexo.extend.helper.register('next_js', function(file, pjax = false) {
const { next_version } = this; const { next_version } = this;
const { internal } = this.theme.vendors; const { internal } = this.theme.vendors;
const links = { const links = {
local : this.url_for(`js/${file}`), local : this.url_for(`${this.theme.js}/${file}`),
jsdelivr: `//cdn.jsdelivr.net/npm/hexo-theme-next@${next_version}/source/js/${file}`, jsdelivr: `//cdn.jsdelivr.net/npm/hexo-theme-next@${next_version}/source/js/${file}`,
unpkg : `//unpkg.com/hexo-theme-next@${next_version}/source/js/${file}`, unpkg : `//unpkg.com/hexo-theme-next@${next_version}/source/js/${file}`,
cdnjs : `//cdnjs.cloudflare.com/ajax/libs/hexo-theme-next/${next_version}/${file}` cdnjs : `//cdnjs.cloudflare.com/ajax/libs/hexo-theme-next/${next_version}/${file}`
@ -60,9 +60,9 @@ hexo.extend.helper.register('post_gallery', function(photos) {
}); });
hexo.extend.helper.register('post_edit', function(src) { hexo.extend.helper.register('post_edit', function(src) {
const { theme } = this; const { post_edit } = this.theme;
if (!theme.post_edit.enable) return ''; if (!post_edit.enable) return '';
return this.next_url(theme.post_edit.url + src, '<i class="fa fa-pen-nib"></i>', { return this.next_url(post_edit.url + src, '<i class="fa fa-pen-nib"></i>', {
class: 'post-edit-link', class: 'post-edit-link',
title: this.__('post.edit') title: this.__('post.edit')
}); });

View File

@ -8,10 +8,11 @@ const { parse } = require('url');
* Export theme config to js * Export theme config to js
*/ */
hexo.extend.helper.register('next_config', function() { hexo.extend.helper.register('next_config', function() {
const { config, theme, __ } = this; const { config, theme, url_for, __ } = this;
const exportConfig = { const exportConfig = {
hostname : parse(config.url).hostname || config.url, hostname : parse(config.url).hostname || config.url,
root : config.root, root : config.root,
images : url_for(theme.images),
scheme : theme.scheme, scheme : theme.scheme,
version : this.next_version, version : this.next_version,
exturl : theme.exturl, exturl : theme.exturl,
@ -41,7 +42,7 @@ hexo.extend.helper.register('next_config', function() {
}; };
} }
if (config.search && theme.local_search && theme.local_search.enable) { if (config.search && theme.local_search && theme.local_search.enable) {
exportConfig.path = this.url_for(config.search.path); exportConfig.path = url_for(config.search.path);
exportConfig.localsearch = theme.local_search; exportConfig.localsearch = theme.local_search;
} }
return `<script class="hexo-configurations"> return `<script class="hexo-configurations">

View File

@ -43,7 +43,7 @@ document.addEventListener('DOMContentLoaded', () => {
.replace(/\$\{hits}/, data.nbHits) .replace(/\$\{hits}/, data.nbHits)
.replace(/\$\{time}/, data.processingTimeMS); .replace(/\$\{time}/, data.processingTimeMS);
return `<span>${stats}</span> return `<span>${stats}</span>
<img src="${CONFIG.root}images/logo-algolia-nebula-blue-full.svg" alt="Algolia">`; <img src="${CONFIG.images}/logo-algolia-nebula-blue-full.svg" alt="Algolia">`;
} }
}, },
cssClasses: { cssClasses: {