Merge pull request #363 from everfu/dev

Dev

layout/includes/console.pug

@@ -66,4 +66,4 @@ div#console
             div.console-btn-item.on#consoleCommentBarrage(onclick="sco.switchCommentBarrage()")
                 span.commentBarrage
                     i.solitude.fa-solid.fa-comment
-    div.console-mask(onclick="sco.hideConsole()")
+    div.console-mask(onclick="sco.hideConsole()")

layout/includes/footer.pug

@@ -1,3 +1,5 @@
+- var { information , group } = theme.footer
+
 if theme.post.footer.enable && is_post()
     div#st-footer-bar
         div.footer-logo
@@ -11,24 +13,23 @@ if theme.post.footer.enable && is_post()
         if theme.post.footer.button.enable
             a.footer-bar-link(href=url_for(theme.post.footer.button.url))= theme.post.footer.button.name
 div#footer_deal
-    - var leftInfo = theme.footer && theme.footer.information && theme.footer.information.left || {}
-    - var rightInfo = theme.footer && theme.footer.information && theme.footer.information.right || {}
+    - var leftInfo = information.left
+    - var rightInfo = information.right
 
     each value, label in leftInfo
         - var array = value.split('||')
         a.deal_link(href=url_for(trim(array[0])), title=label)
             i.solitude(class=array[1])
 
-    if theme.footer.information.author
+    if information.author
         div#footer_mini_logo.nolazyload.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()")
-            img(src=theme.site.icon, alt=_p('nav.backtop'))
+            img(src=information.author, alt=_p('nav.backtop'))
 
     each value, label in rightInfo
         - var array = value.split('||')
         a.deal_link(href=url_for(trim(array[0])), title=label)
             i.solitude(class=array[1])
 div#st-footer
-    - var group = theme.footer && theme.footer.group ? theme.footer.group : {}
 
     each value, x in group
         div.footer-group
@@ -57,17 +58,10 @@ div#footer-bar
             each item in theme.footer.links
                 a.footer-bar-link(href=url_for(item.url), alt=item.name)!= item.name
             if theme.footer.license
-                a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright')
+                a.footer-bar-link.cc(href=url_for(theme.footer.license))
                     i.solitude.fa-solid.fa-copyright
                     i.solitude.fa-brands.fa-creative-commons-by
                     i.solitude.fa-brands.fa-creative-commons-nc
                     i.solitude.fa-brands.fa-creative-commons-nd
-if theme.footer.privacy
-    div.needEndHide#cookies-window
-        div.cookies-window-title= __('cookies.title')
-        div.cookies-window-content
-            span.cookies-tip= __('cookies.tip')
-            a.cookies-link(href=url_for(theme.footer.privacy), title=_p('cookies.privacy'))
-                i.solitude.fa-solid.fa-circle-chevron-right
 if theme.comment.use && theme.comment.commentBarrage
-    div.comment-barrage.needEndHide
+    div.comment-barrage.needEndHide

layout/includes/head.pug

@@ -17,7 +17,7 @@ meta(name="viewport" content="width=device-width, initial-scale=1")
 
 title= title + subtitle
 noscript= _p('head.noscript')
-link(rel="icon", href=url_for(theme.site.siteIcon))
+link(rel="icon", href=url_for(theme.site.icon))
 
 // index.css
 link(rel="stylesheet", href=url_for(theme.cdn.main_css))
@@ -29,4 +29,4 @@ include ./inject/head.pug
 include ./head/config.pug
 
 // page-config head
-include ./head/page_config
+include ./head/page_config

layout/includes/head/opengraph.pug

@@ -1,6 +1,6 @@
 if theme.OpenGraph.enable
     -
