hexo-theme-solitude 3.0.0 → 3.0.2

package/layout/includes/widgets/aside/asideInfoCard.pug

@@ -1,89 +1,21 @@
-- const {style ,url} = theme.aside.card
 .card-widget.card-info
     .card-content
-        case style
-            when 0
-                .card-info-avatar.is-center
-                    .author-info__top-group
-                        .author-info__sayhi#author-info__sayhi(onclick="sco.changeSayHelloText()")= _p('sayhello.morning')
-                .avatar-img-group
-                    img.avatar-img(alt=_p('aside.avatar'), src=theme.aside.card.author.img)
-                    if theme.aside.card.author.sticker
-                        .avatar-sticker
-                            img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
-                .author-info__description_group
-                    .author-info__description!= theme.aside.card.content
-                    .author-info__description2!= theme.aside.card.content2
-                .author-info__bottom-group
-                    a.author-info__bottom-group-left(href=url_for(theme.aside.card.url))
-                        .author-info__name= config.author
-                        .author-info__desc!= config.subtitle
-                    .card-info-social-icons.is-center
-                        each value, label in theme.aside.card.information || {}
-                            - var array = value.split('||')
-                            a.social-icon(href=url_for(trim(array[0])), title=label)
-                                i.solitude(class=array[1])
-            when 1
-                .card-info-bg-top
-                    .is-center
-                        .author-info__top-group
-                            .author-info__sayhi#author-info__sayhi(onclick="sco.changeSayHelloText()")= _p('sayhello.morning')
-                a.card-info-avatar(href=url_for(theme.aside.card.url) title=_p('aside.avatar'))
-                    .avatar-img
-                        img(src=theme.aside.card.author.img alt=_p('aside.avatar'))
-                    if theme.aside.card.author.sticker
-                        .avatar-sticker
-                            img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
-                .card-info__desc_group
-                    .author-info__name= config.author
-                    .author-info__desc!= config.subtitle
-
-                    .card-info__data.is-center
-                        if site.posts.length !== 0
-                          a(href=url_for('/archives/') title=_p('aside.card.posts') + site.posts.length)
-                              .length-num= site.posts.length
-                              .headline= _p('page.archives')
-                        if site.tags.length !== 0 || theme.page.tags
-                          a(href=url_for('/tags/') title=_p('aside.card.tags') + site.tags.length)
-                              .length-num= site.tags.length
-                              .headline= _p('page.tag')
-                        if site.categories.length !== 0 || theme.page.categories
-                          a(href=url_for('/categories/') title=_p('aside.card.categories') + site.categories.length)
-                              .length-num= site.categories.length
-                              .headline= _p('page.category')
-
-                    .card-info-social-icons.is-center
-                        each value, label in theme.aside.card.information || {}
-                            - var array = value.split('||')
-                            a.social-icon(href=url_for(trim(array[0])), title=label)
-                                i.solitude(class=array[1])
-            when 2
-                .card-info-bg-top
-                    .author-info-social
-                        .social-icons
-                            each value, label in theme.aside.card.information || {}
-                                - var array = value.split('||')
-                                a.social-icon(href=url_for(trim(array[0])), title=label)
-                                    i.solitude(class=array[1])
-                        span.more-info(onclick="document.querySelector('.social-icons').classList.toggle('show')")
-                            i.solitude.fa-solid.fa-ellipsis-vertical
-                a.card-info-avatar(href=url_for(theme.aside.card.url) title=_p('aside.avatar'))
-                    .avatar-img
-                        img(src=theme.aside.card.author.img alt=_p('aside.avatar'))
-                    if theme.aside.card.author.sticker
-                        .avatar-sticker
-                            img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
+        .card-info-avatar.is-center
+            .author-info__top-group
+                .author-info__sayhi#author-info__sayhi(onclick="sco.changeWittyWord()")
+        .avatar-img-group
+            img.avatar-img(alt=_p('aside.avatar'), src=theme.aside.my_card.author.img)
+            if theme.aside.my_card.author.sticker
+                .avatar-sticker
+                    img.avatar-sticker-img(src=theme.aside.my_card.author.sticker, alt=_p('aside.sticker'))
+        .author-info__description_group
+            .author-info__description!= theme.aside.my_card.content
+        .author-info__bottom-group
+            span.author-info__bottom-group-left
                 .author-info__name= config.author
