🚀 升级主题版本至 4.2.0 - b2

ccknbc-actions · Apr 17, 2022 · 45dc51c · 45dc51c
1 parent 1313f98
commit 45dc51c
Show file tree

Hide file tree

Showing 11 changed files with 291 additions and 207 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/themes/butterfly/_config.yml b/themes/butterfly/_config.yml
@@ -51,6 +51,8 @@ algolia_search:
 # Local search
 local_search:
   enable: false
+  preload: false
+  CDN:
 
 # Math (數學)
 # --------------------------------------

diff --git a/themes/butterfly/layout/includes/head/config.pug b/themes/butterfly/layout/includes/head/config.pug
@@ -19,7 +19,8 @@
   let localSearch = 'undefined';
   if (theme.local_search && theme.local_search.enable) {
     localSearch = JSON.stringify({
-      path: config.search.path,
+      path: theme.local_search.CDN ? theme.local_search.CDN : config.root + config.search.path,
+      preload: theme.local_search.preload,
       languages: {
         // search languages
         hits_empty: _p("search.local_search.hits_empty"),

diff --git a/themes/butterfly/package.json b/themes/butterfly/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "4.2.0-b1",
+  "version": "4.2.0-b2",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {

diff --git a/themes/butterfly/scripts/helpers/related_post.js b/themes/butterfly/scripts/helpers/related_post.js
@@ -54,14 +54,15 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
         relatedPosts[i].cover === false
           ? relatedPosts[i].randomcover
           : relatedPosts[i].cover
-      result += `<div><a href="${this.url_for(relatedPosts[i].path)}" title="${this.escape_html(relatedPosts[i].title)}">`
+      const title = this.escape_html(relatedPosts[i].title)
+      result += `<div><a href="${this.url_for(relatedPosts[i].path)}" title="${title}">`
       result += `<img class="cover" src="${this.url_for(cover)}" alt="cover">`
       if (dateType === 'created') {
         result += `<div class="content is-center"><div class="date"><i class="far fa-calendar-alt fa-fw"></i> ${this.date(relatedPosts[i].created, hexoConfig.date_format)}</div>`
       } else {
         result += `<div class="content is-center"><div class="date"><i class="fa-solid fa-history fa-fw"></i> ${this.date(relatedPosts[i].updated, hexoConfig.date_format)}</div>`
       }
-      result += `<div class="title">${this.escape_html(relatedPosts[i].title)}</div>`
+      result += `<div class="title">${title}</div>`
       result += '</div></a></div>'
     }
 

diff --git a/themes/butterfly/source/css/_layout/third-party.styl b/themes/butterfly/source/css/_layout/third-party.styl
@@ -99,6 +99,7 @@ mjx-container[display],
 .has-jax
   overflow-x: auto
   overflow-y: hidden
+  line-height: normal !important
 
 .aplayer
   color: $font-black

diff --git a/themes/butterfly/source/css/_search/algolia.styl b/themes/butterfly/source/css/_search/algolia.styl
@@ -11,7 +11,8 @@
         color: var(--search-input-color)
 
     .ais-Hits-list
-      padding-left: 24px
+      margin: 0
+      padding: 0
       @extend .list-beauty
 
       a
@@ -25,12 +26,17 @@
         color: $search-keyword-highlight
         font-weight: bold
 
+    .algolia-hit-item-content
+      margin: 0 0 8px
+      word-break: break-all
+
     .ais-Pagination
-      margin: 16px 0 0
+      margin: 20px 0 0
       padding: 0
       text-align: center
 
       .ais-Pagination-list
+        margin: 0
         padding: 0
         list-style: none
 
@@ -52,9 +58,31 @@
           color: #eee
           cursor: default
 
+      .ais-Pagination-item--disabled
+        visibility: hidden
+
     .ais-Stats-text
       display: inline
       float: left
+
     .ais-PoweredBy
+      padding-top: 5px
       display: inline
-      float: right
+      float: right
+
+    #algolia-hits
+      > div
+        overflow-y: scroll
+
+        +minWidth768()
+          max-height: calc(80vh - 240px)
+
+        +maxWidth768()
+          height: calc(100vh - 260px)
+
+.apple
+  #algolia-search
+    #algolia-hits
+      > div
+        +maxWidth768()
+          height: calc(90vh - 260px)
diff --git a/themes/butterfly/source/css/_search/index.styl b/themes/butterfly/source/css/_search/index.styl
@@ -1,6 +1,6 @@
 .search-dialog
   position: fixed
-  top: 100px
+  top: 10%
   left: 50%
   z-index: 1001
   display: none

diff --git a/themes/butterfly/source/css/_search/local-search.styl b/themes/butterfly/source/css/_search/local-search.styl
@@ -60,7 +60,7 @@
 
     .search-result-list
       overflow-y: auto
-      max-height: 210px
+      max-height: calc(80vh - 130px)
 
       +maxWidth768()
         padding-bottom: 40px

diff --git a/themes/butterfly/source/js/search/algolia.js b/themes/butterfly/source/js/search/algolia.js
@@ -43,16 +43,13 @@ window.addEventListener('load', () => {
     return console.error('Algolia setting is invalid!')
   }
 
-  const searchClient = window.algoliasearch(algolia.appId, algolia.apiKey)
-	const search = instantsearch({
-		indexName: algolia.indexName,
-		searchClient,
-		searchFunction(helper) {
-			if (helper.state.query) {
-				helper.search();
-			}
-		}
-	})
+  const search = instantsearch({
+    indexName: algolia.indexName,
+    searchClient: algoliasearch(algolia.appId, algolia.apiKey),
+    searchFunction(helper) {
+      helper.state.query && helper.search()
+    },
+  })
 
   search.addWidgets([
     instantsearch.widgets.searchBox({