hexo-theme-fluid 1.8.13 → 1.9.1

package/scripts/events/lib/merge-configs.js

@@ -11,7 +11,7 @@ module.exports = (hexo) => {
   let dataConfig = {};
   let dataStaticConfig = {};
 
-  if (hexo.locals.get) {
+  if (hexo.locals.get instanceof Function) {
     const data = hexo.locals.get('data');
     if (data && isNotEmptyObject(data.fluid_config)) {
       dataConfig = data.fluid_config;
@@ -25,32 +25,62 @@ module.exports = (hexo) => {
     if (data && isNotEmptyObject(data.fluid_static_prefix)) {
       dataStaticConfig = data.fluid_static_prefix;
     }
+
+    const { language } = hexo.config;
+    const { i18n } = hexo.theme;
+    const langConfigMap = {};
+    for (const key in data) {
+      if (Object.prototype.hasOwnProperty.call(data, key)) {
+        if (/^languages\/.+$/.test(key)) {
+          langConfigMap[key.replace('languages/', '')] = data[key];
+        }
+      }
+    }
+    if (isNotEmptyObject(langConfigMap)) {
+      const mergeLang = (lang) => {
+        if (langConfigMap[lang]) {
+          i18n.set(lang, objUtil.merge({}, i18n.get([lang]), langConfigMap[lang]));
+        }
+      };
+      if (Array.isArray(language)) {
+        for (const lang of language) {
+          mergeLang(lang);
+        }
+      } else {
+        mergeLang(language);
+      }
+      if (isZh) {
+        hexo.log.debug('[Fluid] 读取 source/_data/languages/*.yml 文件覆盖语言配置');
+      } else {
+        hexo.log.debug('[Fluid] Merge language config from source/_data/languages/*.yml');
+      }
+    }
   }
 
   if (isNotEmptyObject(hexo.config.theme_config)) {
     hexo.theme.config = objUtil.merge({}, hexo.theme.config, hexo.config.theme_config);
     if (isZh) {
-      hexo.log.info('[Fluid] 读取 _config.yml 中 theme_config 配置项覆盖配置');
+      hexo.log.debug('[Fluid] 读取 _config.yml 中 theme_config 配置项覆盖主题配置');
     } else {
-      hexo.log.info('[Fluid] Merge theme config from theme_config in _config.yml');
+      hexo.log.debug('[Fluid] Merge theme config from theme_config in _config.yml');
     }
   }
 
   if (isNotEmptyObject(dataStaticConfig)) {
     hexo.theme.config.static_prefix = objUtil.merge({}, hexo.theme.config.static_prefix, dataStaticConfig);
     if (isZh) {
-      hexo.log.info('[Fluid] 读取 source/_data/fluid_static_prefix.yml 文件覆盖配置');
+      hexo.log.debug('[Fluid] 读取 source/_data/fluid_static_prefix.yml 文件覆盖主题配置');
     } else {
-      hexo.log.info('[Fluid] Merge theme config from source/_data/fluid_static_prefix.yml');
+      hexo.log.debug('[Fluid] Merge theme config from source/_data/fluid_static_prefix.yml');
     }
   }
 
   if (isNotEmptyObject(dataConfig)) {
     hexo.theme.config = objUtil.merge({}, hexo.theme.config, dataConfig);
     if (isZh) {
-      hexo.log.info('[Fluid] 读取 source/_data/fluid_config.yml 文件覆盖配置');
+      hexo.log.debug('[Fluid] 读取 source/_data/fluid_config.yml 文件覆盖主题配置');
     } else {
-      hexo.log.info('[Fluid] Merge theme config from source/_data/fluid_config.yml');
+      hexo.log.debug('[Fluid] Merge theme config from source/_data/fluid_config.yml');
     }
   }
 

package/scripts/filters/default-injects.js

@@ -0,0 +1,27 @@
+/* global hexo */
+
+'use strict';
+
+const path = require('path');
+
+hexo.extend.filter.register('theme_inject', function(injects) {
+  injects.header.file('default', path.join(hexo.theme_dir, 'layout/_partials/header.ejs'));
+  injects.footer.file('default', path.join(hexo.theme_dir, 'layout/_partials/footer.ejs'));
+
+  injects.postLeft.file('default', path.join(hexo.theme_dir, 'layout/_partials/post/sidebar-left.ejs'));
+  injects.postRight.file('default', path.join(hexo.theme_dir, 'layout/_partials/post/sidebar-right.ejs'));
+  injects.postMetaTop.file('default', path.join(hexo.theme_dir, 'layout/_partials/post/meta-top.ejs'));
+  injects.postMetaBottom.file('default', path.join(hexo.theme_dir, 'layout/_partials/post/meta-bottom.ejs'));
+  if (hexo.theme.config.post.copyright.enable) {
+    injects.postCopyright.file('default', path.join(hexo.theme_dir, 'layout/_partials/post/copyright.ejs'));
+  }
+  if (hexo.theme.config.post.comments.enable) {
+    injects.postComments.file('default', path.join(hexo.theme_dir, 'layout/_partials/comments.ejs'));
+  }
+
+  injects.pageComments.file('default', path.join(hexo.theme_dir, 'layout/_partials/comments.ejs'));
+
+  if (hexo.theme.config.links.comments.enable) {
+    injects.linksComments.file('default', path.join(hexo.theme_dir, 'layout/_partials/comments.ejs'));
+  }
+}, -99);

package/scripts/filters/post-filter.js

@@ -42,3 +42,10 @@ hexo.extend.generator.register('post', function(locals) {
     )
   });
 });
+
+// 渲染文章后的过滤
+hexo.extend.filter.register('after_post_render', (page) => {
+  // 移除 hexo-renderer-pandoc 生成的 <colgroup>
+  page.content = page.content.replace(/<colgroup>.+?<\/colgroup>/gims, '');
+  return page;
+});

package/scripts/helpers/date.js

@@ -0,0 +1,25 @@
+/* global hexo */
+
+'use strict';
+
+const moment = require('moment');
+const { isMoment } = moment;
+
+hexo.extend.helper.register('compare_date', function(date1, date2) {
+  if (!date1) {
+    return -1;
+  }
+  if (!date2) {
+    return 1;
+  }
+  const m1 = isMoment(date1) ? date1 : moment(date1);
+  const m2 = isMoment(date2) ? date2 : moment(date2);
+  const diff = m1.diff(m2);
+  if (diff < 0) {
+    return -1;
+  } else if (diff > 0) {
+    return 1;
+  } else {
+    return 0;
+  }
+});

package/scripts/helpers/engine.js

@@ -0,0 +1,9 @@
+/* global hexo */
+
+'use strict';
+
+hexo.extend.helper.register('inject_point', function(point) {
+  return this.theme.injects[point]
+    .map(item => this.partial(item.layout, item.locals, item.options))
+    .join('');
+});

package/scripts/helpers/export-config.js

@@ -17,7 +17,9 @@ hexo.extend.helper.register('export_config', function() {
     typing       : theme.fun_features.typing,
     anchorjs     : theme.fun_features.anchorjs,
     progressbar  : theme.fun_features.progressbar,
+    code_language: theme.code.language,
     copy_btn     : theme.code.copy_btn,
+    image_caption: theme.post.image_caption,
     image_zoom   : theme.post.image_zoom,
     toc          : theme.post.toc,
     lazyload     : theme.lazyload,
@@ -26,6 +28,12 @@ hexo.extend.helper.register('export_config', function() {
   };
   return `<script id="fluid-configs">
     var Fluid = window.Fluid || {};
+    Fluid.ctx = Object.assign({}, Fluid.ctx)
     var CONFIG = ${JSON.stringify(exportConfig)};
+
+    if (CONFIG.web_analytics.follow_dnt) {
+      var dntVal = navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack;
+      Fluid.ctx.dnt = dntVal && (dntVal.startsWith('1') || dntVal.startsWith('yes') || dntVal.startsWith('on'));
+    }
   </script>`;
 });

package/scripts/helpers/import.js

@@ -0,0 +1,24 @@
+/* global hexo */
+
+'use strict';
+
+hexo.extend.helper.register('import_js', function(base, relative, ex = '') {
+  if (!Array.isArray(this.page.script_snippets)) {
+    this.page.script_snippets = [];
+  }
+  this.page.script_snippets.push(this.js_ex(base, relative, ex));
+});
+
+hexo.extend.helper.register('import_script', function(snippet) {
+  if (!Array.isArray(this.page.script_snippets)) {
+    this.page.script_snippets = [];
+  }
+  this.page.script_snippets.push(snippet);
+});
+
+hexo.extend.helper.register('import_css', function(base, relative, ex = '') {
+  if (!Array.isArray(this.page.css_snippets)) {
+    this.page.css_snippets = [];
+  }
+  this.page.css_snippets.push(this.css_ex(base, relative, ex));
+});

package/scripts/helpers/injects.js

@@ -0,0 +1,7 @@
+/* global hexo */
+
+'use strict';
+
+hexo.extend.helper.register('point_injected', function(type) {
+  return hexo.theme.config.injects[type] && hexo.theme.config.injects[type].length > 0;
+});

package/scripts/helpers/scope.js

@@ -0,0 +1,44 @@
+/* global hexo */
+
+'use strict';
+
+const pageInScope = (page, scope) => {
+  switch (scope) {
+    case 'home':
+      return Boolean(page.__index);
+    case 'post':
+      return Boolean(page.__post);
+    case 'archives' || 'archive':
+      return Boolean(page.archive);
+    case 'categories' || 'category':
+      return page.layout === 'categories' || page.layout === 'category';
+    case 'tags' || 'tag':
+      return page.layout === 'tags' || page.layout === 'tag';
+    case 'about':
+      return page.layout === 'about';
+    case 'links' || 'link':
+      return page.layout === 'links';
+    case '404':
+      return page.layout === '404';
+    case 'page' || 'custom':
+      return Boolean(page.__page);
+  }
+};
+
+hexo.extend.helper.register('in_scope', function(scope) {
+  if (!scope || scope.length === 0) {
+    return true;
+  }
+
+  if (Array.isArray(scope)) {
+    for (const each of scope) {
+      if (pageInScope(this.page, each)) {
+        return true;
+      }
+    }
+  } else {
+    return pageInScope(this.page, scope);
+  }
+
+  return false;
+});

package/scripts/helpers/utils.js

@@ -3,12 +3,27 @@
 'use strict';
 
 const crypto = require('crypto');
+const { decodeURL } = require('hexo-util');
 const compareVersions = require('../../scripts/utils/compare-versions');
 
 hexo.extend.helper.register('md5', function(string) {
   return crypto.createHash('md5').update(string).digest('hex');
 });
 
-hexo.extend.helper.register('compareVersions', function(ver1, ver2) {
-  return compareVersions(ver1, ver2);
+hexo.extend.helper.register('require_version', function(current, require) {
+  const verRe = current.match(/[@/](\d{1,2})\.?(\d{0,2})\.?(\d{0,2})/);
+  if (verRe && verRe.length >= 4) {
+    const ver = `${verRe[1]}.${verRe[2] || 'x'}.${verRe[3] || 'x'}`;
+    return compareVersions(ver, require) >= 0;
+  }
+  return false;
 });
+
+hexo.extend.helper.register('deduplicate', function(arr) {
+  if (!Array.isArray(arr)) {
+    return [];
+  }
+  return [...new Set(arr)];
+});
+
+hexo.extend.helper.register('decode_url', decodeURL);

package/scripts/tags/checkbox.js

@@ -7,17 +7,19 @@ const checkbox = (args) => {
   args = args.join(' ').split(',');
   const text = (args[0] || '').trim();
 
+  !text && hexo.log.warn('[Fluid] Checkbox text must be defined!');
+
   if (text === 'checked' || text === 'true' || text === 'false') {
     const checked = text === 'checked' || text === 'true';
     return `<input type="checkbox" disabled ${checked ? 'checked="checked"' : ''}>`;
   }
-  !text && hexo.log.warn('[Fluid] Checkbox text must be defined!');
 
   const checked = (args[1] || '').length > 0 && args[1].trim() !== 'false';
   const inline = (args[2] || '').length > 0 && args[2].trim() !== 'false';
+  const enabled = (args[3] || '').length > 0 && args[3].trim() === 'false';
 
   return `${!inline ? '<div>' : ''}
-            <input type="checkbox" disabled ${checked ? 'checked="checked"' : ''}>${text}
+            <input type="checkbox" ${enabled ? '' : 'disabled'} ${checked ? 'checked="checked"' : ''}>${text}
           ${!inline ? '</div>' : ''}`;
 
 };

package/scripts/utils/object.js

@@ -8,6 +8,10 @@ const isNotEmptyObject = (obj) => {
   return obj && typeof obj === 'object' && Object.getOwnPropertyNames(obj).length !== 0;
 };
 
+const isEmptyObject = (obj) => {
+  return !isNotEmptyObject(obj);
+};
+
 const merge = (target, ...sources) => {
   for (const source of sources) {
     for (const key in source) {
@@ -27,5 +31,6 @@ const merge = (target, ...sources) => {
 module.exports = {
   isObject,
   isNotEmptyObject,
+  isEmptyObject,
   merge
 };

package/scripts/utils/resolve.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const path = require('path');
+
+const resolveModule = (name, file = '') => {
+  let dir;
+  try {
+    dir = path.dirname(require.resolve(`${name}/package.json`));
+  } catch (error) {
+    return '';
+  }
+  return `${dir}/${file}`;
+};
+
+module.exports = resolveModule;

package/source/css/_pages/_archive/archive.styl

@@ -1,3 +1,31 @@
 .list-group
   a ~ p.h5
     margin-top 1rem
+
+.list-group-item
+  display flex
+  background-color transparent
+  border 0
+
+  time
+    flex 0 0 5rem
+
+  .list-group-item-title
+    white-space nowrap
+    overflow hidden
+    text-overflow ellipsis
+
+@media (max-width: 575px)
+  .list-group-item
+    font-size .95rem
+    padding 0.5rem 0.75rem
+
+    time
+      flex 0 0 4rem
+
+.list-group-item-action
+  color var(--text-color)
+
+  &:focus, &:hover
+    color var(--link-hover-color)
+    background-color var(--link-hover-bg-color)

package/source/css/_pages/_base/_widget/anchorjs.styl

@@ -0,0 +1,8 @@
+// Rewrite anchorjs
+.anchorjs-link
+  text-decoration none !important
+  transition opacity .2s ease-in-out
+
+.markdown-body h1, h2, h3, h4, h5, h6
+  &:hover > .anchorjs-link
+    opacity 1

package/source/css/_pages/_base/_widget/banner.styl

@@ -3,7 +3,6 @@
   position relative
   overflow hidden
   cursor default
-  overflow-wrap break-word
 
   .mask
     position absolute
@@ -11,23 +10,15 @@
     height 100%
     background-color rgba(0, 0, 0, 0.3)
 
-  .page-header
-    color #fff
-    max-width calc(960px - 6rem)
-    width 80%
-
-  @media (max-width: 575px)
-    .page-header, .page-header .iconfont
-      font-size 0.9rem
-
   &[parallax="true"]
     will-change transform
     -webkit-transform-style preserve-3d
     -webkit-backface-visibility hidden
+    transition transform .05s ease-out
 
 if $banner-width-height-ratio > 0
   @media (max-width: unit($banner-width-height-ratio * 100, "vh"))
-    header
+    .header-inner
       max-height unit(100 / $banner-width-height-ratio, "vw")
 
     #board

package/source/css/_pages/_base/_widget/board.styl

@@ -1,13 +1,10 @@
 #board
   position relative
   margin-top -2rem
+  padding 3rem 0
   background-color var(--board-bg-color)
   transition background-color .2s ease-in-out
   border-radius 0.5rem
   z-index 3
   -webkit-box-shadow 0 12px 15px 0 rgba(0, 0, 0, 0.24), 0 17px 50px 0 rgba(0, 0, 0, 0.19)
   box-shadow 0 12px 15px 0 rgba(0, 0, 0, 0.24), 0 17px 50px 0 rgba(0, 0, 0, 0.19)
-
-@media (max-width: 767px)
-  #board
-    overflow-x hidden

package/source/css/_pages/_base/_widget/code-widget.styl

@@ -0,0 +1,36 @@
+.code-widget
+  display inline-block
+  background-color transparent
+  font-size .75rem
+  line-height 1
+  font-weight bold
+  padding .3rem .1rem .1rem .1rem
+  position absolute
+  right .45rem
+  top .15rem
+  z-index 1
+
+.code-widget-light
+  color #999
+
+.code-widget-dark
+  color #bababa
+
+.copy-btn
+  cursor pointer
+  user-select none
+  -webkit-appearance none
+  outline none
+
+  & > i
+    font-size .75rem !important
+    font-weight 400
+    margin-right .15rem
+    opacity 0
+    transition opacity .2s ease-in-out
+
+.markdown-body pre:hover > .copy-btn > i
+  opacity 0.9
+
+.markdown-body pre:hover > .copy-btn, .markdown-body pre:not(:hover) > .copy-btn
+  outline none

package/source/css/_pages/_base/_widget/copyright.styl

@@ -0,0 +1,90 @@
+// Modified from [hexo-theme-icarus](https://github.com/ppoffice/hexo-theme-icarus)
+
+.license-box
+  background-color rgba(#1b1f23, .05)
+  transition background-color .2s ease-in-out
+  border-radius 4px
+  font-size .9rem
+  overflow hidden
+  padding 1.25rem
+  position relative
+  z-index 1
+
+  .license-icon
+    position absolute
+    top 50%
+    left 100%
+
+    &::after
+      content "\e8e4"
+      font-size 12.5rem
+      line-height 1
+      opacity 0.1
+      position relative
+      left -.85em
+      bottom .5em
+      z-index -1
+
+  .license-title
+    margin-bottom 1rem
+
+    div:nth-child(1)
+      line-height 1.2
+      margin-bottom .25rem
+
+    div:nth-child(2)
+      color var(--sec-text-color)
+      font-size .8rem
+
+  .license-meta
+    align-items center
+    display flex
+    flex-wrap wrap
+    justify-content flex-start
+
+    .license-meta-item
+      align-items center
+      justify-content center
+      margin-right 1.5rem
+
+      div:nth-child(1)
+        color var(--sec-text-color)
+        font-size .8rem
+        font-weight normal
+
+      i.iconfont
+        font-size 1rem
+
+  @media (max-width: 575px) and (min-width: 425px)
+    .license-meta
+
+      .license-meta-item
+        display flex
+        justify-content flex-start
+        flex-wrap wrap
+        font-size .8rem
+        flex 0 0 50%
+        max-width 50%
+        margin-right 0
+
+        div:nth-child(1)
+          margin-right .5rem
+
+      .license-meta-date
+        order -1
+
+  @media (max-width: 424px)
+    &::after
+      top -65px
+
+    .license-meta
+      flex-direction column
+      align-items flex-start
+
+      .license-meta-item
+        display flex
+        flex-wrap wrap
+        font-size .8rem
+
+        div:nth-child(1)
+          margin-right .5rem

package/source/css/_pages/_base/_widget/footer.styl

@@ -1,4 +1,7 @@
-footer
+.footer-inner
+  padding 3rem 0 1rem 0
+  text-align center
+
   & > div:not(:first-child)
     margin .25rem 0
     font-size .85rem