hexo-theme-shokax 0.0.4-alpha3 → 0.0.4-alpha4

package/layout/_partials/footer.pug

@@ -2,6 +2,7 @@ div(class="status")
     div(class="copyright")
         - var copyright_year = date(null, 'YYYY')
         if theme.footer.since && theme.footer.since != copyright_year
+            != `© ${theme.footer.since} -`
         span(itemprop="copyrightYear")
             != copyright_year
         span(class="with-love")
@@ -35,6 +36,7 @@ div(class="status")
                 a(target="_blank" href=`https://www.beian.gov.cn/portal/registerSystemInfo?recordcode=${RC}`)
                     img(src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;")
                     != beianN
+    != shokax_inject('status')
 
 != shokax_inject('footer')
 

package/layout/_partials/head/head.pug

@@ -2,7 +2,7 @@
 - var yandexValid = theme?.seo?.yandex,baiduValid = theme?.seo?.baidu
 - var siteTitle = config.title,noBaiduT = theme?.seo?.disable_baidu_transformation
 - var feedLink = full_url_for("/feed.json")
-- var twikooLink = theme?.twikoo?.link;var jsInjects = theme?.inject?.head?.js,cssInjects = theme?.inject?.head?.css
+- var tk= theme?.twikoo?.enable;var jsInjects = theme?.inject?.head?.js,cssInjects = theme?.inject?.head?.css
 - var wl = theme.waline.enable,gt=theme?.gitalk?.enable
 meta(charset="UTF-8")
 meta(name="viewport" content="width=device-width,initial-scale=1,maximum-scale=2")
@@ -40,9 +40,9 @@ if debugVue
 else
     script(src="https://cdn.staticfile.org/vue/3.2.45/vue.global.prod.js")
 include pwa.pug
-if twikooLink
+if tk
     != _css("twikoo.css")
-    script(src=twikooLink)
+    script(src=theme.twikoo.link)
 else if wl
     link(rel="stylesheet" href="https://unpkg.com/@waline/client@v2/dist/waline.css")
 else if gt

package/layout/_partials/layout.pug

@@ -135,7 +135,10 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         != _js('app.js')
         != partial('_partials/third-party/baidu-analytics.pug', {}, {cache: true})
         != partial('_partials/third-party/clarity.pug', {}, {cache: true})
-        != _new_comments('twikoo')
+        if theme.twikoo.enable
+            != _new_comments('twikoo')
+        else if theme.waline.enable
+            != _new_comments('waline')
 
         != shokax_inject('bodyEnd')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-shokax",
-  "version": "0.0.4-alpha3",
+  "version": "0.0.4-alpha4",
   "description": "a hexo theme based on shoka",
   "main": "index.js",
   "repository": "https://github.com/zkz098/hexo-theme-shokaX",
@@ -13,19 +13,19 @@
     "@types/animejs": "^3.1.6",
     "@types/fancybox": "^3.5.3",
     "@types/hexo": "^3.8.8",
-    "@types/jquery": "^3.5.14",
+    "@types/jquery": "^3.5.16",
     "@types/js-yaml": "^4.0.5",
     "@types/lozad": "^1.16.1",
     "@types/node": "^18.11.18",
     "@types/shelljs": "^0.8.11",
-    "@typescript-eslint/eslint-plugin": "^5.47.1",
-    "@typescript-eslint/parser": "^5.47.1",
-    "eslint": "^8.30.0",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "eslint": "^8.32.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.6.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-vue": "^9.8.0",
+    "eslint-plugin-vue": "^9.9.0",
     "typescript": "^4.9.4",
     "vue": "^3.2.45"
   },

package/scripts/plugin/lib/injects-point.js

