🏷️ 更新至3.0.0-RC-1 close #189, close #192, close #223, close #224, close #229, close 232, close #240

layout/includes/head/Open_Graph.pug

@@ -1,13 +1,5 @@
 - var contentType = is_post() ? 'article' : 'website'
 
-//- twitter meta
-if theme.twitter_meta
-  meta(name="twitter:card" content="summary")
-  meta(name="twitter:title" content=pageTitle)
-  meta(name="twitter:description" content!=pageDescription)
-  meta(name="twitter:image" content=full_url_for(page.cover || theme.avatar.img))
-
-//- Open_Graph
 if theme.Open_Graph_meta
   meta(property="og:type" content=contentType)
   meta(property="og:title" content=pageTitle)
@@ -17,3 +9,4 @@ if theme.Open_Graph_meta
   meta(property="og:image" content=full_url_for(page.cover || theme.avatar.img))
   meta(property="article:published_time" content=date_xml(page.date))
   meta(property="article:modified_time" content=date_xml(page.updated))
+  meta(name="twitter:card" content="summary")

layout/includes/head/aplayer.pug

@@ -0,0 +1,3 @@
+link(rel='stylesheet' href=url_for(theme.CDN.aplayer_css))
+script(src=url_for(theme.CDN.aplayer_js))
+script(src=url_for(theme.CDN.meting_js))

layout/includes/head/config.pug

@@ -31,7 +31,6 @@
     translate = JSON.stringify({
       defaultEncoding: theme.translate.defaultEncoding,
       translateDelay: theme.translate.translateDelay,
-      cookieDomain: theme.translate.cookieDomain,
       msgToTraditionalChinese: theme.translate.msgToTraditionalChinese,
       msgToSimplifiedChinese: theme.translate.msgToSimplifiedChinese
     })
