hexo-theme-shokax 0.0.4-alpha → 0.0.4-alpha3

package/layout/_partials/footer.pug

@@ -5,7 +5,7 @@ div(class="status")
         span(itemprop="copyrightYear")
             != copyright_year
         span(class="with-love")
-            i(class=`ic i-${ theme.footer.icon.name }`)
+            i(class=`fa fa-solid fa-${ theme.footer.icon.name }`)
         span(class="author" itemprop="copyrightHolder")
             != `${author} @ ${ alternate?alternate:title}`
     if theme.footer.count

package/layout/_partials/sidebar/menu.pug

@@ -3,7 +3,7 @@ mixin item(name, path, parent, dropdown, sublist)
     - var path = path.split('||')
     - var itemURL = path[0].trim()
     - if (!itemURL.startsWith('http')){ itemURL = itemURL.replace('//', '/') }
-    - var menuIcon = '<i class="ic i-' + trimn(path[1]) + '"></i>'
+    - var menuIcon = '<i class="fa fa-solid fa-' + trimn(path[1]) + '"></i>'
     - var menuText = __('menu.' + name).replace('menu.', '')
     if parent
         li(class="item dropdown")
@@ -21,7 +21,7 @@ mixin item(name, path, parent, dropdown, sublist)
                         - var menuText = __('menu.' + subname).replace('menu.', '')
                         if subname == 'default'
                             - var menuText = __('menu.' + name).replace('menu.', '')
-                        - var menuIcon = '<i class="ic i-' + trimn(path[1]) + '"></i>'
+                        - var menuIcon = '<i class="fa fa-solid fa-' + trimn(path[1]) + '"></i>'
                         li(class="item")
                             != _url(itemURL, menuIcon + menuText, {rel: 'section'})
     else

package/layout/_partials/sidebar/overview.pug

@@ -32,7 +32,7 @@ nav(class="state")
 div(class="social")
     each link, name  in theme.social
         - var sidebarURL = link.split('||')[0].trim()
-        - var sidebarIcon = '<i class="ic i-' + link.split('||')[1].trim() + '"></i>'
+        - var sidebarIcon = '<i class="fa fa-brands fa-' + link.split('||')[1].trim() + '"></i>'
         != _url(sidebarURL, sidebarIcon, {title: sidebarURL, class: 'item ' + name})
 
 != shokax_inject('sidebar')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-shokax",
-  "version": "0.0.4-alpha",
+  "version": "0.0.4-alpha3",
   "description": "a hexo theme based on shoka",
   "main": "index.js",
   "repository": "https://github.com/zkz098/hexo-theme-shokaX",

package/source/css/_common/components/highlight/highlight.styl

@@ -243,7 +243,7 @@ code,
       background: var(--grey-2);
     }
 
-    .ic {
+    .fa {
       margin-top: 1rem;
       @extend .up-down;
     }
@@ -256,7 +256,7 @@ code,
         display: none;
       }
 
-      .ic {
+      .fa {
         @extend .down-up;
       }
     }

package/source/css/_common/components/pages/home.styl

