feat(hexo): make favicon customizable and match files via paths in fr…

…ont matter defaults
ourai · Apr 12, 2024 · fad6d4a · fad6d4a
1 parent 5610e0f
commit fad6d4a
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 232 deletions.
diff --git a/.knosys/scripts/build.js b/.knosys/scripts/build.js
@@ -52,14 +52,13 @@ function copyHexoFiles() {
 
  copyThemeAssets(`${hexoDistRoot}/source`, true);
 
- const { devDependencies, ...pkgFields } = pick(require(`${prjRoot}/package.json`), ['version', 'description', 'repository', 'author', 'license', 'bugs', 'homepage', 'devDependencies']);
+ const pkgFields = pick(require(`${prjRoot}/package.json`), ['version', 'description', 'repository', 'author', 'license', 'bugs', 'homepage', 'dependencies']);
 
  saveData(`${hexoDistRoot}/package.json`, JSON.stringify({
  name: 'hexo-theme-lime',
  main: 'package.json',
  keywords: ['hexo', 'theme', 'lime', 'knosys', 'ksio'],
  ...pkgFields,
- dependencies: { '@ntks/toolbox': devDependencies['@ntks/toolbox'] },
  }, null, 2));
  copyMetaFiles('hexo');
 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,17 +1,9 @@
 {
  "name": "@ourai/lime",
- "version": "0.0.0-alpha.1",
+ "version": "0.0.0-alpha.2",
  "description": "Simple, readable, responsive theme for blogs, personal websites and API docs",
  "private": true,
  "main": "index.js",
- "scripts": {
- "copy": "node .knosys/scripts copy",
- "build": "node .knosys/scripts build",
- "clean": "rm -rf src/jekyll/.asset-cache",
- "start": "node .knosys/scripts serve",
- "predeploy": "npm run clean",
- "deploy": "node .knosys/scripts deploy"
- },
  "repository": {
  "type": "git",
  "url": "git+https://github.com/ourai/lime.git"
@@ -22,8 +14,18 @@
  "url": "https://github.com/ourai/lime/issues"
  },
  "homepage": "https://ourai.github.io/lime/",
+ "dependencies": {
+ "hexo-front-matter-defaults": "0.0.0"
+ },
  "devDependencies": {
- "@ntks/toolbox": "0.0.6",
  "ksio": "0.0.2"
+ },
+ "scripts": {
+ "copy": "node .knosys/scripts copy",
+ "build": "node .knosys/scripts build",
+ "clean": "rm -rf src/jekyll/.asset-cache",
+ "start": "node .knosys/scripts serve",
+ "predeploy": "npm run clean",
+ "deploy": "node .knosys/scripts deploy"
  }
 }
diff --git a/src/hexo/package-lock.json b/src/hexo/package-lock.json
diff --git a/src/hexo/package.json b/src/hexo/package.json
@@ -13,16 +13,10 @@
  },
  "dependencies": {
  "hexo": "^6.3.0",
- "hexo-generator-archive": "^2.0.0",
- "hexo-generator-category": "^2.0.0",
- "hexo-generator-index": "^3.0.0",
- "hexo-generator-tag": "^2.0.0",
  "hexo-renderer-coffeescript": "^0.2.0",
  "hexo-renderer-ejs": "^2.0.0",
  "hexo-renderer-marked": "^6.0.0",
  "hexo-renderer-sass": "^0.4.0",
- "hexo-renderer-stylus": "^2.1.0",
- "hexo-server": "^3.0.0",
- "hexo-theme-landscape": "^0.0.3"
+ "hexo-server": "^3.0.0"
  }
 }
diff --git a/src/hexo/themes/lime/layout/_ksio/layouts/base.ejs b/src/hexo/themes/lime/layout/_ksio/layouts/base.ejs
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="<%= config.language %>" dir="ltr">
+ <head>
+ <%- partial('_ksio/partials/head') %>
+ <%- css('stylesheets/global') %>
+ <% [].concat(page.ksio_asset_css || []).forEach(cssPath => { %><%- css(cssPath) %><% }) %>
+ <%- js('javascripts/ksio/vendors/jquery-1.11.3.min') %>
+ <%- js('javascripts/ksio/vendors/bootstrap.min') %>
+ </head>
+ <% const bodyClass = ['Page'] %>
+ <% if (page.ksio_slot_banner || page.banner) { %>
+ <% bodyClass.push('has-headerImage') %>
+ <% } %>
+ <body class="<%= bodyClass.join(' ') %>" itemscope itemtype="http:https://schema.org/WebPage">
+ <%- body %>
+ <script>$('.Article-content > table').addClass('table table-bordered')</script>
+ <% [].concat(page.ksio_asset_js || []).forEach(jsPath => { %><%- js(jsPath) %><% }) %>
+ </body>
+</html>
diff --git a/src/hexo/themes/lime/layout/_ksio/layouts/default.ejs b/src/hexo/themes/lime/layout/_ksio/layouts/default.ejs
@@ -1,19 +1 @@
-<!DOCTYPE html>
-<html lang="<%= config.language %>" dir="ltr">
- <head>
- <%- partial('_ksio/partials/head') %>
- <%- css('stylesheets/global') %>
- <% [].concat(page.ksio_asset_css || []).forEach(cssPath => { %><%- css(cssPath) %><% }) %>
- <%- js('javascripts/ksio/vendors/jquery-1.11.3.min') %>
- <%- js('javascripts/ksio/vendors/bootstrap.min') %>
- </head>
- <% const bodyClass = ['Page'] %>
- <% if (page.ksio_slot_banner || page.banner) { %>
- <% bodyClass.push('has-headerImage') %>
- <% } %>
- <body class="<%= bodyClass.join(' ') %>" itemscope itemtype="http:https://schema.org/WebPage">
- <%- body %>
- <script>$('.Article-content > table').addClass('table table-bordered')</script>
- <% [].concat(page.ksio_asset_js || []).forEach(jsPath => { %><%- js(jsPath) %><% }) %>
- </body>
-</html>
+<%- partial('_ksio/slots/content') %>
diff --git a/src/hexo/themes/lime/layout/_ksio/partials/meta/brand.ejs b/src/hexo/themes/lime/layout/_ksio/partials/meta/brand.ejs
@@ -1 +1,2 @@
-<%- favicon_tag('images/ksio/favicon.ico') %>
+<% if (theme.brand && theme.brand.color) { %><meta name="theme-color" content="<%= theme.brand.color %>"><% } %>
+<%- favicon_tag(theme.brand && theme.brand.icon || 'images/ksio/favicon.ico') %>
diff --git a/src/hexo/themes/lime/layout/layout.ejs b/src/hexo/themes/lime/layout/layout.ejs
@@ -1 +1 @@
-<%- partial('_ksio/layouts/default') %>
+<%- partial('_ksio/layouts/base') %>