hexo-theme-solitude 1.9.3 → 1.10.0

package/_config.yml

@@ -383,6 +383,14 @@ post:
     mode: local # local：本地取色 / api：img2color取色 : local: local color / api: img2color color
     api: https://api.qjqq.cn/api/Imgcolor?img= # api地址 / api address
     time: 43200000 # api取色间隔（毫秒），默认为12小时 / api color interval (milliseconds), default is 12 hours
+  # footer
+  footer:
+    enable: true
+    desc: 来自 Efu 的文章 # 介绍文字
+    button: # 跳转按钮
+      enable: true
+      name: 了解更多
+      url: /about/
 
 # -------------------------
 # 自定义主题

package/layout/includes/footer.pug

@@ -1,13 +1,15 @@
-div#st-footer-bar
-    div.footer-logo
-        if theme.site.name.class === 'i_class'
-            i.solitude(class=theme.site.name.custom)
-        else if theme.site.name.class === 'img'
-            img.solitude.nolazyload(src=url_for(theme.site.name.custom))
-        else if theme.site.name.class === 'text'
-            span= theme.site.name.custom
-    div.footer-bar-description= __('footer.description').replace(/\$\{title}/, config.title + " - " + config.subtitle)
-    a.footer-bar-link(href=url_for('/'))= __('footer.learnmore')
+if theme.post.footer.enable && is_post()
+    div#st-footer-bar
+        div.footer-logo
+            if theme.site.name.class === 'i_class'
+                i.solitude(class=theme.site.name.custom)
+            else if theme.site.name.class === 'img'
+                img.solitude.nolazyload(src=url_for(theme.site.name.custom))
+            else if theme.site.name.class === 'text'
+                span= theme.site.name.custom
+        div.footer-bar-description=theme.post.footer.desc
+        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 || {}
@@ -52,7 +54,6 @@ div#footer-bar
                 div.copyright © #{moment(theme.aside.siteinfo.runtime).year()} - #{new Date().getFullYear()} By 
                     a.footer-bar-link(href=url_for("/"))= config.author
         div.footer-bar-right
-            a.footer-bar-link(href="https://github.com/valor-x/hexo-theme-solitude" title=__('footer.theme'))= __('footer.theme')
             each item in theme.footer.links
                 a.footer-bar-link(href=url_for(item.url), alt=item.name)!= item.name
             a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright')

package/layout/includes/inject/head.pug