@@ -69,7 +69,7 @@ $item {
     font-size: $font-size-smaller;
     color: var(--grey-5);
 
-    .ic {
+    .fa {
       margin-right: .0625rem;
     }
 
@@ -208,7 +208,7 @@ $item {
     }
 
     .title {
-      .ic {
+      .fa {
         font-size: 80%;
       }
     }

package/source/css/_common/components/post/breadcrumb.styl

@@ -5,7 +5,7 @@
   margin: 1.25rem 0;
   flex-wrap: wrap;
 
-  .ic {
+  .fa {
     margin: 0 .125rem;
     color: var(--grey-4);
 

package/source/css/_common/components/post/post.styl

@@ -6,7 +6,7 @@
   font-family: $font-family-posts;
   word-wrap();
 
-  .exturl .ic {
+  .exturl .fa {
     font-size: $font-size-small;
     margin-left: .25rem;
   }

package/source/css/_common/components/tags/links.styl

@@ -39,7 +39,7 @@
       font-weight: bold;
       color: var(--bg-color);
       border: none;
-      .ic {
+      .fa {
         display: none;
       }
     }

package/source/css/_common/components/third-party/valine.styl

@@ -186,12 +186,11 @@
       margin: .5rem;
       overflow: hidden;
       vertical-align: middle;
-
-      &.actived .ic {
+      &.actived .fa {
         color: var(--primary-color);
       }
 
-      .ic {
+      .fa {
         color: var(--grey-6);
         transition: all .25s ease;
 

package/source/css/_common/outline/header/menu.styl

@@ -22,7 +22,7 @@
       }
     }
 
-    .ic {
+    .fa {
       margin-right: .5rem;
     }
 

package/source/css/_common/outline/sidebar/menu.styl

@@ -32,7 +32,7 @@
       }
     }
 
-    .ic {
+    .fa {
       margin-right: .625rem;
     }
 

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';
@@ -146,19 +146,6 @@ input, textarea {
 }
 
 // TODO
-.ic {
-  font-family: "ic" !important;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  width: 1.25em;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  text-rendering: auto;
-  line-height: 1;
-}
-
 .fa {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -172,20 +159,12 @@ input, textarea {
 }
 
 // TODO
-.ic em {
-  font-size: 0;
-}
 
 .fa em {
   font-size: 0;
 }
 
 // TODO
-.ic-lg {
-  font-size: 1.33333em;
-  line-height: .75em;
-  vertical-align: -.0667em;
-}
 
 .fa-lg {
   font-size: 1.33333em;

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

@@ -41,7 +41,7 @@
     cursor: not-allowed
   }
 
-  .ic {
+  .fa {
     text-align: left;
     width: (18em / 14);
   }

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/global.js

@@ -25,16 +25,16 @@ let LOCAL_HASH = 0;
 let LOCAL_URL = window.location.href;
 let pjax;
 const changeTheme = function (type) {
-    const btn = $dom('.theme .ic');
+    const btn = $dom('.theme .fa');
     if (type === 'dark') {
         HTML.attr('data-theme', type);
-        btn.removeClass('i-sun');
-        btn.addClass('i-moon');
+        btn.removeClass('fa-sunrise');
+        btn.addClass('fa-moon-stars');
     }
     else {
         HTML.attr('data-theme', null);
-        btn.removeClass('i-moon');
-        btn.addClass('i-sun');
+        btn.removeClass('fa-moon-stars');
+        btn.addClass('fa-sunrise');
     }
 };
 const autoDarkmode = function () {

package/source/js/_app/library.js

@@ -288,18 +288,6 @@ const pjaxScript = function (element) {
     }
     parent.appendChild(script);
 };
-const pageScrollOld = function (target, offset, complete) {
-    const opt = {
-        targets: typeof offset === 'number' ? target.parentNode : document.scrollingElement,
-        duration: 500,
-        easing: 'easeInOutQuad',
-        scrollTop: offset || (typeof target === 'number' ? target : (target ? target.top() + document.documentElement.scrollTop - siteNavHeight : 0)),
-        complete: function () {
-            complete && complete();
-        }
-    };
-    anime(opt);
-};
 const pageScroll = (target, offset, complete) => {
     const opt = {
         left: 0,

package/source/js/_app/page.js

@@ -175,7 +175,7 @@ const postBeauty = function () {
     $dom.each('figure.highlight', function (element) {
         const code_container = element.child('.code-container');
         const caption = element.child('figcaption');
-        element.insertAdjacentHTML('beforeend', '<div class="operation"><span class="breakline-btn"><i class="ic i-align-left"></i></span><span class="copy-btn"><i class="ic i-clipboard"></i></span><span class="fullscreen-btn"><i class="ic i-expand"></i></span></div>');
+        element.insertAdjacentHTML('beforeend', '<div class="operation"><span class="breakline-btn"><i class="fa fa-solid fa-align-left"></i></span><span class="copy-btn"><i class="fa fa-solid fa-clipboard"></i></span><span class="fullscreen-btn"><i class="fa fa-solid fa-expand"></i></span></div>');
         const copyBtn = element.child('.copy-btn');
         if (LOCAL.nocopy) {
             copyBtn.remove();
@@ -190,14 +190,14 @@ const postBeauty = function () {
                     comma = '\n';
                 });
                 clipBoard(code, function (result) {
-                    target.child('.ic').className = result ? 'ic i-check' : 'ic i-times';
+                    target.child('.fa').className = result ? 'fa fa-solid fa-check' : 'fa fa-solid fa-times';
                     target.blur();
                     showtip(LOCAL.copyright);
                 });
             }, { passive: true });
             copyBtn.addEventListener('mouseleave', function (event) {
                 setTimeout(function () {
-                    event.target.child('.ic').className = 'ic i-clipboard';
+                    event.target.child('.fa').className = 'fa fa-solid fa-clipboard';
                 }, 1000);
             });
         }
@@ -206,11 +206,11 @@ const postBeauty = function () {
             const target = event.currentTarget;
             if (element.hasClass('breakline')) {
                 element.removeClass('breakline');
-                target.child('.ic').className = 'ic i-align-left';
+                target.child('.fa').className = 'fa fa-solid fa-align-left';
             }
             else {
                 element.addClass('breakline');
-                target.child('.ic').className = 'ic i-align-justify';
+                target.child('.fa').className = 'fa fa-solid fa-align-justify';
             }
         });
         const fullscreenBtn = element.child('.fullscreen-btn');
@@ -218,7 +218,7 @@ const postBeauty = function () {
             element.removeClass('fullscreen');
             element.scrollTop = 0;
             BODY.removeClass('fullscreen');
-            fullscreenBtn.child('.ic').className = 'ic i-expand';
+            fullscreenBtn.child('.fa').className = 'fa fa-solid fa-expand';
         };
         const fullscreenHandle = function (event) {
             const target = event.currentTarget;
@@ -234,7 +234,7 @@ const postBeauty = function () {
             else {
                 element.addClass('fullscreen');
                 BODY.addClass('fullscreen');
-                fullscreenBtn.child('.ic').className = 'ic i-compress';
+                fullscreenBtn.child('.fa').className = 'fa fa-solid fa-compress';
                 if (code_container && code_container.find('tr').length > 15) {
                     const showBtn = code_container.child('.show-btn');
                     code_container.style.maxHeight = '';
@@ -246,7 +246,7 @@ const postBeauty = function () {
         caption && caption.addEventListener('click', fullscreenHandle);
         if (code_container && code_container.find('tr').length > 15) {
             code_container.style.maxHeight = '300px';
-            code_container.insertAdjacentHTML('beforeend', '<div class="show-btn"><i class="ic i-angle-down"></i></div>');
+            code_container.insertAdjacentHTML('beforeend', '<div class="show-btn"><i class="fa fa-solid fa-angle-down"></i></div>');
             const showBtn = code_container.child('.show-btn');
             const hideCode = function () {
                 code_container.style.maxHeight = '300px';
@@ -414,7 +414,7 @@ const algoliaSearch = function (pjax) {
     if (!siteSearch) {
         siteSearch = BODY.createChild('div', {
             id: 'search',
-            innerHTML: '<div class="inner"><div class="header"><span class="icon"><i class="ic i-search"></i></span><div class="search-input-container"></div><span class="close-btn"><i class="ic i-times-circle"></i></span></div><div class="results"><div class="inner"><div id="search-stats"></div><div id="search-hits"></div><div id="search-pagination"></div></div></div></div>'
+            innerHTML: '<div class="inner"><div class="header"><span class="icon"><i class="fa fa-solid fa-magnifying-glass"></i></span><div class="search-input-container"></div><span class="close-btn"><i class="fa fa-solid fa-times-circle"></i></span></div><div class="results"><div class="inner"><div id="search-stats"></div><div id="search-hits"></div><div id="search-pagination"></div></div></div></div>'
         });
     }
     const search = instantsearch({
@@ -459,7 +459,7 @@ const algoliaSearch = function (pjax) {
             container: '#search-hits',
             templates: {
                 item: function (data) {
-                    const cats = data.categories ? '<span>' + data.categories.join('<i class="ic i-angle-right"></i>') + '</span>' : '';
+                    const cats = data.categories ? '<span>' + data.categories.join('<i class="fa fa-solid fa-angle-right"></i>') + '</span>' : '';
                     return '<a href="' + CONFIG.root + data.path + '">' + cats + data._highlightResult.title.value + '</a>';
                 },
                 empty: function (data) {
@@ -478,10 +478,10 @@ const algoliaSearch = function (pjax) {
             showFirst: false,
             showLast: false,
             templates: {
-                first: '<i class="ic i-angle-double-left"></i>',
-                last: '<i class="ic i-angle-double-right"></i>',
-                previous: '<i class="ic i-angle-left"></i>',
-                next: '<i class="ic i-angle-right"></i>'
+                first: '<i class="fa fa=solid fa-angle-double-left"></i>',
+                last: '<i class="fa fa-solid fa-angle-double-right"></i>',
+                previous: '<i class="fa fa-solid fa-angle-left"></i>',
+                next: '<i class="fa fa-solid fa-angle-right"></i>'
             },
             cssClasses: {
                 root: 'pagination',
@@ -530,7 +530,7 @@ const domInit = function () {
     if (!toolBtn) {
         toolBtn = siteHeader.createChild('div', {
             id: 'tool',
-            innerHTML: '<div class="item player"></div><div class="item contents"><i class="ic i-list-ol"></i></div><div class="item chat"><i class="ic i-comments"></i></div><div class="item back-to-top"><i class="ic i-arrow-up"></i><span>0%</span></div>'
+            innerHTML: '<div class="item player"></div><div class="item contents"><i class="fa fa-solid fa-list-ol"></i></div><div class="item chat"><i class="fa fa-solid fa-comments"></i></div><div class="item back-to-top"><i class="fa fa-solid fa-arrow-up"></i><span>0%</span></div>'
         });
     }
     toolPlayer = toolBtn.child('.player');
@@ -618,6 +618,8 @@ const siteInit = function () {
     });
     siteRefresh(1);
 };
-window.addEventListener('DOMContentLoaded', siteInit);
+window.addEventListener('DOMContentLoaded', siteInit, {
+    passive: true
+});
 console.log('%c Theme.ShokaX v' + CONFIG.version + ' %c https://github.com/zkz098/hexo-theme-shokaX ', 'color: white; background: #e9546b; padding:5px 0;', 'padding:4px;border:1px solid #e9546b;');
 console.log('%c by kaitaku ' + '%c https://www.kaitaku.xyz', 'color: white; background: #00bfff; padding: 5px 3px;', 'padding: 4px;border:1px solid #00bfff');

package/source/js/_app/vue.js

@@ -5,7 +5,7 @@ Vue.createApp({
     methods: {
         changeThemeByBtn() {
             let c;
-            const btn = $dom('.theme').child('.ic');
+            const btn = $dom('.theme').child('.fa');
             const neko = BODY.createChild('div', {
                 id: 'neko',
                 innerHTML: '<div class="planet"><div class="sun"></div><div class="moon"></div></div><div class="body"><div class="face"><section class="eyes left"><span class="pupil"></span></section><section class="eyes right"><span class="pupil"></span></section><span class="nose"></span></div></div>'