Merge pull request #123 from XPoet/dev

2021-10-19 23:27:57 +08:00 · 2021-10-19 23:27:57 +08:00 · b25420b021
parent 827ca6faeb e644395731
commit b25420b021
12 changed files with 219 additions and 61 deletions
--- a/README.md
+++ b/README.md
@ -1,7 +1,9 @@
 <div align="right">
  Language:
  English
-  <a title="Chinese" href="README_zh-CN.md">中文</a>
+  <a title="Chinese" href="README_zh-CN.md">简中</a>
+  <a title="Chinese" href="README_zh-TW.md">繁中</a>
+  
 </div>

 <a href="https://xpoet.cn"><img align="center" alt="Keep" src="https://cdn.jsdelivr.net/gh/XPoet/image-hosting@master/hexo-theme-keep/keep-logo-slogan.svg"></a>
@ -108,5 +110,5 @@ This project exists thanks to all the people who contribute.

 ## :memo: License

-[MIT](https://github.com/XPoet/picx/blob/master/LICENSE) Copyright © 2020 XPoet
+[MIT](https://github.com/XPoet/picx/blob/master/LICENSE) Copyright © 2020-2021 XPoet

--- a/README_zh-CN.md
+++ b/README_zh-CN.md
@ -1,7 +1,8 @@
 <div align="right">
  语言:
-  中文
+  简中
  <a title="Chinese" href="README.md">English</a>
+  <a title="Chinese" href="README_zh-TW.md">繁中</a>
 </div>

 <a href="https://xpoet.cn"><img align="center" alt="Keep" src="https://cdn.jsdelivr.net/gh/XPoet/image-hosting@master/hexo-theme-keep/keep-logo-slogan.svg"></a>
@ -108,4 +109,4 @@ $ git stash pop

 ## :memo: 许可

-[MIT](https://github.com/XPoet/picx/blob/master/LICENSE) Copyright © 2020 XPoet
+[MIT](https://github.com/XPoet/picx/blob/master/LICENSE) Copyright © 2020-2021 XPoet
--- a/README_zh-TW.md
+++ b/README_zh-TW.md
@ -0,0 +1,112 @@
+<div align="right">
+  語言:
+  繁中
+  <a title="Chinese" href="README.md">English</a>
+  <a title="Chinese" href="README_zh-CN.md">简中</a>
+</div>
+
+<a href="https://xpoet.cn"><img align="center" alt="Keep" src="https://cdn.jsdelivr.net/gh/XPoet/image-hosting@master/hexo-theme-keep/keep-logo-slogan.svg"></a>
+
+# hexo-theme-keep
+
+«Keep» 是一款簡約優雅的 [Hexo](https://hexo.io) 主題。它能讓你更專注於寫作。
+
+[![Github License](https://img.shields.io/github/license/XPoet/hexo-theme-keep.svg?style=flat-square)](https://github.com/XPoet/hexo-theme-ils/blob/master/LICENSE)
+[![Github Release](https://img.shields.io/github/release/XPoet/hexo-theme-keep.svg?style=flat-square)](https://github.com/XPoet/hexo-theme-ils/releases)
+[![NPM version](https://img.shields.io/npm/v/hexo-theme-keep?color=red&logo=npm&style=flat-square)](https://www.npmjs.com/package/hexo-theme-keep)
+[![Required Hexo version](https://img.shields.io/badge/hexo-%3E=5.0.0-blue?style=flat-square&logo=hexo)](https://hexo.io)
+[![Node.js Version](https://img.shields.io/badge/node-%3E=12.0-success.svg?style=flat-square&logo=Node.js&longCache=true)](https://hexo.io)
+[![jsDelivr hits](https://img.shields.io/jsdelivr/npm/hm/hexo-theme-keep?style=flat-square&logo=jsdelivr)](https://www.jsdelivr.com/package/npm/hexo-theme-keep)
+
+## :star2: 線上預覽
+
+- **[XPoet's Blog](https://xpoet.cn/)**
+- **[keep 預覽網頁](https://keep.xpoet.cn/)**
+- **[keep 官方文檔](https://keep-docs.xpoet.cn/)**
+
+## :rocket: 安装
+
+如果你在使用 Hexo 5.0 或更高版本，最簡單的安裝方式是透過 npm：
+
+```sh
+$ cd hexo-site
+$ npm install hexo-theme-keep
+```
+
+你也可以直接 clone 整個原始碼庫：
+
+```sh
+$ cd hexo-site
+$ git clone https://github.com/XPoet/hexo-theme-keep themes/keep
+```
+
+安裝完成後，在 Hexo 配置文件中將 `theme` 設定為 `keep`。
+
+```yml
+theme: keep
+```
+
+## :wrench: 使用
+
+請查看 «Keep» 官方文檔：
+
+- **[Keep 官方文檔](https://keep-docs.xpoet.cn/)**
+- **[Keep 主題配置指南](https://keep-docs.xpoet.cn/usage-tutorial/configuration-guide.html)**
+- **[Keep 主題進階使用](https://keep-docs.xpoet.cn/usage-tutorial/advanced.html)**
+
+不推薦直接修改 «Keep» 主題的文件。因為這可能導致錯誤（例如 git merge 衝突），並且在更新主題時修改的文件可能丟失。
+
+## :dart: 更新
+
+«Keep» 不定期發布新版本。你可以透過如下命令更新 «Keep»。
+
+透過 npm 安裝最新版本：
+
+```sh
+$ cd hexo-site
+$ npm update hexo-theme-keep
+```
+
+或者透過 git 更新到最新的 master 分支：
+
+```sh
+$ cd themes/keep
+$ git pull
+```
+
+_如果你修改了主題原始碼：_
+
+```sh
+$ git add .
+$ git stash
+$ git pull
+$ git stash pop
+```
+
+## :art: 貢獻
+
+我們歡迎你加入 «Keep» 的開發，貢獻出你的一份力量。請看[Keep 原始碼貢獻指南](https://keep.xpoet.cn/2020/11/Keep-代码贡献指南/)。
+
+## :clapper: 貢獻者
+
+這個項目的存在多虧了所有的貢獻者。
+
+<a href="https://github.com/XPoet/hexo-theme-keep/graphs/contributors">
+  <img src="https://opencollective.com/hexo-theme-keep/contributors.svg?width=880">
+</a>
+
+## :sparkling_heart: 銘謝
+
+«Keep» 特别感謝這些支持我們核心基本設施的優質服務：
+
+<a href="https://github.com"><img height="38" src="https://cdn.jsdelivr.net/gh/XPoet/image-hosting@master/hexo-theme-keep/GitHub-LOGO.5sq0168mirg0.png"></a>
+
+> GitHub 允許我們存放 Git 原始碼庫及運行測試。
+
+<a href="https://www.jsdelivr.com"><img height="38" src="https://cdn.jsdelivr.net/gh/XPoet/image-hosting@master/hexo-theme-keep/jsDelivr-LOGO.png"></a>
+
+> jsDelivr 提供了 CDN 服務。
+
+## :memo: 許可
+
+[MIT](https://github.com/XPoet/picx/blob/master/LICENSE) Copyright © 2020-2021 XPoet
--- a/_config.yml
+++ b/_config.yml
@ -8,13 +8,12 @@ base_info:
  # Logo image (You can use local image, image external link or don’t fill)
  logo_img:

-
 # ---------------------------------------------------------------------------------------
 # Theme style settings
 # ---------------------------------------------------------------------------------------
 style:
  # Theme primary color
-  primary_color: '#0066CC'
+  primary_color: "#0066CC"

  # Avatar (You can use local image or image external link)
  avatar: /images/avatar.svg
@ -49,7 +48,6 @@ style:
    percent:
      enable: false

-
 # ---------------------------------------------------------------------------------------
 # Social contact link
 # ---------------------------------------------------------------------------------------
@ -65,7 +63,6 @@ social_contact:
    facebook: # your facebook URL
    email: # your email

-
 # ---------------------------------------------------------------------------------------
 # Navigation menu
 # ---------------------------------------------------------------------------------------
@ -79,7 +76,6 @@ menu:
  # Changelog: /changelog
  # ......

-
 # ---------------------------------------------------------------------------------------
 # Home page article block display settings
 # ---------------------------------------------------------------------------------------
@ -91,7 +87,6 @@ home_article:
    enable: false # show tags in home page article block
    limit: 5 # max number of tags shown in home page article block

-
 # ---------------------------------------------------------------------------------------
 # Post page Settings
 # ---------------------------------------------------------------------------------------
@ -111,7 +106,6 @@ post:
    # label array item can be one or more
    custom_label_list: ["Trainee", "Engineer", "Architect", "CTO", "BOSS"]

-
 # ---------------------------------------------------------------------------------------
 # Code copy
 # ---------------------------------------------------------------------------------------
@ -119,7 +113,6 @@ code_copy:
  enable: false
  style: default # values: default | mac

-
 # ---------------------------------------------------------------------------------------
 # Table of Contents in the Sidebar
 # ---------------------------------------------------------------------------------------
@ -135,14 +128,12 @@ toc:
  # If true, open TOC every time when you enter the article page
  init_open: false

-
 # ---------------------------------------------------------------------------------------
 # Post copyright info
 # ---------------------------------------------------------------------------------------
 copyright_info:
  enable: false

-
 # ---------------------------------------------------------------------------------------
 # Website count
 # ---------------------------------------------------------------------------------------
@ -155,7 +146,6 @@ website_count:
    site_pv: false
    page_pv: false

-
 # ---------------------------------------------------------------------------------------
 # Local Search
 # Dependencies: hexo-generator-searchdb
@ -165,7 +155,6 @@ local_search:
  enable: false
  preload: false # Preload the search data when the page loads

-
 # ---------------------------------------------------------------------------------------
 # Comment plugin
 # ---------------------------------------------------------------------------------------
@ -194,7 +183,6 @@ comment:
    env_id: # Tencent Cloud environment id
    region: # environment region. If select Guangzhou, fill in "ap-guangzhou".

-
 # ---------------------------------------------------------------------------------------
 # RSS
 # Dependencies: hexo-generator-feed
@ -203,35 +191,31 @@ comment:
 rss:
  enable: false

-
 # ---------------------------------------------------------------------------------------
 # Lazyload image
 # ---------------------------------------------------------------------------------------
 lazyload:
  enable: false

-
 # ---------------------------------------------------------------------------------------
 # CDN
 # ---------------------------------------------------------------------------------------
 cdn:
  enable: false

-
 # ---------------------------------------------------------------------------------------
 # PJAX
 # ---------------------------------------------------------------------------------------
 pjax:
  enable: false

-
 # ---------------------------------------------------------------------------------------
 # 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: # url

 # ---------------------------------------------------------------------------------------
 # Keep version (Please don't modify)
--- a/languages/zh-TW.yml
+++ b/languages/zh-TW.yml
@ -0,0 +1,46 @@
+search: 搜尋...
+prev: 上一頁
+next: 下一頁
+prev_posts: 上一篇
+next_posts: 下一篇
+page: 第 %d 頁
+recent_posts: 之前的文章
+share: 分享
+powered_by: "%s 框架"
+theme: 主題
+rss_feed: RSS 訂閱
+category: 分類
+categories: 分類
+tag: 標籤
+tags: 標籤
+tagcloud: 標籤雲
+comment: 留言
+comments: 留言
+home: 首頁
+archive: 歸檔
+archives: 歸檔
+about: 關於
+site_uv: 讀者
+site_pv: 閱覽
+links: 友鏈
+link: 友鏈
+top: 頂端
+read_more: 繼續閱讀...
+wordcount: 字數
+min2read: 分鐘
+changelog: 日誌
+copyright:
+  author: 文章作者
+  title: 文章標題
+  link: 永久連結
+  create_time: 撰寫時間
+  license_title: 版權宣告
+  license_content: "這個網站所有文章均使用 %s 授權。"
+ago:
+  second: "%s 秒前"
+  minute: "%s 分鐘前"
+  hour: "%s 小時前"
+  day: "%s 天前"
+  week: "%s 周前"
+  month: "%s 個月前"
+  year: "%s 年前"
--- a/layout/_partial/footer.ejs
+++ b/layout/_partial/footer.ejs
@ -3,7 +3,8 @@
        <div class="copyright-info info-item">
            &copy;
            <% if (theme.footer.hasOwnProperty('since') && theme.footer.since) { %>
-              <span><%= theme.footer.since %></span>&nbsp;-&nbsp;
+              <span><%= theme.footer.since %></span>
+              -
            <% } %>
            <%= date(new Date(), 'YYYY') %>&nbsp;<i class="fas fa-heart icon-animate"></i>&nbsp;<a href="/"><%= theme.base_info.author || config.author %></a>
        </div>
@ -28,5 +29,10 @@
        <% if (theme.footer.hasOwnProperty('icp') && theme.footer.icp) { %>
            <div class="icp-info info-item"><a target="_blank" rel="nofollow" href="https://beian.miit.gov.cn"><%= theme.footer.icp %></a></div>
        <% } %>
+        <% if (theme.footer.hasOwnProperty('upyun') && theme.footer.upyun) { %>
+            <div class="icp-info info-item"><a target="_blank" rel="nofollow" href="<%= theme.footer.upyun %>">本网站由
+                <img src="/images/upyun.png" alt="upyun" srcset="" height="24" style="position:relative; top:6px">
+                提供CDN加速/云存储服务</a></div>
+        <% } %>
    </div>
 </footer>
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@ -1,8 +1,8 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <meta name="keywords" content="<%= config.keywords || 'Hexo Theme Keep' %>">
-    <meta name="description" content="<%= config.description || 'Hexo Theme Keep' %>">
+    <meta name="keywords" content="<%= page.keywords || config.keywords || 'Hexo Theme Keep' %>">
+    <meta name="description" content="<%= page.description || config.description || 'Hexo Theme Keep' %>">
    <meta name="author" content="<%= theme.base_info.author || config.author || 'Keep Team' %>">
    <%
    let title = page.title;
--- a/source/css/common/basic.styl
+++ b/source/css/common/basic.styl
@ -36,6 +36,9 @@
 // html, body
 // ======================================================================
 html, body {
+  position: relative;
+  width: 100%;
+  height: 100%;
  margin: 0;
  padding: 0;
  color: var(--default-text-color);
--- a/source/css/layout/page.styl
+++ b/source/css/layout/page.styl
@ -3,6 +3,10 @@ $page-aside-width = $temp-width ? convert($temp-width):260px;

 .page-container {
  position: relative;
+  box-sizing: border-box;
+  width: 100%;
+  height: auto;
+  background: var(--background-color);
  transition-t("padding-left", "0", "0.3", "ease-out");


@ -85,7 +89,6 @@ $page-aside-width = $temp-width ? convert($temp-width):260px;
      display: flex;
      justify-content: center;
      padding: $component-spacing-value 0;
-      background: var(--background-color);

      +keep-tablet() {
        padding: $component-spacing-value * 0.8 0;
--- a/source/css/style.styl
+++ b/source/css/style.styl
@ -2,6 +2,7 @@
@import "common/markdown.styl"
@import "common/codeblock/highlight.styl"
@import "common/codeblock/copy-code.styl"
+@import "common/codeblock/code-theme.styl"
@import "layout/page.styl"
@import "layout/_partial/local-search.styl"
@import "layout/_partial/toc.styl"
--- a/source/images/upyun.png
+++ b/source/images/upyun.png
--- a/source/js/utils.js
+++ b/source/js/utils.js
@ -197,7 +197,7 @@ KEEP.initUtils = () => {
      const innerHeight = window.innerHeight;
      const pb_dom = document.querySelector('.page-main-content-bottom');
      if (allDomHeight < innerHeight) {
-        pb_dom.style.marginTop = (innerHeight - allDomHeight) + 'px';
+        pb_dom.style.marginTop = Math.floor(innerHeight - allDomHeight) + 'px';
      }
    },