From de8e35d0d0a54f024ca4f748083490ad0f8d4cce Mon Sep 17 00:00:00 2001 From: Jerry Date: Sat, 18 Sep 2021 22:10:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=BE=A9=E9=96=8B=E5=95=9F=20p?= =?UTF-8?q?hotofigcaption=20=E5=BE=8C=EF=BC=8C=E5=B0=8E=E8=87=B4=20inlineI?= =?UTF-8?q?mg=20=E6=A8=99=E7=B1=A4=E5=A4=96=E6=8E=9B=E9=A1=AF=E7=A4=BA?= =?UTF-8?q?=E9=8C=AF=E4=BA=82=E7=9A=84=20bug=20close=20#667=20fix:=20?= =?UTF-8?q?=E4=BF=AE=E5=BE=A9=E4=BD=BF=E7=94=A8=E6=9C=AC=E5=9C=B0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=99=82=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=82=BA=E4=B8=8D=E6=90=9C=E7=B4=A2=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E5=85=A7=E5=AE=B9=E6=9C=83=E7=84=A1=E6=B3=95=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=90=9C=E7=B4=A2=E7=9A=84=20bug=20close=20#666=20fix?= =?UTF-8?q?:=20=E4=BF=AE=E5=BE=A9=E5=8F=AF=E8=83=BD=E5=B0=8E=E8=87=B4?= =?UTF-8?q?=E7=9B=B8=E9=97=9C=E6=96=87=E7=AB=A0=E9=8F=88=E6=8E=A5=E5=87=BA?= =?UTF-8?q?=E9=8C=AF=E7=9A=84=20bug=20close=20#549=20improvement:=20?= =?UTF-8?q?=E8=AA=BF=E6=95=B4=E4=BB=A3=E7=A2=BC=E6=A1=86=E6=BB=BE=E5=8B=95?= =?UTF-8?q?=E6=A2=9D=E9=A1=8F=E8=89=B2=20close=20#651=20improvement:=20?= =?UTF-8?q?=E7=95=B6=E5=9C=96=E7=89=87=E6=B2=92=E6=9C=89=20figcaption=20?= =?UTF-8?q?=E6=99=82=EF=BC=8C=E4=B8=8D=E6=9C=83=E6=B7=BB=E5=8A=A0=20figcap?= =?UTF-8?q?tion=20=E4=BB=A3=E7=A2=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- scripts/helpers/related_post.js | 34 ++++++-------------------------- source/css/_highlight/theme.styl | 6 +++--- source/js/main.js | 5 +++-- source/js/search/local-search.js | 3 ++- 5 files changed, 16 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index edd6bd6..6b7b5e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "3.8.3", + "version": "3.8.4", "description": "A Simple and Card UI Design theme for Hexo", "main": "package.json", "scripts": { @@ -20,7 +20,7 @@ }, "bugs": { "url": "https://github.com/jerryc127/hexo-theme-butterfly/issues", - "email": "btf@immyw.com" + "email": "i@immyw.com" }, "dependencies": { "hexo-renderer-stylus": "^2.0.1", diff --git a/scripts/helpers/related_post.js b/scripts/helpers/related_post.js index 1e7efd4..2f8371a 100644 --- a/scripts/helpers/related_post.js +++ b/scripts/helpers/related_post.js @@ -46,11 +46,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { if (relatedPosts.length > 0) { result += '
' - result += - '
' + - ' ' + - headlineLang + - '
' + result += `
${headlineLang}
` result += '
' for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) { @@ -58,32 +54,14 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { relatedPosts[i].cover === false ? relatedPosts[i].randomcover : relatedPosts[i].cover - result += - '
' - result += - 'cover' + result += `
` + result += `cover` if (dateType === 'created') { - result += - '
' + - ' ' + - this.date(relatedPosts[i].created, hexoConfig.date_format) + - '
' + result += `
${this.date(relatedPosts[i].created, hexoConfig.date_format)}
` } else { - result += - '
' + - ' ' + - this.date(relatedPosts[i].updated, hexoConfig.date_format) + - '
' + result += `
${this.date(relatedPosts[i].updated, hexoConfig.date_format)}
` } - result += - '
' + relatedPosts[i].title + '
' + result += `
${relatedPosts[i].title}
` result += '
' } diff --git a/source/css/_highlight/theme.styl b/source/css/_highlight/theme.styl index 528f18e..58fc330 100644 --- a/source/css/_highlight/theme.styl +++ b/source/css/_highlight/theme.styl @@ -11,7 +11,7 @@ if $highlight_theme == 'darker' || ($highlight_theme == 'mac') color: alpha($highlight-foreground, .8), bg-color: darken($highlight-background, 2) } - $highlight-scrollbar = darken($highlight-background, 6) + $highlight-scrollbar = lighten($highlight-background, 8) if $highlighEnable $highlight-comment = #969896 @@ -37,7 +37,7 @@ if $highlight_theme == 'pale night' color: $highlight-foreground, bg-color: darken($highlight-background, 2) } - $highlight-scrollbar = darken($highlight-background, 6) + $highlight-scrollbar = lighten($highlight-background, 8) if $highlighEnable $highlight-comment = #676E95 @@ -63,7 +63,7 @@ if $highlight_theme == 'ocean' color: $highlight-foreground, bg-color: darken($highlight-background, 2) } - $highlight-scrollbar = darken($highlight-background, 5) + $highlight-scrollbar = lighten($highlight-background, 8) if $highlighEnable $highlight-comment = rgba(101, 115, 126, .8) diff --git a/source/js/main.js b/source/js/main.js index 4bf8839..41a21e4 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -225,10 +225,11 @@ document.addEventListener('DOMContentLoaded', function () { function addPhotoFigcaption () { document.querySelectorAll('#article-container img').forEach(function (item) { const parentEle = item.parentNode - if (!parentEle.parentNode.classList.contains('justified-gallery')) { + const altValue = item.alt + if (altValue && !parentEle.parentNode.classList.contains('justified-gallery')) { const ele = document.createElement('div') ele.className = 'img-alt is-center' - ele.textContent = item.getAttribute('alt') + ele.textContent = altValue parentEle.insertBefore(ele, item.nextSibling) } }) diff --git a/source/js/search/local-search.js b/source/js/search/local-search.js index 1abc7cf..5b13445 100644 --- a/source/js/search/local-search.js +++ b/source/js/search/local-search.js @@ -47,9 +47,10 @@ window.addEventListener('load', () => { .then(str => new window.DOMParser().parseFromString(str, 'text/xml')) .then(data => { const datas = [...data.querySelectorAll('entry')].map(function (item) { + const content = item.querySelector('content') return { title: item.querySelector('title').textContent, - content: item.querySelector('content').textContent, + content: content ? content.textContent : '', url: item.querySelector('url').textContent } })