diff --git a/_config.yml b/_config.yml index d68133e..0e78de7 100644 --- a/_config.yml +++ b/_config.yml @@ -42,16 +42,16 @@ style: # Mouse hover style settings hover: - # Shadow effect when the mouse hover. + # Shadow effect when the mouse hover shadow: false # Option values: true | false - # Scale effect when the mouse hovers. + # Scale effect when the mouse hovers scale: false # Option values: true | false # First screen style settings first_screen: enable: false # Option values: true | false - # Set transparent background for header. + # Set transparent background for header header_transparent: false # Option values: true | false # First screen background image (You can use local image or image external link) @@ -114,11 +114,11 @@ social_contact: # Home page article block display settings # --------------------------------------------------------------------------------------- home_article: - # Show category in home page article block. + # Show category in home page article block category: enable: false # Option values: true | false limit: 3 # Max number of categories shown in home page article block - # Show tags in home page article block. + # Show tags in home page article block tag: enable: false # Option values: true | false limit: 5 # Max number of tags shown in home page article block @@ -131,7 +131,7 @@ post: author_label: enable: true # Option values: true | false - # If true, show Lv1, Lv2, Lv3... + # If true, show Lv1, Lv2, Lv3 ... # If false, show custom_label_list auto: true # Option values: true | false @@ -168,7 +168,7 @@ code_block: toc: enable: false # Option values: true | false - # Automatically add list number to toc. + # Automatically add list number to toc number: false # Option values: true | false # If true, all level of TOC in a post will be displayed, rather than the activated part of it. @@ -218,7 +218,7 @@ comment: # https://gitalk.github.io gitalk: github_id: # GitHub repo owner - github_admins: # GitHub Admins (in Array type), optional. + github_admins: # GitHub Admins (in Array type), optional repository: # Repository name to store issues client_id: # GitHub Application Client ID client_secret: # GitHub Application Client Secret @@ -228,7 +228,7 @@ comment: # https://twikoo.js.org twikoo: env_id: # Tencent Cloud environment id - region: # Environment region. If select Guangzhou, fill in "ap-guangzhou". + region: # Environment region. If select Guangzhou, fill in "ap-guangzhou" version: 1.6.7 # Twikoo version, default use v1.6.7 # Waline @@ -270,6 +270,9 @@ pjax: # Footer settings # --------------------------------------------------------------------------------------- footer: - since: 2020 # the starting year of your website. Can be null - icp: # ICP record number of your website. Can be null - upyun: # If your site is deployed on upyun, your can fill the upyun url. Can be null + since: 2020 # The starting year of your website, Can be null + icp: # ICP record number of your website, Can be null + site_deploy: + enable: false # Option values: true | false + provider: github # Option values: github | vercel | netlify | gitee | aliyun | tencent_cloud | upyun + url: # Your deployment provider url, Can be null diff --git a/languages/en.yml b/languages/en.yml index de4af19..7225176 100644 --- a/languages/en.yml +++ b/languages/en.yml @@ -10,7 +10,6 @@ page: Page %d recent_posts: Recent Posts share: Share powered_by: "Powered by %s" -footer_upyun: "CDN acceleration and Cloud storage services are provided by %s" theme: Theme rss_feed: RSS Feed category: Category @@ -66,3 +65,12 @@ ago: week: "%s weeks ago" month: "%s months ago" year: "%s years ago" +footer_deploy: "This site is provided with deployment services by %s" +deploy_provider: + github: GitHub Pages + vercel: Vercel + netlify: Netlify + gitee: Gitee Pages + aliyun: Alibaba Cloud + tencent_cloud: Tencent Cloud + upyun: UPYUN diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index 2c8d536..c41adac 100644 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -10,7 +10,6 @@ page: 第 %d 页 recent_posts: 最新文章 share: 分享 powered_by: "由 %s 驱动" -footer_upyun: "本站由 %s 提供 CDN 加速和云存储服务" theme: 主题 rss_feed: RSS Feed category: 分类 @@ -66,3 +65,12 @@ ago: week: "%s 周前" month: "%s 个月前" year: "%s 年前" +footer_deploy: "本站由 %s 提供部署服务" +deploy_provider: + github: GitHub Pages + vercel: Vercel + netlify: Netlify + gitee: Gitee Pages + aliyun: 阿里云 + tencent_cloud: 腾讯云 + upyun: 又拍云 diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index 47b351d..e066d3b 100644 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -10,7 +10,6 @@ page: 第 %d 頁 recent_posts: 之前的文章 share: 分享 powered_by: "%s 框架" -footer_upyun: "本站由 %s 提供 CDN 加速和雲存儲服務" theme: 主題 rss_feed: RSS 訂閱 category: 分類 @@ -66,3 +65,12 @@ ago: week: "%s 周前" month: "%s 個月前" year: "%s 年前" +footer_deploy: "本站由 %s 提供部署服務" +deploy_provider: + github: GitHub Pages + vercel: Vercel + netlify: Netlify + gitee: Gitee Pages + aliyun: 阿裏雲 + tencent_cloud: 騰訊雲 + upyun: 又拍雲 diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs index 1361d78..5d0f3a5 100644 --- a/layout/_partial/footer.ejs +++ b/layout/_partial/footer.ejs @@ -1,5 +1,9 @@ <% -const { since: f_since, icp: f_icp, upyun: f_upyun } = theme.footer +const { + since: f_since, + icp: f_icp, + site_deploy: f_site_deploy +} = theme.footer const { author: bi_author } = theme.base_info const { author: hexo_author } = config const { site_uv: bsz_site_uv, site_pv: bsz_site_pv, enable: bsz_enable } = theme.website_count.busuanzi_count @@ -41,11 +45,18 @@ const { site_uv: bsz_site_uv, site_pv: bsz_site_pv, enable: bsz_enable } = theme <% } %> - <% if (f_upyun) { %> -
- - <%- __('footer_upyun', '') %> - + <% if (f_site_deploy?.enable === true && f_site_deploy?.provider !== '') { %> +
+ <% if (f_site_deploy?.url) { %> + + <% } %> + <%- __( + 'footer_deploy', + '' + ) %> + <% if (f_site_deploy?.url) { %> + + <% } %>
<% } %>
diff --git a/source/css/common/basic.styl b/source/css/common/basic.styl index 0727adf..882b949 100644 --- a/source/css/common/basic.styl +++ b/source/css/common/basic.styl @@ -261,6 +261,7 @@ button { padding 0.2rem 0.6rem color var(--text-color-6) font-size 0.8rem + letter-spacing 0.8px white-space nowrap background var(--text-color-1) border-radius 0.3rem diff --git a/source/css/layout/_partial/footer.styl b/source/css/layout/_partial/footer.styl index 8c2680c..55eaac9 100644 --- a/source/css/layout/_partial/footer.styl +++ b/source/css/layout/_partial/footer.styl @@ -2,7 +2,6 @@ color var(--text-color-4) font-size 1rem - a { color var(--text-color-4) @@ -12,25 +11,34 @@ } .info-container { + display flex + flex-direction column + align-items center + justify-content center padding-bottom 1rem - text-align center - } - .info-item { - margin 0.3rem 0 - color var(--text-color-4) + .info-item { + margin 0.2rem 0 + color var(--text-color-4) - &.ypyun-info a { - display flex - align-items center - justify-content center + &.deploy-info { + display flex - img { - margin 0 0.3rem + a + .tooltip { + display flex + align-items center + } + + img { + height 1.2rem + margin 0 0.4rem + } } } } + .icon-animate { animation icon-animate 1.2s ease-in-out infinite } diff --git a/source/css/layout/page.styl b/source/css/layout/page.styl index b89d619..9911857 100644 --- a/source/css/layout/page.styl +++ b/source/css/layout/page.styl @@ -13,14 +13,14 @@ &.is-home { .transparent-1 { background var(--header-transparent-background-1) - backdrop-filter: blur(4px); - -webkit-backdrop-filter: blur(4px); + -webkit-backdrop-filter blur(4px) + backdrop-filter blur(4px) } .transparent-2 { background var(--header-transparent-background-2) - backdrop-filter: blur(5px); - -webkit-backdrop-filter: blur(5px); + -webkit-backdrop-filter blur(5px) + backdrop-filter blur(5px) } } diff --git a/source/images/deploy-provider/aliyun.png b/source/images/deploy-provider/aliyun.png new file mode 100644 index 0000000..c4e9c7f Binary files /dev/null and b/source/images/deploy-provider/aliyun.png differ diff --git a/source/images/deploy-provider/gitee.png b/source/images/deploy-provider/gitee.png new file mode 100644 index 0000000..4701bbf Binary files /dev/null and b/source/images/deploy-provider/gitee.png differ diff --git a/source/images/deploy-provider/github.png b/source/images/deploy-provider/github.png new file mode 100644 index 0000000..0bd612d Binary files /dev/null and b/source/images/deploy-provider/github.png differ diff --git a/source/images/deploy-provider/netlify.png b/source/images/deploy-provider/netlify.png new file mode 100644 index 0000000..42e7e42 Binary files /dev/null and b/source/images/deploy-provider/netlify.png differ diff --git a/source/images/deploy-provider/tencent_cloud.png b/source/images/deploy-provider/tencent_cloud.png new file mode 100644 index 0000000..9abe109 Binary files /dev/null and b/source/images/deploy-provider/tencent_cloud.png differ diff --git a/source/images/deploy-provider/upyun.png b/source/images/deploy-provider/upyun.png new file mode 100644 index 0000000..98feb4d Binary files /dev/null and b/source/images/deploy-provider/upyun.png differ diff --git a/source/images/deploy-provider/vercel.png b/source/images/deploy-provider/vercel.png new file mode 100644 index 0000000..fc66aff Binary files /dev/null and b/source/images/deploy-provider/vercel.png differ diff --git a/source/images/upyun.png b/source/images/upyun.png deleted file mode 100644 index c5a3746..0000000 Binary files a/source/images/upyun.png and /dev/null differ