@@ -9,7 +9,8 @@ module.exports = {
     'postBodyEnd',
     'footer',
     'bodyEnd',
-    'comment'
+    'comment',
+    'status'
   ],
   styles: [
     'variable',

package/source/css/_common/scaffolding/base.styl

@@ -129,15 +129,15 @@ dd {
 input, textarea {
   color: var(--text-color);
 }
-//@font-face {
-//  font-family: 'ic';
-//  src: url('//at.alicdn.com/t/font_' + $iconfont + '.eot');
-//  src: url('//at.alicdn.com/t/font_' + $iconfont + '.eot?#iefix') format('embedded-opentype'),
-//  url('//at.alicdn.com/t/font_' + $iconfont + '.woff2') format('woff2'),
-//  url('//at.alicdn.com/t/font_' + $iconfont + '.woff') format('woff'),
-//  url('//at.alicdn.com/t/font_' + $iconfont + '.ttf') format('truetype'),
-//  url('//at.alicdn.com/t/font_' + $iconfont + '.svg#ic') format('svg');
-//}
+@font-face {
+  font-family: 'ic';
+  src: url('//at.alicdn.com/t/font_' + $iconfont + '.eot');
+  src: url('//at.alicdn.com/t/font_' + $iconfont + '.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_' + $iconfont + '.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_' + $iconfont + '.woff') format('woff'),
+  url('//at.alicdn.com/t/font_' + $iconfont + '.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_' + $iconfont + '.svg#ic') format('svg');
+}
 
 @font-face {
     font-family: 'jetbrains-mono';

package/source/css/_common/scaffolding/iconfont.styl

@@ -1,161 +1,161 @@
 .i-volume-off:before {
-  content: "\e61e";
+  content: "\f026";
 }
 
 .i-volume-on:before {
-  content: "\e62c";
+  content: "\f6a9";
 }
 
 .i-circle-play:before {
-  content: "\e647";
+  content: "\f144";
 }
 
 .i-forward:before {
-  content: "\e648";
+  content: "\f050";
 }
 
 .i-backward:before {
-  content: "\e649";
+  content: "\f04a";
 }
 
 .i-circle-pause:before {
-  content: "\e64a";
+  content: "\f28b";
 }
 
 .i-loop:before {
-  content: "\e64b";
+  content: "\f144";
 }
 
 .i-order:before {
-  content: "\e64c";
+  content: "\f0dc";
 }
 
 .i-random:before {
-  content: "\e64d";
+  content: "\f074";
 }
 
 .i-douban:before {
-  content: "\e75f";
+  content: "\f05e";
 }
 
 .i-linux:before {
-  content: "\f1e8";
+  content: "\f17c";
 }
 
 .i-opera:before {
-  content: "\f205";
+  content: "\f26a";
 }
 
 .i-qq:before {
-  content: "\f216";
+  content: "\f1d6";
 }
 
 .i-safari:before {
-  content: "\f229";
+  content: "\f267";
 }
 
 .i-snapchat-ghost:before {
-  content: "\f234";
+  content: "\f2ab";
 }
 
 .i-weixin:before {
-  content: "\f262";
+  content: "\f1d7";
 }
 
 .i-windows:before {
-  content: "\f266";
+  content: "\f17a";
 }
 
 .i-stars:before {
-  content: "\e8c4";
+  content: "\f762";
 }
 
 .i-apple:before {
-  content: "\e600";
+  content: "\f179";
 }
 
 .i-blackberry:before {
-  content: "\e601";
+  content: "\f37b";
 }
 
 .i-centos:before {
-  content: "\e602";
+  content: "\f789";
 }
 
 .i-fedora:before {
-  content: "\e603";
+  content: "\f798";
 }
 
 .i-redhat:before {
-  content: "\e604";
+  content: "\f7bc";
 }
 
 .i-ubuntu:before {
-  content: "\e605";
+  content: "\f7df";
 }
 
 .i-suse:before {
-  content: "\e606";
+  content: "\f7d6";
 }
 
 .i-mobile-alt:before {
-  content: "\f052";
+  content: "\f3cd";
 }
 
 .i-paw:before {
-  content: "\f06b";
+  content: "\f1b0";
 }
 
 .i-android:before {
-  content: "\f161";
+  content: "\f17b";
 }
 
 .i-chrome:before {
-  content: "\f178";
+  content: "\f268";
 }
 
 .i-edge:before {
-  content: "\f195";
+  content: "\f282";
 }
 
 .i-firefox:before {
-  content: "\f1a1";
+  content: "\f269";
 }
 
 .i-internet-explorer:before {
-  content: "\f1d4";
+  content: "\f26b";
 }
 
 .i-markdown:before {
-  content: "\f1eb";
+  content: "\f60f";
 }
 
 .i-smile:before {
-  content: "\f2a5";
+  content: "\f118";
 }
 
 .i-preview:before {
-  content: "\e901";
+  content: "\f4d5";
 }
 
 .i-share:before {
-  content: "\e61b";
+  content: "\f064";
 }
 
 .i-link-circle:before {
-  content: "\e67b";
+  content: "\f0c1";
 }
 
 .i-person:before {
-  content: "\e69d";
+  content: "\f2bd";
 }
 
 .i-sun:before {
-  content: "\e6d1";
+  content: "\f766";
 }
 
 .i-moon:before {
-  content: "\e71e";
+  content: "\f755";
 }
 
 .i-compress:before {
@@ -207,7 +207,7 @@
 }
 
 .i-music:before {
-  content: "\f059";
+  content: "\f001";
 }
 
 .i-pause:before {
@@ -219,7 +219,7 @@
 }
 
 .i-play:before {
-  content: "\f07f";
+  content: "\f04b";
 }
 
 .i-calendar-check:before {
@@ -255,7 +255,7 @@
 }
 
 .i-star:before {
-  content: "\f0d4";
+  content: "\f005";
 }
 
 .i-link-alt:before {
@@ -283,7 +283,7 @@
 }
 
 .i-home:before {
-  content: "\e8ed";
+  content: "\f015";
 }
 
 .i-magic:before {
@@ -291,7 +291,7 @@
 }
 
 .i-sakura:before {
-  content: "\e695";
+  content: "\f7ff";
 }
 
 .i-tag:before {
@@ -299,19 +299,19 @@
 }
 
 .i-angle-left:before {
-  content: "\ef19";
+  content: "\f104";
 }
 
 .i-arrow-circle-right:before {
-  content: "\ef23";
+  content: "\f0a9";
 }
 
 .i-check-circle:before {
-  content: "\ef66";
+  content: "\f058";
 }
 
 .i-exclamation-circle:before {
-  content: "\efb5";
+  content: "\f06a";
 }
 
 .i-info-circle:before {
@@ -319,11 +319,11 @@
 }
 
 .i-minus-circle:before {
-  content: "\f050";
+  content: "\f056";
 }
 
 .i-plus-circle:before {
-  content: "\f082";
+  content: "\f055";
 }
 
 .i-file-word:before {
@@ -331,15 +331,15 @@
 }
 
 .i-check:before {
-  content: "\ef65";
+  content: "\f00c";
 }
 
 .i-times:before {
-  content: "\f109";
+  content: "\e29e";
 }
 
 .i-list-ol:before {
-  content: "\f039";
+  content: "\f0cb";
 }
 
 .i-archive:before {
@@ -347,15 +347,15 @@
 }
 
 .i-angle-right:before {
-  content: "\ef1f";
+  content: "\f105";
 }
 
 .i-arrow-down:before {
-  content: "\ef25";
+  content: "\f063";
 }
 
 .i-arrow-up:before {
-  content: "\ef2a";
+  content: "\f062";
 }
 
 .i-chart-area:before {
@@ -387,7 +387,7 @@
 }
 
 .i-heartbeat:before {
-  content: "\f017";
+  content: "\f21e";
 }
 
 .i-search:before {
@@ -395,7 +395,7 @@
 }
 
 .i-sitemap:before {
-  content: "\f0bd";
+  content: "\f0e8";
 }
 
 .i-tags:before {
@@ -411,7 +411,7 @@
 }
 
 .i-times-circle:before {
-  content: "\f10a";
+  content: "\f057";
 }
 
 .i-creative-commons:before {

package/source/css/app.styl

@@ -13,10 +13,10 @@ if $colors = hexo-config('style.colors')
 else
   @import "_colors";
 
-//if $_iconfont = hexo-config('style.iconfont')
-//  @import $_iconfont;
-//else
-//  @import "_iconfont";
+if $_iconfont = hexo-config('style.iconfont')
+  @import $_iconfont;
+else
+  @import "_iconfont";
 
 // Scaffolding
 @import "_common/scaffolding";

package/source/js/_app/library.js

@@ -163,12 +163,12 @@ const getScript = function (url, callback, condition) {
 };
 const assetUrl = function (asset, type) {
     const str = CONFIG[asset][type];
-    if (str.indexOf('npm') > -1) {
-        return `https://unpkg.com/${str}`;
-    }
     if (str.indexOf('gh') > -1 || str.indexOf('combine') > -1) {
         return `https://cdn.jsdelivr.net/${str}`;
     }
+    if (str.indexOf('npm') > -1) {
+        return `https://unpkg.com/${str}`;
+    }
     if (str.indexOf('http') > -1) {
         return str;
     }