-        const coverVal = page.cover || theme.site.siteIcon
+        const coverVal = page.cover || theme.site.icon
         let ogOption = {
             type: is_post() ? 'article' : 'website',
             image: coverVal ? full_url_for(coverVal) : '',
@@ -10,4 +10,4 @@ if theme.OpenGraph.enable
     != open_graph(ogOption)
     meta(name="description" content=page_description())
 else
-    meta(name="description" content=page_description())
+    meta(name="description" content=page_description())

layout/includes/head/pwa.pug

@@ -18,5 +18,5 @@ else
     meta(name="apple-mobile-web-app-capable", content=config.title)
     meta(name="theme-color", content="var(--efu-main)")
     meta(name="apple-mobile-web-app-status-bar-style", content="var(--efu-main)")
-    link(rel="bookmark", href=url_for(theme.site.siteIcon))
-    link(rel="apple-touch-icon", href=url_for(theme.site.siteIcon), sizes="180x180")
+    link(rel="bookmark", href=url_for(theme.site.icon))
+    link(rel="apple-touch-icon", href=url_for(theme.site.icon), sizes="180x180")

layout/includes/layout.pug

@@ -55,4 +55,4 @@ html(lang=config.language, data-theme="light")
 
         // music
         if theme.capsule.enable
-            include ./widgets/third-party/music.pug
+            include ./widgets/third-party/music.pug

layout/includes/loading.pug

@@ -9,14 +9,16 @@ script.
             if (!preloader.isLoaded) {
                 document.getElementById('loading-box').classList.add('loaded');
                 preloader.isLoaded = true;
+                preloader.togglePaceDone();
             }
         },
         initLoading: () => {
             document.getElementById('loading-box').classList.remove('loaded');
             preloader.isLoaded = false;
+            preloader.togglePaceDone();
         },
-        removePaceDone: () => {
-            document.getElementById('body').classList = 'pace-done';
+        togglePaceDone: () => {
+            document.getElementById('body').className = preloader.isLoaded ? 'pace-done' : '';
         }
     }
 

layout/includes/page/categories.pug

@@ -6,4 +6,4 @@ h1.page-title= _p('page.category')
                 span.tags-punctuation
                     i.solitude.fa-solid.fa-hashtag
                     = item.name
-                    span.tagsPageCount= item.length
+                    span.tagsPageCount= item.length

layout/includes/page/tags.pug

@@ -6,4 +6,4 @@ h1.page-title= __('page.tag')
                 span.tags-punctuation
                     i.solitude.fa-solid.fa-hashtag
                     = tag.name
-                    span.tagsPageCount= tag.length
+                    span.tagsPageCount= tag.length

layout/includes/widgets/third-party/pjax.pug

@@ -36,4 +36,4 @@ script.
         if (e.request.status === 404) {
             pjax.loadUrl('/404.html')
         }
-    })
+    })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {
@@ -28,8 +28,5 @@
   },
   "homepage": "https://everfu.github.io/Solitude/",
   "author": "Hexo-Theme-Solitude<o@everfu.org>",
-  "license": "MIT",
-  "devDependencies": {
-    "@types/node": "^22.0.0"
-  }
+  "license": "MIT"
 }

plugins.yml

@@ -13,7 +13,7 @@ pjax:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.6.38
+  version: 1.6.39
 waline_js:
   name: '@waline/client'
   file: dist/waline.js

scripts/filter/default.js

@@ -28,4 +28,4 @@ function getRandomInt(min, max) {
     min = Math.ceil(min);
     max = Math.floor(max);
     return Math.floor(Math.random() * (max - min)) + min;
-}
+}

scripts/helper/getArchiveLength.js

@@ -11,4 +11,4 @@ hexo.extend.helper.register('getArchiveLength', function (type) {
         archive[postdate] = (archive[postdate] || 0) + 1;
     }
     return archive;
-});
+});

source/css/_comments/twikoo.styl

@@ -408,6 +408,9 @@ button.el-button.tk-cancel.el-button--default.el-button--small
   border-radius 8px !important
   color var(--efu-fontcolor) !important
 
+.tk-replies .tk-content span:first-child
+  font-size inherit
+  color black
 
 .OwO
   &.OwO-open

source/css/_layout/footer.styl

@@ -230,49 +230,3 @@
 
     > div > div.footer-bar-left > span
       margin-right 1rem
