1.5.2

realease 1.5.2
iblh · Dec 2, 2017 · 6fd8fe9 · 6fd8fe9
2 parents f5e4164 + 989f2e6
commit 6fd8fe9
Show file tree

Hide file tree

Showing 20 changed files with 212 additions and 219 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 > Nature, Pure | 原质，纯粹
 
 <p align="center">
-<img alt="Version" src="https://img.shields.io/badge/version-1.5.0-757575.svg?style=flat-square"/>
+<img alt="Version" src="https://img.shields.io/badge/version-1.5.2-757575.svg?style=flat-square"/>
 <a href="https://viosey.com"><img alt="Author" src="https://img.shields.io/badge/author-Viosey-red.svg?style=flat-square"/></a>
 <a href="https://hexo.io"><img alt="Hexo" src="https://img.shields.io/badge/hexo-3.0+-0e83cd.svg?style=flat-square"/></a>
 <a href="https://nodejs.org/"><img alt="node.js" src="https://img.shields.io/badge/node.js-6.0%2B-43853d.svg?style=flat-square"/></a>
@@ -31,7 +31,7 @@
 
 ## Introduction 介绍
 
-An elegant, pure & Material Design theme for Hexo.  
+An elegant, Pure & Material Design Theme for Hexo.  
 优雅、纯粹、质感的 Hexo 主题。
 
 
