所有文件提交

themes/butterfly/layout/includes/head/config.pug

@@ -72,20 +72,16 @@
     })
   }
 
-  let highlight = 'undefined'
-  let syntaxHighlighter = config.syntax_highlighter
-  let highlightEnable = syntaxHighlighter ? ['highlight.js', 'prismjs'].includes(syntaxHighlighter) : (config.highlight.enable || config.prismjs.enable)
-  if (highlightEnable) {
-    const { copy, language, height_limit, fullpage, macStyle } = theme.code_blocks
-    highlight = JSON.stringify({
-      plugin: syntaxHighlighter ? syntaxHighlighter : config.highlight.enable ? 'highlight.js' : 'prismjs',
-      highlightCopy: copy,
-      highlightLang: language,
-      highlightHeightLimit: height_limit,
-      highlightFullpage: fullpage,
-      highlightMacStyle: macStyle
-    })
-  }
+  let highlightProvider = config.syntax_highlighter || (config.highlight.enable ? 'highlight.js' : config.prismjs.enable ? 'prismjs' : null)
+  const { copy, language, height_limit, fullpage, macStyle, shrink } = theme.code_blocks
+  let highlight = JSON.stringify({
+    plugin: highlightProvider,
+    highlightCopy: copy,
+    highlightLang: language,
+    highlightHeightLimit: height_limit,
+    highlightFullpage: fullpage,
+    highlightMacStyle: macStyle
+  })
 
 script.
   const GLOBAL_CONFIG = {

themes/butterfly/layout/includes/header/nav.pug

@@ -10,24 +10,17 @@ nav#nav
         span.site-name=(page.title || config.title)
         span.site-name
           i.fa-solid.fa-circle-arrow-left
-          span= '' + _p('post.back_to_home')
+          span= '  ' + _p('post.back_to_home')
 
   #menus
-    //- if theme.search.use
-    //-   #search-button
-    //-     span.site-page.social-icon.search
-    //-       i.fas.fa-search.fa-fw
-    //-       span= ' ' + _p('search.title')
+    if theme.search.use
+      #search-button
+        span.site-page.social-icon.search
+          i.fas.fa-search.fa-fw
+          span= ' ' + _p('search.title')
     if theme.menu
       != partial('includes/header/menu_item', {}, {cache: true})
-  #nav-right
-    if theme.search.use || true
-      #random-post-button
-        a.site-page.social-icon#random-post-link(href='javascript:void(0);' onclick='randomPost()')
-          i.fas.fa-solid.fa-shuffle
-      #search-button
-        a.site-page.social-icon.search-typesense-trigger
-          i.fas.fa-search.fa-fw
+
       #toggle-menu
         span.site-page
           i.fas.fa-bars.fa-fw

themes/butterfly/layout/includes/layout.pug

@@ -41,7 +41,6 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
 
     #body-wrap(class=pageType)
       include ./header/index.pug
-      include ./others/memos_home.pug
 
       main#content-inner.layout(class=hideAside)
         if body
@@ -57,5 +56,4 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
         !=partial('includes/footer', {}, {cache: true})
 
     include ./rightside.pug
-    include ./additional-js.pug
-    include ./rightmenu.pug
+    include ./additional-js.pug