@@ -60,7 +59,7 @@
   
   var Snackbar = 'undefined';
   if (theme.snackbar && theme.snackbar.enable) {
-  Snackbar = JSON.stringify({      
+  Snackbar = JSON.stringify({
     bookmark: {
       message_prev: _p("Snackbar.bookmark.message_prev"),
       message_next: _p("Snackbar.bookmark.message_next")
@@ -94,17 +93,18 @@ script.
     runtime: !{theme.runtimeshow.enable},
     copyright: !{copyright},
     ClickShowText: !{ClickShowText},
-    medium_zoom: !{theme.medium_zoom.enable},
-    fancybox: !{theme.fancybox.enable},
+    medium_zoom: !{theme.medium_zoom},
+    fancybox: !{theme.fancybox},
     Snackbar: !{Snackbar},
-    baiduPush: !{theme.baidu_push && theme.baidu_push.enable},
+    justifiedGallery: {
+      js: '!{theme.CDN.justifiedGallery_js}',
+      css: '!{theme.CDN.justifiedGallery_css}'
+    },
+    baiduPush: !{theme.baidu_push},
     highlightCopy: !{theme.highlight_copy},
     highlightLang: !{theme.highlight_lang},
-    highlightShrink: '!{theme.highlight_shrink}',
-    isFontAwesomeV5: !{theme.fontawesome_v5 && theme.fontawesome_v5.enable},
     isPhotoFigcaption: !{theme.photofigcaption},
-    islazyload: !{theme.lazyload},
-    isanchor: !{theme.anchor}
-    
+    islazyload: !{theme.lazyload.enable},
+    isanchor: !{theme.anchor}    
   }
 

layout/includes/head/config_site.pug

@@ -1,7 +1,17 @@
+-
+  let isHighlightShrink
+  if (theme.highlight_shrink == 'none') isHighlightShrink = 'undefined'
+  else if (page.highlight_shrink !== undefined) isHighlightShrink = page.highlight_shrink
+  else isHighlightShrink = theme.highlight_shrink
+
+  const pageToc = page.toc !== undefined ? page.toc : theme.toc.enable
+  const showToc = is_post() && pageToc && (toc(page.content) !== '' || page.encrypt == true )
+-
+
 script.
   var GLOBAL_CONFIG_SITE = { 
     isPost: !{is_post()},
     isHome: !{is_home()},
-    isSidebar: !{is_post() && page.toc !== false && theme.toc.enable && (toc(page.content) !== '' || page.encrypt == true )}  
+    isHighlightShrink: !{isHighlightShrink},
+    isSidebar: !{showToc}
     }
-

layout/includes/head/darkmode.pug

@@ -1,47 +1,56 @@
 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', '#000')
+    }
+  }
+  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', '#fff')
+    }
+  }
+
+  var getCookies = function (name) {
+    const value = `; ${document.cookie}`
+    const parts = value.split(`; ${name}=`)
+    if (parts.length === 2) return parts.pop().split(';').shift()
+  }
+
   var autoChangeMode = '#{theme.darkmode.autoChangeMode}'
-  var t = Cookies.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 t = getCookies('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 (t === undefined) {
       if (isLightMode) activateLightMode()
       else if (isDarkMode) activateDarkMode()
-      else if (isNotSpecified || hasNoSupport){
+      else if (isNotSpecified || hasNoSupport) {
         console.log('You specified no preference for a color scheme or your browser does not support it. I Schedule dark mode during night time.')
         var now = new Date()
         var hour = now.getHours()
-        var isNight = hour < 6 || hour >= 18
+        var isNight = hour <= 6 || hour >= 18
         isNight ? activateDarkMode() : activateLightMode()
-    }
-    } else if (t == 'light') activateLightMode()
+      }
+      window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
+        if (Cookies.get('theme') === undefined) {
+          e.matches ? 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 (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 activateDarkMode()
   } else {
-    if ( t == 'dark' ) activateDarkMode()
-    else if ( t == 'light') activateLightMode()
+    if (t === 'dark') activateDarkMode()
+    else if (t === 'light') activateLightMode()
   }
-
-  function activateDarkMode(){
-    document.documentElement.setAttribute('data-theme', 'dark')
-    if (document.querySelector('meta[name="theme-color"]') !== null){
-      document.querySelector('meta[name="theme-color"]').setAttribute('content','#000')
-    }
-  }
-  function activateLightMode(){
-    document.documentElement.setAttribute('data-theme', 'light')
-    if (document.querySelector('meta[name="theme-color"]') !== null){
-    document.querySelector('meta[name="theme-color"]').setAttribute('content','#fff')
-    }
-  }
-

layout/includes/head/dns_prefetch.pug

@@ -1,22 +0,0 @@
-link(rel="preconnect" href="//cdn.jsdelivr.net")
-link(rel="dns-prefetch" href="//cdn.jsdelivr.net")
-
-if theme.google_analytics
-  link(rel="preconnect" href="https://www.google-analytics.com" crossorigin)
-  link(rel="dns-prefetch" href="https://www.google-analytics.com")
-
-if theme.baidu_analytics
-  link(rel="preconnect" href="https://hm.baidu.com")
-  link(rel="dns-prefetch" href="https://hm.baidu.com")
-
-if theme.tencent_analytics
-  link(rel="preconnect" href="http://ta.qq.com")
-  link(rel="dns-prefetch" href="http://ta.qq.com")
-
-if theme.blog_title_font.font_link
-  link(rel="preconnect" href="https://fonts.googleapis.com" crossorigin)
-  link(rel="dns-prefetch" href="https://fonts.googleapis.com")
-
-if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-  link(rel="preconnect" href="//busuanzi.ibruce.info")
-  link(rel="dns-prefetch" href="//busuanzi.ibruce.info")

layout/includes/head/noscript.pug

@@ -1,6 +1,6 @@
 noscript. 
   <style>
-  #page-header {
+  #nav {
     opacity: 1
   }
   .justified-gallery img{

layout/includes/head/preconnect.pug

@@ -0,0 +1,19 @@
+link(rel="preconnect" href="//cdn.jsdelivr.net")
+
+if theme.google_analytics
+  link(rel="preconnect" href="//www.google-analytics.com" crossorigin)
+
+if theme.baidu_analytics
+  link(rel="preconnect" href="//hm.baidu.com")
+
+if theme.tencent_analytics
+  link(rel="preconnect" href="//ta.qq.com")
+
+if theme.blog_title_font.font_link && theme.blog_title_font.font_link.indexOf('//fonts.googleapis.com') != -1
+  link(rel="preconnect" href="//fonts.googleapis.com" crossorigin)
+
+if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
+  link(rel="preconnect" href="//busuanzi.ibruce.info")
+
+if theme.baidu_push
+  link(rel="preconnect" href="//zz.bdstatic.com")

layout/includes/head/subtitle.pug

@@ -15,7 +15,7 @@ if theme.subtitle.enable
           })
           .then(function (data) {
             if (subtitleEffect) {
-              var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
               var both = sub.unshift(data.text)
               var typed = new Typed('#subtitle', {
                 strings: sub,
@@ -45,7 +45,7 @@ if theme.subtitle.enable
           .then(function (data) {
             if (subtitleEffect) {
               var from = '出自 ' + data.from
-              var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
+              var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
               var both = sub.unshift(data.hitokoto, from)
               var typed = new Typed('#subtitle', {
                 strings: sub,
@@ -72,7 +72,7 @@ if theme.subtitle.enable
           var con = str[0]
           if (subtitleEffect) {
             var from = '出自 ' + str[1]
-            var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
+            var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
             var both = sub.unshift(con, from)
             var typed = new Typed('#subtitle', {
               strings: sub,
@@ -95,7 +95,7 @@ if theme.subtitle.enable
             var subtitleEffect = !{ subtitleEffect }
             jinrishici.load(function (result) {
               if (subtitleEffect) {
-                var sub = '!{theme.subtitle.sub}'.length == 0 ? new Array() : '!{theme.subtitle.sub}'.split(',')
+                var sub = "!{theme.subtitle.sub}".length == 0 ? new Array() : "!{theme.subtitle.sub}".split(',')
                 var content = result.data.content
                 var both = sub.unshift(content)
                 var typed = new Typed('#subtitle', {
@@ -119,7 +119,7 @@ if theme.subtitle.enable
       var subtitleEffect = !{subtitleEffect}
       if (subtitleEffect) { 
         var typed = new Typed("#subtitle", {
-          strings: '!{theme.subtitle.sub}'.split(","),
+          strings: "!{theme.subtitle.sub}".split(","),
           startDelay: 300,
           typeSpeed: 150,
           loop: !{theme.subtitle.loop},