modify: 修改配置文件和一些配置项

e2f0454b · EvanOne(文一) · a7b3cd98 · e2f0454b · e2f0454b · e2f0454b
6 changed file
--- a/_config.yml
+++ b/_config.yml
+# ==================================================
+# Basic config
+# ==================================================

 # HTML lang
 language:
@@ -12,9 +15,6 @@ menu:
  tags: /tags
  about: /about

-# Is show header menu icon
-show_menu_icon: true
-
 # Favicon
 favicon: /imgs/favicon.ico

@@ -23,17 +23,34 @@ social:
  github: https://github.com/liuyib
  segmentfault: https://segmentfault.com/u/liuyib

-# Sidebar avatar
+# Avatar in the sidebar
 # In theme directory(source/imgs)
 avatar: /imgs/my_favorite.jpg

-# Catalog of article in the sidebar
-catalog:
+# Stylesheets loaded in the <head>
+stylesheets:
+  - /css/index.css
+
+# Scripts loaded in the end of the body
+scripts:
+  - /js/utils.js
+  - /js/scroll.js
+
+# ==================================================
+# Advanced config
+# ==================================================
+
+# --------------------------------------------------
+# Icon
+# --------------------------------------------------
+# Header menu icon
+header_menu_icon:
  enable: true
-  # Show list number
-  number: true

+# --------------------------------------------------
 # Tag cloud
+# If not used, comment it or ignore it
+# --------------------------------------------------
 tag:
  # Color for tag
  start_color: '#fc0'
@@ -42,48 +59,55 @@ tag:
  min_font_size: 16
  max_font_size: 30

-# PWA
-# See https://github.com/JLHwung/hexo-offline
-pwa:
-  enable: false
-  manifest: /manifest.json
-
-# Stylesheets loaded in the <head>
-stylesheets:
-  - /css/index.css
-
-# Scripts loaded in the end of the body
-scripts:
-  - /js/utils.js
-  - /js/scroll.js
-
+# --------------------------------------------------
+# Catalog of article in the sidebar
+# --------------------------------------------------
+catalog:
+  enable: true
+  # Show list number
+  number: true

-# ------------------------------------
+# --------------------------------------------------
 # Comments
-# ------------------------------------
+# --------------------------------------------------
 # Disqus
 disqus:
-  enable: false
+  enable: true

-# Article copyright
+# --------------------------------------------------
+# Copyright
+# --------------------------------------------------
+# Copyright of articles
 post_copyright:
  enable: true
  license: CC BY-NC-SA 4.0
  license_url: https://creativecommons.org/licenses/by-nc-sa/4.0/

-# Copyright in the site bottom
+# Copyright at the bottom of the site
 site_copyright:
  enable: true
  start: 2019
  # If not set, default is the latest year
  end:

+# --------------------------------------------------
 # ICP
+# --------------------------------------------------
 ICP:
  enable: true
  text: 豫备案12345678号.

+# --------------------------------------------------
+# PWA
+# See https://github.com/JLHwung/hexo-offline
+# --------------------------------------------------
+pwa:
+  enable: true
+  manifest: /manifest.json
+
+# --------------------------------------------------
 # Busuanzi count for PV / UV in site
+# --------------------------------------------------
 busuanzi:
  # Count values only if the other configs are false
  enable: true
@@ -100,8 +124,10 @@ busuanzi:
  page_pv_header: <i class="fa fa-file"></i>
  page_pv_footer:

+# --------------------------------------------------
 # Canvas ribbon
 # See: https://github.com/hustcc/ribbon.js
+# --------------------------------------------------
 canvas_ribbon:
  enable: false
  size: 150

--- a/languages/zh-CN.yml
+++ b/languages/zh-CN.yml
@@ -28,12 +28,13 @@ post:
  created: 创建于
  modified: 更新于
  posted: 发表于
-  sticky: 置顶
-  read_more: 阅读全文
-  untitled: 未命名
-  visitors: 阅读次数
  word_count: 字数统计
+  read-count: 阅读次数
  read_time: 阅读时长
+  read_more: 阅读全文
+  fire: 热度
+  sticky: 置顶
+  untitled: 文章未命名
  copyright:
    author: 本文作者
    link: 本文链接

--- a/layout/includes/header.pug
+++ b/layout/includes/header.pug
@@ -4,10 +4,10 @@ header#header
      ul
        each url, label in theme.menu
          li
-            - if (theme.show_menu_icon)
-              a(href=url)
+            a(href=url)
+              if (theme.header_menu_icon && theme.header_menu_icon.enable)
                i(class=`header-nav-menu-icon icon-${label}`)
-                != _p(`menu.${label}`)
+              != _p(`menu.${label}`)
  div#header-info
    div.header-info-inner
      div.site-info-title= config.title

--- a/layout/page.pug
+++ b/layout/page.pug
@@ -5,10 +5,10 @@ block content
    div.tag-cloud.main-content
      div.tag-cloud-title= _p('page.tags') + ' - '
        span.tag-cloud-num= site.tags.length
-      - var min_font = theme.tag && (theme.tag.min_font_size || 14)
-      - var max_font = theme.tag && (theme.tag.max_font_size || 30)
-      - var start_color = theme.tag && (theme.tag.start_color || '#a4d8fa')
-      - var end_color = theme.tag && (theme.tag.end_color || '#1b9ef3')
+      - var min_font = theme.tag ? theme.tag.min_font_size : 14
+      - var max_font = theme.tag ? theme.tag.max_font_size : 30
+      - var start_color = theme.tag ? theme.tag.start_color : '#a4d8fa'
+      - var end_color = theme.tag ? theme.tag.end_color : '#1b9ef3'
      div.tag-cloud-item!= tagcloud({min_font: min_font, max_font: max_font, amount: 200, color: true, start_color, end_color})

  if (page.type === 'categories')

--- a/layout/post.pug
+++ b/layout/post.pug
@@ -3,18 +3,22 @@ extends includes/layout.pug
 block content
  article#post.main-content
    header.post-header
-      h1.post-title= page.title
+      if (page.title)
+        h1.post-title= page.title
+      else
+        h1.post-title= _p('post.untitled')
+      
      div.post-meta
        span.post-meta-create
-          span 发表于
+          span= _p('post.posted') + ' '
          span= full_date(page.date, 'YYYY-MM-DD')
        span.dot!= '&bull;'
        span.post-meta-word
-          span 字数统计
+          span= _p('post.word_count') + ' '
          span TODO
        span.dot!= '&bull;'
        span.post-meta-read
-          span 热度
+          span= _p('post.fire') + ' '
          span TODO
    div.post-body
      != page.content

--- a/layout/tag.pug
+++ b/layout/tag.pug
@@ -2,7 +2,6 @@ extends includes/layout.pug

 block content
  include ./includes/mixins/articles-sort.pug
-  div#tag
-    .article-sort-title= _p('page.tag') + ' - ' + page.tag
+  div.tag.main-content
+    .article-sort-title= _p('page.tags') + ' - ' + page.tag
    +articleSort(page.posts)
-  include ./includes/pagination.pug