-                .card-info__data.is-center
-                    a(href=url_for('/archives/') title=_p('aside.card.posts') + site.posts.length)
-                        .length-num= site.posts.length
-                        .headline= _p('page.archives')
-                    a(href=url_for('/tags/') title=_p('aside.card.tags') + site.tags.length)
-                        .length-num= site.tags.length
-                        .headline= _p('page.tag')
-                    a(href=url_for('/categories/') title=_p('aside.card.categories') + site.categories.length)
-                        .length-num= site.categories.length
-                        .headline= _p('page.category')
-                .card-info__desc_group
-                    .author-info__description!= theme.aside.card.content
-                    .author-info__description2!= theme.aside.card.content2
+                .author-info__desc!= config.subtitle
+            .card-info-social-icons.is-center
+                each value, label in theme.aside.my_card.information || {}
+                    - var array = value.split('||')
+                    a.social-icon(href=url_for(trim(array[0])), title=label)
+                        i.solitude(class=array[1])

package/layout/includes/widgets/home/banner.pug

@@ -2,7 +2,6 @@
 
 div.banners-title
     div.banners-title-big!= title
-    - console.log(typeof(desc))
     if typeof(desc) === 'object'
         div.banners-title-small
         script.

package/layout/includes/widgets/home/bbTimeList.pug

@@ -1,8 +1,8 @@
 .bbTimeList.container#bbTimeList(class=is_home_first_page() ? '' : 'more-page')
-    i.bber-logo.solitude.fa-solid.fa-newspaper(onclick=`pjax.loadUrl('${url_for(theme.says.page)}')`)
-    .swiper-container.swiper-no-swiping.swiper-container-initialized.swiper-container-vertical.swiper-container-pointer-events#bbtalk(tabindex="-1" onclick=`pjax.loadUrl('${url_for(theme.says.page)}')`)
+    i.bber-logo.solitude.fa-solid.fa-newspaper(onclick=`pjax.loadUrl('${url_for(theme.brevity.page)}')`)
+    .swiper-container.swiper-no-swiping.swiper-container-initialized.swiper-container-vertical.swiper-container-pointer-events#bbtalk(tabindex="-1" onclick=`pjax.loadUrl('${url_for(theme.brevity.page)}')`)
         .swiper-wrapper#bber-talk
-            each item, i in site.data.essay.essay_list.slice(0, 10)
+            each item, i in site.data.brevity.slice(0, 10)
                 .li-style.swiper-slide
                     | #{item.content}
                     if item.image
@@ -13,4 +13,4 @@
                         i.solitude.fa-solid.fa-video
                     else if item.link
                         i.solitude.fa-solid.fa-link
-    i.bber-gotobb.solitude.fa-solid.fa-circle-chevron-right(title=_p('home.bbtime.text') onclick=`pjax.loadUrl('${url_for(theme.says.page)}')`)
+    i.bber-gotobb.solitude.fa-solid.fa-circle-chevron-right(title=_p('home.bbtime.text') onclick=`pjax.loadUrl('${url_for(theme.brevity.page)}')`)

package/layout/includes/widgets/page/about/contentinfo.pug

@@ -2,7 +2,7 @@
 
 if contentinfo
     .author-content
-        .author-content-item.myInfoAndSayHello
+        .author-content-item.myInfoAndWittyWord
             .title1= contentinfo.sup
             .title2
                 span.inline-word= contentinfo.name

package/layout/includes/widgets/page/recentcomment/waline.pug

