Merge pull request #314 from XPoet/dev

Release new version
XPoet · Apr 3, 2024 · 4e54cc8 · 4e54cc8
2 parents 147c013 + fdd76b3
commit 4e54cc8
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 3 deletions.
diff --git a/_config.yml b/_config.yml
@@ -319,7 +319,7 @@ footer:
 
   site_deploy:
     enable: false        # Option values: true | false
-    provider: github     # Option values: github | vercel | netlify | gitee | aliyun | tencent_cloud | upyun
+    provider: github     # Option values: github | vercel | netlify | cloudflare | gitee | aliyun | tencent_cloud | upyun
     url:                 # Your deployment provider url, Can be null
 
   # When the footer style is shields, you can customize the shields configuration

diff --git a/languages/en.yml b/languages/en.yml
@@ -84,6 +84,7 @@ footer:
     vercel: Vercel
     netlify: Netlify
     gitee: Gitee Pages
+    cloudflare: Cloudflare
     aliyun: Alibaba Cloud
     tencent_cloud: Tencent Cloud
     upyun: UPYUN

diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
@@ -83,6 +83,7 @@ footer:
     github: GitHub Pages
     vercel: Vercel
     netlify: Netlify
+    cloudflare: Cloudflare
     gitee: Gitee Pages
     aliyun: 阿里云
     tencent_cloud: 腾讯云

diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
@@ -83,6 +83,7 @@ footer:
     github: GitHub Pages
     vercel: Vercel
     netlify: Netlify
+    cloudflare: Cloudflare
     gitee: Gitee Pages
     aliyun: 阿裏雲
     tencent_cloud: 騰訊雲

diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs
@@ -87,7 +87,7 @@ const web_master = bi_author || hexo_author
             <% } %>
 
             <% if (f_site_deploy?.enable === true && f_site_deploy?.provider) { %>
-                <% const deploy_provider_img_tag = image_tag('/images/deploy-provider/' + f_site_deploy?.provider + '.png') %>
+                <% const deploy_provider_img_tag = image_tag('/images/brands/' + f_site_deploy?.provider + '.png') %>
                 <div class="deploy-info info-item <%= footer_style_type %>">
                     <% if (f_site_deploy?.url) { %>
                         <a target="_blank" rel="nofollow" href="<%= f_site_deploy?.url %>">

diff --git a/source/images/deploy-provider/aliyun.png → source/images/brands/aliyun.png b/source/images/deploy-provider/aliyun.png → source/images/brands/aliyun.png
diff --git a/source/images/brands/cloudflare.png b/source/images/brands/cloudflare.png
diff --git a/source/images/deploy-provider/gitee.png → source/images/brands/gitee.png b/source/images/deploy-provider/gitee.png → source/images/brands/gitee.png
diff --git a/source/images/deploy-provider/github.png → source/images/brands/github.png b/source/images/deploy-provider/github.png → source/images/brands/github.png
diff --git a/source/images/brands/netlify.png b/source/images/brands/netlify.png
diff --git a/.../images/deploy-provider/tencent_cloud.png → source/images/brands/tencent_cloud.png b/.../images/deploy-provider/tencent_cloud.png → source/images/brands/tencent_cloud.png
diff --git a/source/images/deploy-provider/upyun.png → source/images/brands/upyun.png b/source/images/deploy-provider/upyun.png → source/images/brands/upyun.png
diff --git a/source/images/deploy-provider/vercel.png → source/images/brands/vercel.png b/source/images/deploy-provider/vercel.png → source/images/brands/vercel.png
diff --git a/source/images/deploy-provider/netlify.png b/source/images/deploy-provider/netlify.png
diff --git a/source/js/post/toc.js b/source/js/post/toc.js
@@ -15,9 +15,13 @@ function initTOC() {
       // get active index
       getActiveIndex(navSections) {
         if (!Array.isArray(navSections)) return
+        const offsetY = 20
+        const { isHideHeader, headerWrapperDom } = KEEP.utils
+        const headerH = isHideHeader ? 0 : headerWrapperDom.getBoundingClientRect().height
         let index = navSections.findIndex((element) => {
-          return element && element.getBoundingClientRect().top - 20 > 0
+          return element && element.getBoundingClientRect().top - (offsetY + headerH) > 0
         })
+
         if (index === -1) {
           index = navSections.length - 1
         } else if (index > 0) {