-
-  #cookies-window
-    min-width 300px
-    background var(--efu-maskbgdeep)
-    color var(--efu-fontcolor)
-    padding 8px 16px
-    display flex
-    flex-direction column
-    bottom 20px
-    right 20px
-    position fixed
-    border-radius 12px
-    transition .3s
-    z-index 8
-    user-select none
-    backdrop-filter saturate(180%) blur(20px)
-    transform translateZ(0)
-    border var(--style-border)
-    animation barrageIn .6s cubic-bezier(.42, 0, .3, 1.11)
-
-    +maxWidth1300()
-      display none
-
-    &.cw-hide
-      opacity 0
-      animation barrageOut .6s cubic-bezier(.42, 0, .3, 1.11)
-      z-index -1
-
-    .cookies-window-title
-      padding-bottom 4px
-      border-bottom var(--style-border)
-      font-size 12px
-      font-weight 700
-
-    .cookies-window-content
-      font-size 14px
-      display flex
-      justify-content space-around
-      align-items center
-
-      .cookies-link
-        margin-left: 10px
-        font-size: 16px
-
-        i.solitude
-          font-size 16px

source/css/_layout/sidebar.styl

@@ -176,13 +176,17 @@
       margin-bottom 60px
 
       a
-        color var(--efu-fontcolor) !important
+        color var(--efu-fontcolor)
         padding 2px 8px 2px 12px
         border-radius 8px
         border var(--style-border-always)
         background var(--efu-card-bg)
         font-size 14px !important
 
+        &:hover
+          background var(--efu-main)
+          color var(--efu-white)
+
         sup
           opacity .6
           margin-left 4px
@@ -200,6 +204,12 @@
 
       span.darkmode_switchbutton
         padding 4px 8px
+        cursor pointer
+        transition all .5s ease 0s
+
+        &:hover
+          background var(--efu-main)
+          color var(--efu-white)
 
         [data-theme="dark"] &
           background var(--efu-orange)
@@ -237,4 +247,4 @@
       color var(--efu-fontcolor)
 
   #toggle-sidebar
-    bottom 80px
+    bottom 80px

source/css/_page/_home/home-top.styl

@@ -90,6 +90,7 @@
       transition .3s
       position relative
       box-shadow var(--efu-shadow-border)
+      min-width fit-content
 
       &:nth-last-child(2):nth-child(1),
       &:nth-last-child(1):nth-child(2)

source/css/_page/recentcomment.styl

@@ -9,6 +9,7 @@ div.console_recentcomments
 .comment-card
   position relative
   width calc(100% / 3 - 8px)
+  min-width fit-content
   background var(--efu-card-bg)
   border-radius 12px
   border var(--style-border-always)
@@ -85,4 +86,4 @@ span.comment-user
 time.comment-time
   font-size 12px
   color var(--efu-secondtext)
-  margin-left auto
+  margin-left auto

source/js/main.js

@@ -134,15 +134,6 @@ const sco = {
   lastSayHello: "",
   wasPageHidden: false,
   musicPlaying: false,
-  hideCookie() {
-    const cookiesWindow = document.getElementById("cookies-window");
-    if (cookiesWindow) {
-      setTimeout(() => {
-        cookiesWindow.classList.add("cw-hide");
-        setTimeout(() => cookiesWindow.style.display = "none", 1000);
-      }, 3000);
-    }
-  },
   scrollTo(elementId) {
     const targetElement = document.getElementById(elementId);
     if (targetElement) {
@@ -673,7 +664,7 @@ window.refreshFn = () => {
   document.body.setAttribute('data-type', page);
   sco.changeTimeFormat(document.querySelectorAll(timeSelector));
   runtime && sco.addRuntime();
-  [scrollFn, sidebarFn, sco.hideCookie, sco.addPhotoFigcaption, sco.setTimeState, sco.tagPageActive, sco.categoriesBarActive, sco.listenToPageInputPress, sco.addNavBackgroundInit, sco.refreshWaterFall].forEach(fn => fn());
+  [scrollFn, sidebarFn, sco.addPhotoFigcaption, sco.setTimeState, sco.tagPageActive, sco.categoriesBarActive, sco.listenToPageInputPress, sco.addNavBackgroundInit, sco.refreshWaterFall].forEach(fn => fn());
   lazyload.enable && utils.lazyloadImg();
   lightbox && utils.lightbox(document.querySelectorAll("#article-container img:not(.flink-avatar,.gallery-group img)"));
   randomlink && randomLinksList();