Merge branch 'dev'

This commit is contained in:
Jerry committed 2023-01-18 20:28:07 +08:00
commit 062641c8ab
9 files changed
+109 -114

No files matched your search

+4 -6
View File
@@ -625,12 +625,9 @@ subtitle:
enable: false enable: false
# Typewriter Effect (打字效果) # Typewriter Effect (打字效果)
effect: true effect: true
# Effect Speed Options (打字效果速度參數) # Customize typed.js (配置typed.js)
startDelay: 300 # time before typing starts in milliseconds # https://github.com/mattboldt/typed.js/#customization
typeSpeed: 150 # type speed in milliseconds typed_option:
backSpeed: 50 # backspacing speed in milliseconds
# loop (循環打字)
loop: true
# source 調用第三方服務 # source 調用第三方服務
# source: false 關閉調用 # source: false 關閉調用
# source: 1 調用一言網的一句話(簡體) https://hitokoto.cn/ # source: 1 調用一言網的一句話(簡體) https://hitokoto.cn/
@@ -958,3 +955,4 @@ CDN:
# prismjs_autoloader: # prismjs_autoloader:
# artalk_js: # artalk_js:
# artalk_css: # artalk_css:
# busuanzi:
+3 -1
View File
@@ -28,7 +28,9 @@ else
- var top_img = false - var top_img = false
- var isHomeClass = 'not-top-img' - var isHomeClass = 'not-top-img'
header#page-header(class=isHomeClass style=bg_img) - const isFixedClass = theme.nav.fixed ? ' fixed' : ''
header#page-header(class=`${isHomeClass+isFixedClass}` style=bg_img)
!=partial('includes/header/nav', {}, {cache: true}) !=partial('includes/header/nav', {}, {cache: true})
if top_img !== false if top_img !== false
if is_post() if is_post()
+1 -2
View File
@@ -1,5 +1,4 @@
- const isFixedClass = theme.nav.fixed ? 'fixed' : '' nav#nav
nav#nav(class=isFixedClass)
span#blog-info span#blog-info
a(href=url_for('/') title=config.title) a(href=url_for('/') title=config.title)
if theme.nav.logo if theme.nav.logo
Loaded 3 of 9 files, more files were not shown because too many files have changed in this diff. Show more