hexo-theme-solitude 1.2.1 → 1.2.2

package/_config.yml

@@ -486,6 +486,7 @@ cdn:
     algoliajs: https://cdn.bootcdn.net/ajax/libs/algoliasearch/4.9.3/algoliasearch-lite.umd.min.js
     pacejs: https://cdn.bootcdn.net/ajax/libs/pace/1.2.4/pace.min.js
     echartsjs: https://cdn.bootcdn.net/ajax/libs/echarts/5.4.2/echarts.min.js
+    lunrjs: https://cdn.bootcdn.net/ajax/libs/lunr.js/2.3.9/lunr.min.js
   body:
     viewimagejs: /lib/view-image.min.js
     waterfalljs: /lib/waterfall.min.js

package/layout/includes/head/config.pug

@@ -30,7 +30,7 @@ script.
         },
         hightlight: {
             enable: !{theme.hightlight.enable},
-            limit: '!{theme.hightlight.hightlimit}'
+            limit: !{theme.hightlight.hightlimit},
         },
         lightbox: !{theme.lightbox},
         randomlinks: !{theme.footer.randomlink},

package/layout/includes/inject/head.pug

@@ -26,6 +26,8 @@ if theme.thirdparty.search.enable
     if theme.thirdparty.search.type === 'algolia'
         script(src=url_for(cdn.instantsearch))
         script(src=url_for(cdn.algoliajs))
+    else if theme.thirdparty.search.type === 'local'
+        script(src=url_for(cdn.lunrjs))
 
 // aplayer
 if theme.thirdparty.aplayer.enable

package/layout/includes/page/equipment.pug

@@ -1,3 +1,3 @@
-- var pageClass = "equipment"
+- var pageClass = "sharePage"
 include ../widgets/page/banner
 include ../widgets/page/equipment/content

package/layout/includes/page/moments.pug

@@ -1,4 +1,4 @@
-- var pageClass = "momentsPage"
+- var pageClass = "sharePage"
 include ../widgets/page/banner
 if theme.thirdparty.circle.angle.enable
     include ../widgets/page/moments/angle

package/layout/includes/page/says.pug

@@ -1,5 +1,5 @@
 if theme.says.enable
-    - var pageClass = "essayPage"
+    - var pageClass = "sharePage"
     include ../widgets/page/banner
     #bber
         section.timeline.page-1

package/layout/includes/page/tlink.pug

@@ -1,4 +1,4 @@
-- var pageClass = "essayPage"
+- var pageClass = "sharePage"
 include ../widgets/page/banner
 .flink#article-container
     each data in site.data.tlink.links

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

@@ -1,7 +1,7 @@
 .category-bar-items#category-bar-items
     .category-bar-item(class=is_home() ? 'select' : '', id="category-bar-home")
         a(href="/") 首页
-    each item in site.tags.find({ parent: { $exists: false } }).data
+    each item in site.categories.find({ parent: { $exists: false } }).data
         .category-bar-item(class=select ? (select === item.name ? 'select' : '') : '', id=item.name)
             a(href=url_for(item.path))= item.name
 if site.categories.length > 10

package/layout/includes/widgets/third-party/search/algolia-search.pug

@@ -5,12 +5,10 @@ div#algolia-search
             div#algolia-search-input
         div#search-results
             div#algolia-hits
+        div#algolia-tips
             div#algolia-pagination
             div#algolia-stats
-            div.algolia-poweredBy
-        div#algolia-tips
-            i.scoicon.sco-algolia-fill
-            span.algolia-tips-text= "Algolia 提供搜索服务"
+            #algolia-poweredBy
         span.search-close-button
             i.scoicon.sco-close-fill
     div#search-mask

package/layout/includes/widgets/third-party/search/local-search.pug

@@ -4,12 +4,10 @@ div#local-search
             span.search-dialog-title 搜索
             button.search-close-button
                 i.scoicon.sco-close-fill