@@ -27,10 +27,10 @@ include ../head/pwa.pug
 
 script.
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.9.3",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.10.0",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
-        "padding: 5px 10px;color:white;background:#0084ff;",
+        "padding: 5px 10px;color:white;background:#0084ff;border-radius:0 5px 5px 0",
     )
 
 if theme.extends.head

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the efu.",
   "main": "package.json",
   "scripts": {

package/source/css/_layout/footer.styl

@@ -15,38 +15,37 @@
     content ''
     z-index -1
 
-  div#st-footer-bar
-    display none
-
-    a.footer-bar-link
-      padding 4px 16px
-      background var(--efu-secondbg)
-      border-radius 20px
-      margin-top 8px
-      font-size 14px
-      cursor pointer
-      border var(--style-border-always)
 
-      &:hover
-        background var(--efu-main)
-        color var(--efu-white)
-        transform scale(1.1)
-        border-color var(--efu-main)
+  if hexo-config('post.footer.enable')
+    div#st-footer-bar
+      display flex
+      flex-direction column
+      align-items center
+      margin-top 16px
+
+      a.footer-bar-link
+        padding 4px 16px
+        background var(--efu-secondbg)
+        border-radius 20px
+        margin-top 8px
+        font-size 14px
+        cursor pointer
+        border var(--style-border-always)
 
-    .footer-logo
-      font-size 24px
+        &:hover
+          background var(--efu-main)
+          color var(--efu-white)
+          transform scale(1.1)
+          border-color var(--efu-main)
 
-    .footer-bar-description
-      color var(--efu-secondtext)
-      font-weight 700
-      padding: 0 0.5rem
-      text-align: center
+      .footer-logo
+        font-size 24px
 
-  .post & div#st-footer-bar
-    display flex
-    flex-direction column
-    align-items center
-    margin-top 16px
+      .footer-bar-description
+        color var(--efu-secondtext)
+        font-weight 700
+        padding: 0 0.5rem
+        text-align: center
 
   #footer_deal
     justify-content center

package/source/css/_page/_home/category-bar.styl

@@ -74,4 +74,19 @@
 
         a
           background var(--efu-theme)
-          color var(--efu-white)
+          color var(--efu-white)
+
+.category-bar-next
+    margin-left 8px
+    cursor pointer
+    height 30px
+    width 30px
+    display flex
+    border-radius 8px
+    align-items center
+    justify-content center
+    transition .3s
+@media (hover: hover) 
+  .category-bar-next:hover 
+    backgroundvar(--efu-secondbg)
+    color var(--efu-lighttext)

package/source/css/_page/music.styl

@@ -1,8 +1,10 @@
 body[data-type=music]
   #page-header #nav a
     color var(--efu-white)
+
   #page-header.not-top-img #nav .back-home-button
     color var(--efu-white)
+
   .page
     .layout#content-inner
       background none
@@ -51,12 +53,9 @@ body[data-type=music]
       justify-content space-between
       overflow visible
 
-  .aplayer-body 
+  .aplayer-body
     width 70%
-    height 85vh
-
-    +maxWidth1200()
-      height 80vh
+    height 75vh
 
     +maxWidth798()
       width 100%
@@ -67,20 +66,12 @@ body[data-type=music]
       left 0
       right 0
       top 0
-      height 75vh
+      height calc(var(--vh) - 230px)
 
   ol
-    max-height 85vh !important
+    max-height calc(var(--vh) - 170px)!important
 
-    +maxWidth1200()
-      max-height 80vh !important
-
-    +maxWidth798()
-      max-height 100%!important
-      padding-right 3px
-      padding-left 8px
-
-    & > li 
+    & > li
       font-size 14px
       opacity 0.6
       border-top none
@@ -88,11 +79,11 @@ body[data-type=music]
       +maxWidth798()
         display flex
 
-      &:hover 
+      &:hover
         background var(--efu-black-op)
         border-radius 6px
 
-      &.aplayer-list-light 
+      &.aplayer-list-light
         background var(--efu-black-op)
         border-radius 6px
         height 60px
@@ -108,10 +99,10 @@ body[data-type=music]
           height 52px
           justify-content center
 
-        .aplayer-list-index 
+        .aplayer-list-index
           display none
 
-        .aplayer-list-title 
+        .aplayer-list-title
           font-size 20px
           line-height 20px
           margin-top 8px
@@ -123,39 +114,38 @@ body[data-type=music]
           +maxWidth798()
             margin-top 4px
 
-        .aplayer-list-cur 
+        .aplayer-list-cur
           display none
 
         span
           +maxWidth798()
             color #fff
 
-          &.aplayer-list-author 
+          &.aplayer-list-author
             max-width 100%
 
             +maxWidth798()
               margin-left 0
               right 15px
 
-      span 
+      span
         color var(--efu-white)
 
         +maxWidth798()
           color var(--efu-black)
 
-        &.aplayer-list-title 
+        &.aplayer-list-title
           line-height 32px
 
           +maxWidth798()
             max-width 55%
-            width auto
             display -webkit-box
             -webkit-line-clamp 1
             overflow hidden
             -webkit-box-orient vertical
             width 30%
 
-        &.aplayer-list-author 
+        &.aplayer-list-author
           opacity 0.6
           overflow hidden
           text-overflow ellipsis
@@ -173,17 +163,17 @@ body[data-type=music]
             -webkit-box-orient vertical
             margin-left auto
 
-      .aplayer-list-index 
+      .aplayer-list-index
         line-height 32px
         opacity 0.6
 
-    &::-webkit-scrollbar-thumb 
+    &::-webkit-scrollbar-thumb
       background-color var(--efu-white-op)
 
   .aplayer-list
     transition none
 
-  .aplayer-pic 
+  .aplayer-pic
     float none
     width 60px
     height 60px
@@ -195,17 +185,17 @@ body[data-type=music]
     z-index 999
     display none
 
-  .aplayer-info 
+  .aplayer-info
     margin 0 20px 0 20px
     border-bottom none
 
-    .aplayer-music 
+    .aplayer-music
       display none
 
       +maxWidth798()
         display flex
         position fixed
-        top 83vh
+        top calc(var(--vh) - 178px)
         left 0
         margin 0
         margin-left 32px
@@ -238,29 +228,22 @@ body[data-type=music]
           line-height 1
           color #fff
 
-    .aplayer-lrc 
+    .aplayer-lrc
       padding-top 24%
-      height 100vh
-
-      +maxWidth798()
-        margin-top 0
-        height auto
-        min-height 100%
-        mask-image linear-gradient(to bottom, #000, #000, #000, #000, #0000, #0000)
-        padding-top 100px
+      height var(--vh)
 
       &:hover
         p
           filter blur(0px)
 
-      p 
+      p
         font-size 36px
         line-height 44px !important
         height 44px !important
         margin-bottom 36px !important
         color #fff
         font-weight bold
-        text-align center
+        text-align left
         filter blur(2px)
         opacity 0.3
         transition all 0.9s cubic-bezier(0.56, 0.17, 0.22, 0.76)
@@ -274,17 +257,17 @@ body[data-type=music]
           line-height 42px
           height 42px
 
-        &.aplayer-lrc-current 
+        &.aplayer-lrc-current
           filter blur(0px)
           opacity 1
           transition all 0.3s cubic-bezier(0.56, 0.17, 0.22, 0.76), text-shadow 8s 4s ease-in
           height fit-content !important
           text-shadow 0 4px 4px #ffffff94
 
-          &:first-child 
+          &:first-child
             text-shadow 0 4px 4px #ffffff00
 
-    .aplayer-controller 
+    .aplayer-controller
       position fixed
       max-width 1400px
       margin auto
@@ -299,21 +282,21 @@ body[data-type=music]
         width 100%
         bottom 120px
 
-      .aplayer-bar-wrap 
+      .aplayer-bar-wrap
         margin 0 160px 0 150px
 
         +maxWidth798()
           margin 0 32px
 
-      .aplayer-played 
+      .aplayer-played
         background var(--efu-white) !important
 
-      .aplayer-thumb 
+      .aplayer-thumb
         -webkit-transform none
         transform none
         background #fff !important
 
-    .aplayer-time 
+    .aplayer-time
       position absolute
       width 100%
       bottom 26px
@@ -325,16 +308,16 @@ body[data-type=music]
         bottom -40px
         align-items center
 
-      .aplayer-icon 
+      .aplayer-icon
         width 1.8rem
         height 1.8rem
         margin-left 16px
 
-        path 
+        path
           fill var(--efu-white)
           opacity 0.8
 
-      .aplayer-time-inner 
+      .aplayer-time-inner
         margin-right 18px
         margin-top -8px
 
@@ -343,7 +326,7 @@ body[data-type=music]
           width 100%
           margin-right 4px
           margin-top -60px
-          
+
           .aplayer-dtime
             position absolute
             right 30px
@@ -352,7 +335,7 @@ body[data-type=music]
             position absolute
             left 44px
 
-      .aplayer-icon-back 
+      .aplayer-icon-back
         position absolute
         left 0
         display inline
@@ -361,7 +344,7 @@ body[data-type=music]
           margin auto
           right 110px
 
-      .aplayer-icon-play 
+      .aplayer-icon-play
         position absolute
         left 40px
         display inline
@@ -373,7 +356,7 @@ body[data-type=music]
           width 56px
           height 56px
 
-      .aplayer-icon-forward 
+      .aplayer-icon-forward
         position absolute
         left 80px
         display inline
@@ -399,7 +382,7 @@ body[data-type=music]
           height 24px
           opacity 0.4
 
-      .aplayer-icon-menu 
+      .aplayer-icon-menu
         display none
 
         +maxWidth798()
@@ -411,7 +394,7 @@ body[data-type=music]
           height 24px
           opacity 0.4
 
-  .aplayer-list 
+  .aplayer-list
     width 40%
     max-width 480px
     max-height none !important
@@ -422,7 +405,7 @@ body[data-type=music]
       position fixed
       z-index 1002
       width 100%
-      bottom 0px
+      bottom 0
       left 0
       background var(--efu-white)
       border-radius 16px 16px 0 0
@@ -440,10 +423,10 @@ body[data-type=music]
         overflow inherit
 
       &:after,
-      &:before 
+      &:before
         display none
 
-      .aplayer-lrc-contents 
+      .aplayer-lrc-contents
         width 90%
         margin-left auto
         transition all .5s cubic-bezier(0.49, 0.21, 0.22, 0.84)
@@ -452,28 +435,28 @@ body[data-type=music]
         +maxWidth798()
           width 100%
 
-    .aplayer-info 
-      .aplayer-controller 
-        .aplayer-bar-wrap 
-          .aplayer-bar 
+    .aplayer-info
+      .aplayer-controller
+        .aplayer-bar-wrap
+          .aplayer-bar
             height 8px
             border-radius 8px
             background var(--efu-white-op)
 
-            .aplayer-loaded 
+            .aplayer-loaded
               background var(--efu-white-op)
               height 8px
               border-radius 8px
 
-            .aplayer-played 
+            .aplayer-played
               height 8px
               border-radius 8px
 
-              .aplayer-thumb 
+              .aplayer-thumb
                 height 16px
                 width 16px
 
-        .aplayer-time 
+        .aplayer-time
           color var(--efu-white)
 
 
@@ -499,7 +482,7 @@ body[data-type=music]
 
           .aplayer-icon-volume-down
             display block
-            
+
             +maxWidth798()
               display none
 

package/source/css/_tags/mermaid.styl

@@ -1,3 +1,6 @@
 .mermaid
   display flex
-  justify-content center
+  justify-content center
+
+  text
+    fill var(--efu-fontcolor) !important

package/source/js/main.js

@@ -602,7 +602,7 @@ let sco = {
             }
         }
         utils.addEventListenerPjax(switchBtn, 'click', handleSwitchBtn)
-    },
+    }
 }
 
 /**

package/source/js/music.js

@@ -7,6 +7,7 @@ class ScoMusicPlayer {
         this.init();
     }
     init() {
+        document.documentElement.style.setProperty('--vh', `${window.innerHeight}px`);
         this.getCustomPlayList();
         this.addEventListenerToDocument();
         this.addButtonListEventListener();