@@ -10,7 +10,6 @@ script(pjax).
         let ls = []
         await fetch('!{theme.waline.envId}/api/comment?type=recent&count=!{limit}', {method: 'GET'}).then(async res => res.json())
             .then(async data => {
-                console.log(data)
                 for (const i of data.data) {
                     let title = ''
                     if (i.url) {

package/layout/index.pug

@@ -1,9 +1,9 @@
 extends includes/layout
 
 block content
-    if theme.hometop.enable || (theme.says.home_mini && theme.says.enable)
+    if theme.hometop.enable || (theme.brevity.home_mini && theme.brevity.enable)
         #home_top
-            if theme.says.home_mini && theme.says.enable
+            if theme.brevity.home_mini && theme.brevity.enable
                 include ./includes/widgets/home/bbTimeList
             if theme.hometop.enable && is_home_first_page()
                 include ./includes/widgets/home/hometop

package/package.json

@@ -1,18 +1,15 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by everfu.",
   "main": "package.json",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "keywords": [
     "hexo",
     "theme",
     "solitude",
     "Card UI Design",
-    "everfu",
-    "伍十七",
+    "@everfu",
+    "everly",
     "hexo-theme-solitude"
   ],
   "repository": {
@@ -25,9 +22,12 @@
   },
   "bugs": {
     "url": "https://github.com/everfu/hexo-theme-solitude/issues",
-    "email": "o@everfu.org"
+    "email": "o@efu.me"
   },
   "homepage": "https://solitude.js.org",
-  "author": "Hexo-Theme-Solitude<o@everfu.org>",
-  "license": "MIT"
-}
+  "author": "Hexo-Theme-Solitude<o@efu.me>",
+  "license": "Apache-2.0",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  }
+}

package/scripts/event/merge_config.js

@@ -37,23 +37,20 @@ hexo.extend.filter.register('before_generate', () => {
       post: { noSticky: 'about', Sticky: 'allInfo' },
       page: { noSticky: 'about', Sticky: 'allInfo' },
       card: {
-        style: 0,
         author: {
           img: '/img/logo.png',
           sticker: '/img/happy-sticker.avif',
         },
         url: '/about/',
-        background: null,
         content1: 'Solitude',
-        content2: 'A simple theme for Hexo',
-        sayhello: {
+        state: {
           morning: 'Good Morning',
           noon: 'Good Noon',
           afternoon: 'Good Afternoon',
           night: 'Good Night',
           goodnight: 'Good Night',
         },
-        sayhello2: ['Welcome to Solitude', 'A simple theme for Hexo', 'Enjoy your time', 'Have a nice day', 'Good luck'],
+        witty_words: [],
         information: null,
       },
       flip: {
@@ -171,8 +168,9 @@ hexo.extend.filter.register('before_generate', () => {
       text: '404 Not Found',
       recommendList: true
     },
-    says: {
+    brevity: {
       enable: false,
+      music: false,
       home_mini: false,
       style: 1,
       strip: 30

package/scripts/filter/checkThemeConfig.js

@@ -4,9 +4,9 @@ hexo.extend.filter.register('before_post_render', () => {
         const data = hexo.locals.get('data');
         const logger = hexo.log;
         const theme = hexo.theme.config;
-        if (theme.says.enable && !data.essay) {
-            logger.error('\n 启用即刻短文的情况下，请新建 essay.yaml。');
-            logger.error('\n If says is enabled, essay data must be supplied! \n Please create essay.yaml.');
+        if (theme.brevity.enable && !data.brevity) {
+            logger.error('\n 启用即刻短文的情况下，请新建 brevity.yaml。');
+            logger.error('\n If brevity is enabled, brevity data must be supplied! \n Please create brevity.yaml.');
             process.exit(-1);
         }
         if (theme.footer.randomlink && !data.links){

package/scripts/helper/stylus.js

@@ -2,7 +2,7 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     const {config, theme} = this;
     const data = hexo.locals.get('data');
 
-    style.define('$about', data && data.about ? Object.keys(data.about) : false);
+    style.define('$about', data && data.about ? Object.keys(data.about) : {});
 
     // highlight
     const {syntax_highlighter: syntaxHighlighter, highlight, prismjs} = hexo.config

package/source/css/_components/capsule.styl

@@ -0,0 +1,228 @@
+@keyframes changeright
+  0%, 50%, 100%
+    transform: rotate(0deg) scale(1.1)
+    box-shadow: 0 0 2px #ffffff00
+  25%, 75%
+    transform: rotate(90deg) scale(1.1)
+    box-shadow: 0 0 14px #ffffff
+
+@keyframes playingShadow
+  0%, 100%
+    box-shadow: 0 0px 12px -3px var(--efu-none)
+  50%
+    box-shadow: 0 0px 12px 0px var(--efu-main)
+
+@keyframes lightBar
+  0%, 100%
+    opacity: 0.1
+  60%
+    opacity: 0.3
+
+.aplayer.aplayer-narrow
+  .aplayer-body,
+  .aplayer-pic
+    height: 66px
+    width: 66px
+
+#nav-music
+  display: flex
+  align-items: center
+  z-index: 12
+  position: fixed
+  bottom: 20px
+  left: 20px
+  cursor: pointer
+  transition: all 0.5s, left 0s
+  transform-origin: left bottom
+  box-shadow: var(--efu-shadow-border)
+  border-radius: 40px
+  overflow: hidden
+
+  &:active
+    transform: scale(0.97)
+
+  &.playing
+    border: var(--style-border)
+    box-shadow: 0 0px 12px -3px var(--efu-none)
+    animation: playingShadow 5s linear infinite
+
+    .aplayer.aplayer-withlrc
+      .aplayer-pic
+        box-shadow: 0 0 14px #ffffffa6
+        transform: rotate(0deg) scale(1.1)
+        border-color: var(--efu-white)
+        animation-play-state: running
+
+      .aplayer-info
+        color: var(--efu-white)
+
+    #nav-music-hoverTips
+      width: 0
+
+    .aplayer
+      background: var(--efu-main)
+      border: var(--style-border-hover)
+      backdrop-filter: saturate(180%) blur(20px)
+      transform: translateZ(0)
+
+    .aplayer .aplayer-info .aplayer-controller .aplayer-bar-wrap .aplayer-bar .aplayer-played
+      animation-play-state: running
+
+  &:hover:not(.playing) #nav-music-hoverTips
+    opacity: 1
+
+  .aplayer.aplayer-withlrc
+    .aplayer-pic
+      height: 25px
+      width: 25px
+      border-radius: 40px
+      z-index: 1
+      transition: 0.3s
+      transform: rotate(0deg) scale(1)
+      border: var(--style-border-always)
+      animation: changeright 24s linear infinite
+      animation-play-state: paused
+
+    .aplayer-info
+      height: 100%
+      color: var(--efu-fontcolor)
+      margin: 0
+      padding: 0
+      display: flex
+      align-items: center
+
+  #nav-music-hoverTips
+    color: var(--efu-white)
+    background: var(--efu-main)
+    width: 100%
+    height: 100%
+    position: absolute
+    top: 0
+    left: 0
+    align-items: center
+    justify-content: center
+    display: flex
+    border-radius: 40px
+    opacity: 0
+    font-size: 12px
+    z-index: 2
+    transition: 0.3s
+
+  .aplayer
+    background: var(--efu-card-bg)
+    border-radius: 60px
+    height: 41px
+    display: flex
+    margin: 0
+    transition: 0.3s
+    border: var(--style-border)
+    box-shadow: none
+
+    .aplayer-notice,
+    .aplayer-miniswitcher,
+    .aplayer-list
+      display: none
+
+    .aplayer-body
+      position: relative
+      display: flex
+      align-items: center
+
+    .aplayer-info
+      .aplayer-music
+        margin: 0
+        display: flex
+        align-items: center
+        padding: 0 12px 0 8px
+        cursor: pointer
+        z-index: 1
+        height: 100%
+
+        .aplayer-title
+          cursor: pointer
+          line-height: 1
+          display: inline-block
+          white-space: nowrap
+          max-width: 120px
+          overflow: hidden
+          text-overflow: ellipsis
+          transition: 0.3s
+          user-select: none
+
+      .aplayer-controller
+        position: absolute
+        width: 100%
+        height: 100%
+        top: 0
+        left: 0
+
+        .aplayer-bar-wrap
+          margin: 0
+          padding: 0
+
+          .aplayer-bar
+            height: 100%
+            background: 0 0
+
+            .aplayer-loaded
+              display: none
+
+            .aplayer-played
+              height: 100%
+              opacity: 0.1
+              background-color: var(--efu-white) !important
+              animation: lightBar 5s ease infinite
+              animation-play-state: paused
+
+    .aplayer-pic
+      pointer-events: none
+
+      .aplayer-button
+        bottom: 50%
+        right: 50%
+        transform: translate(50%, 50%)
+        margin: 0
+        transition: 0.3s
+        pointer-events all
+
+      &:has(.aplayer-button.aplayer-play)
+        animation-play-state: paused
+        transform: rotate(0deg) scale(1) !important
+
+      margin-left: 8px
+
+    .aplayer-info .aplayer-controller .aplayer-time,
+    .aplayer-info .aplayer-music .aplayer-author
+      display: none
+
+    &.aplayer-withlist .aplayer-info
+      border: none
+
+    .aplayer-lrc
+      width: 0
+      opacity: 0
+      transition: 0.3s
+      margin-bottom: -15px
+
+      p.aplayer-lrc-current
+        color: var(--efu-white)
+        border: none
+        min-height: 20px
+        filter: none
+
+      &:after,
+      &:before
+        display: none
+
+      p
+        color: #ffffffb3
+        filter: blur(.8px)
+
+  &.stretch .aplayer.aplayer-withlrc .aplayer-lrc
+    width: 200px
+    margin-left: 8px
+    opacity: 1
+
+.aplayer-thumb
+  width: 0 !important
+  height: 0 !important

package/source/css/_components/expire.styl

@@ -0,0 +1,12 @@
+.expire
+  display flex
+  align-items center
+  border-radius 8px
+  background-color rgba(255, 0, 0, .5)
+  border-left 5px solid var(--efu-red)
+  padding 10px 16px
+  color var(--efu-white)
+
+  i.solitude
+    color var(--efu-white)
+    margin-right 8px

package/source/css/_components/index.styl

@@ -0,0 +1,17 @@
+if hexo-config('capsule.enable')
+    @import 'capsule.styl'
+
+if hexo-config('rightside.enable')
+    @import 'rightside.styl'
+
+if hexo-config('expire.enable')
+    @import 'expire.styl'
+
+if hexo-config('keyboard.enable')
+    @import 'keyboard.styl'
+
+if hexo-config('loading.pace')
+    @import 'pace.styl'
+
+if hexo-config('display_mode.universe')
+    @import 'universe.styl'

package/source/css/_components/keyboard.styl

@@ -0,0 +1,59 @@
+#keyboard-tips
+  position fixed
+  top 80px
+  left 20px
+  z-index 999
+  background var(--efu-maskbgdeep)
+  border-radius 12px
+  border var(--style-border)
+  padding 20px
+  display flex
+  flex-direction column
+  backdrop-filter saturate(180%) blur(20px)
+  transform translateZ(0)
+  pointer-events none
+  box-shadow var(--efu-shadow-border)
+  opacity 0
+  transition .3s
+
+  &.show
+    opacity 1
+    transition .1s
+
+  .keyboardTitle
+    font-size 12px
+    color var(--efu-secondtext)
+    line-height 1
+
+  .keyboardList
+    display flex
+    flex-direction column
+    margin-top 8px
+
+  .keyboardItem
+    display flex
+    margin-top 4px
+
+  .keyGroup
+    display flex
+    align-items center
+    width 90px
+
+    .key
+      padding 0.2em 0.4em
+      font-family inherit
+      background-color var(--efu-card-bg)
+      color var(--efu-fontcolor)
+      border var(--style-border)
+      border-color var(--efu-secondtext)
+      border-bottom 2px solid var(--efu-secondtext)
+      box-shadow var(--efu-shadow-border)
+      border-radius 0.25rem
+      overflow-wrap break-word
+      overflow-x auto
+      font-weight 500
+      font-size .875em
+      margin-right 4px
+      vertical-align baseline
+      line-height 1
+      height 24px

package/source/css/_components/pace.styl

@@ -0,0 +1,39 @@
+.pace
+  pointer-events: none
+  user-select: none
+  z-index: 2000
+  position: fixed
+  margin: auto
+  top: 4px
+  left: 0
+  right: 0
+  height: 8px
+  border-radius: 8px
+  width: 4rem
+  background: var(--efu-secondbg)
+  border: var(--style-border)
+  overflow: hidden
+
+  &.pace-inactive
+    opacity: 0
+    transition: .3s
+    top: -8px
+
+    .pace-progress
+      opacity: 0
+      transition: .3s ease-in
+
+  .pace-progress
+    box-sizing: border-box
+    transform: translate3d(0, 0, 0)
+    max-width: 200px
+    z-index: 2000
+    display: block
+    position: absolute
+    top: 0
+    right: 100%
+    height: 100%
+    width: 100%
+    background: var(--efu-logo-color)
+    animation: gradient 2s ease infinite
+    background-size: 200%