@@ -71,6 +71,11 @@ cd material
 git checkout {branch/tags name}
 ```
 
+----
+
+> ATTENTION! As the theme is developing, the theme config template will changes. To avoid conflict for users who are using `git pull` to upgrade the theme, we save the theme config template as `_config.template.yml`. You should make a copy of it and rename to `_config.yml`, then configure `_config.yml` when using the theme.  
+> **注意！** 在主题的开发迭代过程中，主题的配置文件模板 可能会改动。为了避免使用 `git pull` 更新主题的用户出现冲突，我们将 主题配置文件模板 命名为 `_config.template.yml`。配置主题时，你应该拷贝一份 `_config.template.yml` 并将其重命名为 `_config.yml`。
+
 ## Docs 文档
 
 [Material Theme Docs](https://material.viosey.com/docs/)
@@ -86,7 +91,7 @@ All kinds of contributions (enhancements, new features, documentation & code imp
 
 Before you start your contributing, please read the [Contributing Rules Wiki](https://github.com/viosey/hexo-theme-material/wiki) first.
 
-欢迎各种形式的贡献，包括但不限于优化，添加功能，文档 & 代码的改进，问题和 bugs 的报告。期待您的 `Pull Request`。
+欢迎各种形式的贡献，包括但不限于优化，添加功能，文档 & 代码的改进，问题和 bugs 的报告。期待你的 `Pull Request`。
 
 在参与贡献之前，请阅读[项目贡献 Wiki](https://github.com/viosey/hexo-theme-material/wiki)，了解如何为 Material 主题贡献。
 
@@ -119,16 +124,18 @@ Proudly using BrowserStack.
 
 ### jsDelivr
 
-[![](https://data.jsdelivr.com/v1/package/npm/hexo-material/badge)](https://www.jsdelivr.com/package/npm/hexo-material) 
-
 Thanks jsDelivr for providing MaterialCDN service.
 
 > **jsDelivr** – Open Source CDN. free, fast, and reliable. You can using the files from GitHub or NPM and serve them using jsDelivr.
 
-[`
-https://cdn.jsdelivr.net/gh/viosey/hexo-theme-material/source/
-`](https://cdn.jsdelivr.net/gh/viosey/hexo-theme-material/source/)
+[![](https://data.jsdelivr.com/v1/package/npm/hexo-material/badge)](https://www.jsdelivr.com/package/npm/hexo-material)
+
+[`http://cdn.jsdelivr.net/npm/hexo-material/source/`](http://cdn.jsdelivr.net/npm/hexo-material/source/)
+
+[![](https://data.jsdelivr.com/v1/package/gh/viosey/hexo-theme-material/badge)](https://www.jsdelivr.com/package/gh/viosey/hexo-theme-material)
+
+[`https://cdn.jsdelivr.net/gh/viosey/hexo-theme-material/source/`](https://cdn.jsdelivr.net/gh/viosey/hexo-theme-material/source/)
 
 ## Render 渲染
 
-![](https://qiniu.viosey.com/img/Materia-overview-tiny.png)
+![Materia-overview-tiny.png](https://i.loli.net/2017/09/28/59cccb0b25520.png)
diff --git a/_config.template.yml b/_config.template.yml
@@ -221,11 +221,11 @@ sidebar:
 
 # Comment Systems
 # Available value of "use":
-#     disqus | disqus_click | changyan | livere | gitment | valine
-# If you want to use gitment,you should get the client_id and client_secret form https://github.com/settings/applications/new
-# If you want to use valine,you should get the app_id and app_key form https://leancloud.cn ,more setting please see https://github.com/xCss/Valine
+#     disqus | disqus_click | changyan | livere | gitment | gitalk | valine
+# If you want to use gitment or gitalk,you should get the client_id and client_secret form https://github.com/settings/applications/new
+# If you want to use valine,you should get the app_id and app_key form https://leancloud.cn ,more setting please see https://valine.js.org
 comment:
-    use:
+    use: 
     shortname: # duoshuo or disqus shortname
     changyan_appid:
     changyan_conf:
@@ -235,8 +235,19 @@ comment:
     gitment_owner:  # git repo's owner
     gitment_client_id:  # github app client id 
     gitment_client_secret :  # github app client secret 
-    valine_leancloud_appId: # leancloud application app id
-    valine_leancloud_appKey: # leancloud application app key
+    valine_leancloud_appId:  # leancloud application app id
+    valine_leancloud_appKey:  # leancloud application app key
+    valine_notify: false # valine mail notify (true/false) https://github.com/xCss/Valine/wiki
+    valine_verify: false # valine verify code (true/false)
+    valine_pageSize: 10 # comment list page size
+    valine_avatar: identicon # gravatar style https://valine.js.org/#/avatar
+    valine_lang: zh-cn # i18n
+    valine_placeholder: Just go go # valine comment input placeholder(like: Please leave your footprints )
+    valine_guest_info: nick,mail,link #valine comment header info
+    gitalk_repo: # git repo of the hexo
+    gitalk_owner: # git repo's owner
+    gitalk_client_id: # github app client id 
+    gitalk_client_secret: # github app client secret
 
 # Search Systems
 # Available value:

diff --git a/languages/nl_NL.yml b/languages/nl_NL.yml
@@ -0,0 +1,29 @@
+sidebar:
+    homepage: "Home"
+    archive: "Archief"
+    article_num: "Aantal artikelen"
+post:
+    visitor: "Bezoekers"
+    views: "Bekeken"
+    continue: "Lees meer"
+    older: "Ouder"
+    newer: "Nieuwer"
+    qrcode: "Lees dit artikel op andere apparaten"
+    comments_load_button: "Lees reacties (Zorg dat disq.us, disquscdn.com en disqus.com correct geladen kunnen worden)"
+    permalink: "Link naar dit artikel: "
+share:
+    article_rss: "Artikel RSS"
+    comment_rss: "Reactie RSS"
+    toTwitter: "Deel op Twitter"
+    toFacebook: "Deel op Facebook"
+    toLinkedIn: "Deel op LinkedIn"
+    toTelegram: "Deel via Telegram"
+    toGplus: "Deel op Google+"
+    toWeibo: "Deel op Weibo"
+    toQQ: "Deel via QQ"
+title:
+    category: "Categorieën"
+    tag: "Label"
+misc:
+    home: "Home"
+    theme: "Thema"
diff --git a/languages/ru.yml b/languages/ru.yml
@@ -0,0 +1,29 @@
+sidebar:
+    homepage: "Главная страница"
+    archive: "Архив"
+    article_num: "Количество статей"
+post:
+    visitor: "Посетители"
+    views: "Просмотры"
+    continue: "Читать далее"
+    older: "Старые"
+    newer: "Новые"
+    qrcode: "Читать эту статью на другом устройстве"
+    comments_load_button: "Читать комментарии (Убедитесь, что disq.us, disquscdn.com и disqus.com могут корректно загрузиться)"    
+    permalink: "Ссылка на эту статью: "
+share:
+    article_rss: "RSS статьи"
+    comment_rss: "RSS комментариев"
+    toTwitter: "Поделиться на Twitter"
+    toFacebook: "Поделиться на Facebook"
+    toLinkedIn: "Поделиться на LinkedIn"
+    toTelegram: "Поделиться на Telegram"
+    toGplus: "Поделиться на Google+"
+    toWeibo: "Поделиться на Weibo"
+    toQQ: "Поделиться на QQ"
+title:
+    category: "Категории"
+    tag: "Тег"
+misc:
+    home: "Главная"
+    theme: "Тема"
diff --git a/layout/_partial/config_font.ejs b/layout/_partial/config_font.ejs
@@ -69,51 +69,13 @@
             font-weight: 500;
             src: local('Roboto MediumItalic'), local('Roboto-MediumItalic'), url('https://cdnjs.cat.net/ajax/libs/mdui/0.2.1/fonts/roboto/Roboto-MediumItalic.woff2') format('woff2'), url('https://cdnjs.cat.net/ajax/libs/mdui/0.2.1/fonts/roboto/Roboto-MediumItalic.woff') format('woff');
         }
-        @font-face {
-            font-family: 'Material Icons';
-            font-style: normal;
-            font-weight: 400;
-            src: local('Material Icons'),
-            local('MaterialIcons-Regular'),
-            url(https://cdnjs.cat.net/ajax/libs/material-design-icons/3.0.1/iconfont/MaterialIcons-Regular.woff2) format('woff2'),
-            url(https://cdnjs.cat.net/ajax/libs/material-design-icons/3.0.1/iconfont/MaterialIcons-Regular.woff) format('woff'),
-            url(https://cdnjs.cat.net/ajax/libs/material-design-icons/3.0.1/iconfont/MaterialIcons-Regular.ttf) format('truetype');
-        }
     </style>
 <% } %>
 
-<!-- Import Material Icon -->
-<% if(theme.vendors.material_icons) { %>
-    <link rel="stylesheet" href="<%= theme.vendors.material_icons %>">
-<% } else if(theme.fonts.use === "catnet") { %>
-<% } else if(theme.vendors.materialcdn) { %>
-    <style>
-        @font-face {
-            font-family: 'Material Icons';
-            font-style: normal;
-            font-weight: 400;
-            src: local('Material Icons'),
-            local('MaterialIcons-Regular'),
-            url(<%=theme.vendors.materialcdn %>/fonts/MaterialIcons-Regular.woff2) format('woff2'),
-            url(<%=theme.vendors.materialcdn %>/fonts/MaterialIcons-Regular.woff) format('woff'),
-            url(<%=theme.vendors.materialcdn %>/fonts/MaterialIcons-Regular.ttf) format('truetype');
-        }
-    </style>
-<% } else if(theme.fonts.use === "google") { %>
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-<% } else if(theme.fonts.use === "ustc") { %>
-    <link href="https://fonts.proxy.ustclug.org/icon?family=Material+Icons" rel="stylesheet">
+<!-- Import Material Icons -->
+
+<% if(theme.vendors.materialcdn) { %>
+    <%- cssLsload({path:(theme.vendors.materialcdn + '/css/material-icons.css'),key:'material_icons'}) %>
 <% } else { %>
-    <style>
-        @font-face {
-            font-family: 'Material Icons';
-            font-style: normal;
-            font-weight: 400;
-            src: local('Material Icons'),
-            local('MaterialIcons-Regular'),
-            url(<%- url_for('fonts/MaterialIcons-Regular.woff2') %>) format('woff2'),
-            url(<%- url_for('fonts/MaterialIcons-Regular.woff') %>) format('woff'),
-            url(<%- url_for('fonts/MaterialIcons-Regular.ttf') %>) format('truetype');
-        }
-    </style>
+    <%- cssLsload({path:('css/material-icons.css'),key:'material_icons'}) %>
 <% } %>