label: 3.2.0

fix: 修復當hexo的_config沒有設置description時，會導致pjax在頁面與文章間切換會無效 close #381 improvement: 當隱藏部分沒配置時，左下角設置按鈕會消失 #353 improvement: 網站背景可配置（顏色（HEX值/RGB值/顔色單詞/漸變色)/漸變色/圖片鏈接） improvement: 夜間模式下，背景顔色/top-img/footer-bg 設置為顔色時，不再強制顯示黑色，而是改為遮罩降低亮度
2026-04-10 21:17:07 +08:00 · 2020-09-28 21:55:47 +08:00
parent d5670e25e4
commit de11040293
11 changed files with 86 additions and 95 deletions
--- a/layout/404.pug
+++ b/layout/404.pug
@@ -13,8 +13,7 @@ html(lang=config.language data-theme=theme.display_mode)
      canvas.fireworks
    
    if theme.background
-      - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
-      #web_bg(data-type=is_photo)
+      #web_bg

    #error-wrap
      .error-content
--- a/layout/includes/head/darkmode.pug
+++ b/layout/includes/head/darkmode.pug
@@ -1,50 +1,53 @@
 if theme.darkmode.enable
  script.
-    var activateDarkMode = function () {
-      document.documentElement.setAttribute('data-theme', 'dark')
-      if (document.querySelector('meta[name="theme-color"]') !== null) {
-        document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
-      }
-    }
-    var activateLightMode = function () {
-      document.documentElement.setAttribute('data-theme', 'light')
-      if (document.querySelector('meta[name="theme-color"]') !== null) {
-        document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
-      }
-    }
-
-    var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-    var t = saveToLocal.get('theme')
-    if (autoChangeMode === '1') {
-      var isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
-      var isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
-      var isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
-      var hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
-
-      if (t === undefined) {
-        if (isLightMode) activateLightMode()
-        else if (isDarkMode) activateDarkMode()
-        else if (isNotSpecified || hasNoSupport) {
-          var now = new Date()
-          var hour = now.getHours()
-          var isNight = hour <= 6 || hour >= 18
-          isNight ? activateDarkMode() : activateLightMode()
+    (function () {
+      window.activateDarkMode = function () {
+        document.documentElement.setAttribute('data-theme', 'dark')
+        if (document.querySelector('meta[name="theme-color"]') !== null) {
+          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
        }
-        window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
-          if (saveToLocal.get('theme') === undefined) {
-            e.matches ? activateDarkMode() : activateLightMode()
+      }
+      window.activateLightMode = function () {
+        document.documentElement.setAttribute('data-theme', 'light')
+        if (document.querySelector('meta[name="theme-color"]') !== null) {
+          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
+        }
+      }
+
+      const autoChangeMode = '#{theme.darkmode.autoChangeMode}'
+      const t = saveToLocal.get('theme')
+      if (autoChangeMode === '1') {
+        const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
+        const isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches
+        const isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches
+        const hasNoSupport = !isDarkMode && !isLightMode && !isNotSpecified
+
+        if (t === undefined) {
+          if (isLightMode) activateLightMode()
+          else if (isDarkMode) activateDarkMode()
+          else if (isNotSpecified || hasNoSupport) {
+            const now = new Date()
+            const hour = now.getHours()
+            const isNight = hour <= 6 || hour >= 18
+            isNight ? activateDarkMode() : activateLightMode()
          }
-        })
-      } else if (t === 'light') activateLightMode()
-      else activateDarkMode()
-    } else if (autoChangeMode === '2') {
-      now = new Date()
-      hour = now.getHours()
-      isNight = hour <= 6 || hour >= 18
-      if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
-      else if (t === 'light') activateLightMode()
-      else activateDarkMode()
-    } else {
-      if (t === 'dark') activateDarkMode()
-      else if (t === 'light') activateLightMode()
-    }
+          window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
+            if (saveToLocal.get('theme') === undefined) {
+              e.matches ? activateDarkMode() : activateLightMode()
+            }
+          })
+        } else if (t === 'light') activateLightMode()
+        else activateDarkMode()
+      } else if (autoChangeMode === '2') {
+        const now = new Date()
+        const hour = now.getHours()
+        const isNight = hour <= 6 || hour >= 18
+        if (t === undefined) isNight ? activateDarkMode() : activateLightMode()
+        else if (t === 'light') activateLightMode()
+        else activateDarkMode()
+      } else {
+        if (t === 'dark') activateDarkMode()
+        else if (t === 'light') activateLightMode()
+      }
+    })()
+
--- a/layout/includes/layout.pug
+++ b/layout/includes/layout.pug
@@ -12,8 +12,7 @@ html(lang=config.language data-theme=theme.display_mode)

    #body-wrap
      if theme.background
-        - var is_photo = theme.background.startsWith('url') ? 'photo':'color'
-        #web_bg(data-type=is_photo)
+        #web_bg

      include ./sidebar.pug
      include ./header/index.pug
--- a/layout/includes/rightside.pug
+++ b/layout/includes/rightside.pug
@@ -1,28 +1,31 @@
 section#rightside
  #rightside-config-hide
-    if is_post()
-      if theme.readmode
-        button#readmode(type="button" title=_p('rightside.readmode_title'))
-          i.fas.fa-book-open
-    if theme.translate && theme.translate.enable
+    if is_post() && theme.readmode
+      button#readmode(type="button" title=_p('rightside.readmode_title'))
+        i.fas.fa-book-open
+    if theme.translate.enable
      button#translateLink(type="button" title=_p('rightside.translate_title'))= theme.translate.default
    if theme.darkmode.enable && theme.darkmode.button
      button#darkmode(type="button" title=_p('rightside.night_mode_title'))
        i.fas.fa-adjust
  #rightside-config-show
-    button#rightside_config(type="button" title=_p("rightside.setting"))
-      i.fas.fa-cog
-    if is_post() && page.comments !== false && theme.comments.use
-      a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
-        i.fas.fa-comments
-    if showToc
-      button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
-        i.fas.fa-list-ul
+    if is_post()
+      if (theme.readmode || theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button))
+        button#rightside_config(type="button" title=_p("rightside.setting"))
+          i.fas.fa-cog
+      if commentsJsLoad
+        a#to_comment(href="#post-comment" title=_p("rightside.scroll_to_comment"))
+          i.fas.fa-comments
+      if showToc
+        button#mobile-toc-button.close(type="button" title=_p("rightside.toc"))
+          i.fas.fa-list-ul
+    else if theme.translate.enable || (theme.darkmode.enable && theme.darkmode.button)
+      button#rightside_config(type="button" title=_p("rightside.setting"))
+        i.fas.fa-cog
+
    if theme.chat_btn
      button#chat_btn(type="button" title=_p("rightside.chat_btn"))
        i.fas.fa-sms

    button#go-up(type="button" title=_p("rightside.back_to_top"))
-      i.fas.fa-arrow-up
-
-
+      i.fas.fa-arrow-up
--- a/layout/includes/third-party/pjax.pug
+++ b/layout/includes/third-party/pjax.pug
@@ -7,7 +7,6 @@ script(src=url_for(theme.CDN.pjax))
 script.
  let pjaxSelectors = [
    'title',
-    'meta[name=description]',
    '#config_change',
    '#body-wrap',
    '#rightside-config-hide',