-        div#loading-database
-            i.scoicon.sco-loading-line
-            span 加载中
         div.search-wrap
             div.search-box
                 input.search-box-input(type="text", id="search-input", autocomplete="off", spellcheck="false", autocorrect="off", autocapitalize="off", placeholder=__('search.placeholder'))
-            div#loading-status
             div#search-results
+            div#search-pagination
+            div#search-tips
     div#search-mask

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the DuoSco team",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/source/css/_page/about.styl

@@ -703,28 +703,6 @@
   .author-content-item
     animation slide-in .6s 0s backwards
 
-.author-content-item
-  .content-bottom
-    margin-top auto
-    display flex
-    align-items center
-    justify-content space-between
-
-    .icon-group
-      display flex
-
-      i
-        display inline-block
-        width 22px
-        height 18px
-        margin-right .5rem
-
-.icon-pos-sup
-  background url(https://bu.dusays.com/2023/03/12/640dc913ee26b.webp)
-
-.icon-pos-mid
-  background url(https://bu.dusays.com/2023/03/12/640dc931a2cd4.webp)
-
 .author-content-item
   &.game-jl
     width 39%
@@ -770,70 +748,6 @@
       top 0
       left 0
 
-  .card-content
-    position absolute
-    width 100%
-    height 100%
-    top 0
-    left 0
-    z-index 2
-    display flex
-    flex-direction column
-    padding 1rem 2rem
-
-    .author-content-item-title
-      margin-bottom .5rem
-
-    .banner-button-group
-      position absolute
-      bottom 1.5rem
-      right 2rem
-
-      .banner-button
-        height 40px
-        width 118px
-        border-radius 20px
-        justify-content center
-        background var(--sco-black-op)
-        color var(--sco-white)
-        display flex
-        align-items center
-        z-index 1
-        transition .3s
-        cursor pointer
-        backdrop-filter saturate(180%) blur(20px)
-        -webkit-backdrop-filter blur(20px)
-        transform translateZ(0)
-
-        &:hover
-          background var(--sco-main)
-          color var(--sco-white)
-
-        i
-          margin-right 8px
-          font-size 22px
-
-@media screen and (max-width: 768px)
-  .author-content-item
-    .card-content
-      .banner-button-group
-        right 1rem
-        bottom 1rem
-
-      .banner-button-group
-        .banner-button
-          background 0 0 !important
-          color var(--sco-white)
-          padding 0
-          width fit-content
-
-          i
-            margin-right 0
-            font-size 1.5rem
-
-      .banner-button-text
-        display none
-
 .author-content-item
   &.single.like-movie
     height 19rem
@@ -877,29 +791,6 @@ video.author-content-video
   width 49%
   justify-content space-between
 
-.author-content-item
-  width 49%
-  border-radius 12px
-  background var(--sco-card-bg)
-  border var(--style-border-always)
-  box-shadow var(--sco-shadow-border)
-  position relative
-  padding 1rem 2rem
-  overflow hidden
-
-  &.single
-    width 100%
-
-  .author-content-item-title
-    font-size 36px
-    font-weight 700
-    line-height 1
-
-  .author-content-item-tips
-    opacity .8
-    font-size .6rem
-    margin-bottom .5rem
-
 @media screen and (max-width: 768px)
   .author-content-item
     width 100% !important

package/source/css/_page/equipment.styl

@@ -1,10 +1,3 @@
-.author-content.author-content-item.equipment
-  height 19rem
-  background-size cover
-  color var(--sco-white)
-  overflow hidden
-  margin-top 0
-
 .equipment-item-content
   display flex
   flex-direction row

package/source/css/_page/index.styl

@@ -19,4 +19,113 @@ if hexo-config('says.enable')
 @import "tag.styl"
 
 if hexo-config('about.enable')
-  @import "about.styl"
+  @import "about.styl"
+
+.author-content.author-content-item.sharePage
+  height 19rem
+  background-size cover
+  color var(--sco-white)
+  overflow hidden
+  margin-top 0
+
+.author-content-item
+  width 49%
+  border-radius 12px
+  background var(--sco-card-bg)
+  border var(--style-border-always)
+  box-shadow var(--sco-shadow-border)
+  position relative
+  padding 1rem 2rem
+  overflow hidden
+
+  &.single
+    width 100%
+
+  .author-content-item-title
+    font-size 36px
+    font-weight 700
+    line-height 1
+
+  .author-content-item-tips
+    opacity .8
+    font-size .6rem
+    margin-bottom .5rem
+
+  .content-bottom
+    margin-top auto
+    display flex
+    align-items center
+    justify-content space-between
+
+    .icon-group
+      display flex
+
+      i
+        display inline-block
+        width 22px
+        height 18px
+        margin-right .5rem
+
+  .card-content
+    position absolute
+    width 100%
+    height 100%
+    top 0
+    left 0
+    z-index 2
+    display flex
+    flex-direction column
+    padding 1rem 2rem
+
+    .author-content-item-title
+      margin-bottom .5rem
+
+    .banner-button-group
+      position absolute
+      bottom 1.5rem
+      right 2rem
+
+      .banner-button
+        height 40px
+        width 118px
+        border-radius 20px
+        justify-content center
+        background var(--sco-black-op)
+        color var(--sco-white)
+        display flex
+        align-items center
+        z-index 1
+        transition .3s
+        cursor pointer
+        backdrop-filter saturate(180%) blur(20px)
+        -webkit-backdrop-filter blur(20px)
+        transform translateZ(0)
+
+        &:hover
+          background var(--sco-main)
+          color var(--sco-white)
+
+        i
+          margin-right 8px
+          font-size 22px
+
+@media screen and (max-width: 768px)
+  .author-content-item
+    .card-content
+      .banner-button-group
+        right 1rem
+        bottom 1rem
+
+      .banner-button-group
+        .banner-button
+          background 0 0 !important
+          color var(--sco-white)
+          padding 0
+          width fit-content
+
+          i
+            margin-right 0
+            font-size 1.5rem
+
+      .banner-button-text
+        display none

package/source/css/_page/moment.styl

@@ -1,10 +1,3 @@
-.author-content.author-content-item.momentsPage
-  height 19rem
-  background-size cover
-  color var(--sco-white)
-  overflow hidden
-  margin-top 0
-
 #random-post
   min-height 32px
   background var(--sco-card-bg)

package/source/css/_page/says.styl

@@ -20,12 +20,6 @@ if hexo-config('says.home_mini')
 			font-size 16px
 
 if hexo-config('says.enable')
-	.author-content.author-content-item.essayPage
-		height 19rem
-		color var(--sco-white)
-		overflow hidden
-		margin-top 0
-
 	#bber
 		margin-top 1rem
 		width 100%

package/source/css/_search/algolia-search.styl

@@ -11,28 +11,47 @@
   background var(--sco-card-bg)
   border var(--style-border)
   transition 0.3s
-  border-radius 12px
+  border-radius 8px
+
+  &:hover
+    border var(--style-border-hover)
+    box-shadow var(--sco-shadow-theme)
 
   +maxWidth768()
-    top 0px
-    left 0px
-    margin 0px
+    top 0
+    left 0
+    margin 0
     width 100%
     height 100%
 
   .search-close-button
+    position absolute
+    top 0.8rem
+    right 1rem
+    color var(--sco-gray)
+    font-size 1.4em
+    line-height 1
+    cursor pointer
+    transition color .2s ease-in-out 0s
+
     &:hover
       color var(--sco-main)
 
-  .search-box
+  #algolia-input-panel
+    margin-bottom 8px
+
+  .search-box, .ais-SearchBox
     padding-top 8px
     max-width 100%
+    position relative
+    width 100%
+    min-width 100%
 
-    input
+    input, .ais-SearchBox-input
       height 100%
       width 100%
       padding 0.25rem 0.7rem
-      outline 0px
+      outline 0
       border var(--style-border)
       border-radius 8px
       background var(--sco-secondbg)
@@ -41,45 +60,10 @@
       &:focus
         border var(--style-border-hover)
 
-  .search-close-button
-    position absolute
-    top 0.8rem
-    right 1rem
-    color var(--sco-gray)
-    font-size 1.4em
-    line-height 1
-    cursor pointer
-    transition color .2s ease-in-out 0s
-
-#search-mask
-  position fixed
-  inset 0px
-  z-index 1000
-  display none
-  background rgba(0, 0, 0, 0.6)
-  backdrop-filter blur(12px)
-  -webkit-backdrop-filter blur(12px)
-  transform translateZ(0)
-  background var(--sco-maskbgdeep)
-
-.search-nav
-  display flex
-  align-items center
-  justify-content space-between
-  padding 0 0.2rem 0.7rem 0.2rem
-
-.search-dialog-title
-  font-weight bold
-  color var(--sco-main)
-  font-size 1.4em
-  line-height 1
-
-.search-box
-  input
-    &::placeholder
-      color var(--sco-gray)
+  .ais-Pagination
+    .ais-Pagination-item--disabled
+      visibility hidden
 
-#algolia-search
   #search-results
     padding 8px
     max-height calc(80vh - 130px)
@@ -117,29 +101,7 @@
     text-align center
     font-weight 600
 
-  .algolia-stats
-    color var(--sco-gray)
-    font-size .8rem
-    font-weight bold
-
-  .ais-SearchBox
-    padding-top: 8px
-    margin 0 auto
-    width 100%
-    min-width 100%
-    position relative
-
-  .ais-SearchBox-input
-    border-radius 8px
-    border var(--style-border)
-    padding 0.25rem 0.7rem
-    outline 0
-    background var(--sco-secondbg)
-    color var(--search-input-color)
-    width 100%
-    height 100%
-
-  .ais-Pagination-list.pagination
+  .ais-Pagination-list
     margin 0.2rem 0 0
     padding 0
     text-align center
@@ -159,48 +121,34 @@
       text-align center
       line-height 1.2rem
 
-  search-icon
-    animation sco-spin 1.2s linear infinite
-    opacity .6
-    font-size 2rem
+  .search-dialog__title
+    padding 0 0 0.7rem
+    color var(--sco-main)
+    font-size 1.4em
+    line-height 1
+
+  #algolia-tips
+    padding-top 12px
+    color var(--sco-secondtext)
+    right 0
+    margin auto
+
+    #algolia-stats
+      margin-bottom 10px
+      color var(--sco-gray)
+      font-size .8rem
+      font-weight bold
+
+  #algolia-search-results
+    padding-top 8px
 
 #search-mask
+  position fixed
+  inset 0
+  z-index 1000
+  display none
+  background rgba(0, 0, 0, 0.6)
   backdrop-filter blur(12px)
   -webkit-backdrop-filter blur(12px)
   transform translateZ(0)
-  background var(--sco-maskbgdeep)
-
-#algolia-input-panel
-  margin-bottom 8px
-
-.search-dialog
-  border-radius 12px !important
-  box-shadow var(--sco-shadow-lightblack)
-  background var(--sco-card-bg)
-  border var(--style-border)
-  transition .3s
-
-  &:hover
-    border var(--style-border-hover)
-    box-shadow var(--sco-shadow-theme)
-
-.search-dialog__title
-  padding 0 0 0.7rem
-  color var(--sco-main)
-  font-size 1.4em
-  line-height 1
-
-#algolia-tips
-  padding-top 12px
-  color var(--sco-secondtext)
-  right 0
-  margin auto
-
-  i
-    font-size 22px
-
-.algolia-tips-text
-  margin-left .4rem
-
-#algolia-search-results
-  padding-top 8px
+  background var(--sco-maskbgdeep)