Merge branch 'release/3.4.7'

This commit is contained in:
Michael Rose 2016-09-15 14:55:24 -04:00
commit 32d2c7db0d
5 changed files with 63 additions and 4 deletions

View file

@ -1,3 +1,16 @@
## [3.4.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.7)
### Enhancements
- Add `layout` based and user-defined class names to `<body>` element for added CSS hooks. [#526](https://github.com/mmistakes/minimal-mistakes/pull/526)
- Add simplified Chinese localized UI text. [#532](https://github.com/mmistakes/minimal-mistakes/pull/532)
### Bug Fixes
- Remove duplicate include of `base_path` in category-list.html [#522](https://github.com/mmistakes/minimal-mistakes/pull/522)
### Maintenance
## [3.4.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.6) ## [3.4.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.6)
### Enhancements ### Enhancements

View file

@ -266,6 +266,54 @@ it: &DEFAULT_IT
loading_label : "Caricamento..." loading_label : "Caricamento..."
it-IT: it-IT:
<<: *DEFAULT_IT <<: *DEFAULT_IT
# Chinese (zh-CN Chinese - China)
# -----------------
zh: &DEFAULT_ZH
page : "页面"
pagination_previous : "向前"
pagination_next : "向后"
breadcrumb_home_label : "首页"
breadcrumb_separator : "/"
toc_label : "在本页上"
ext_link_label : "直接链接"
less_than : "少于"
minute_read : "分钟 阅读"
share_on_label : "分享"
meta_label :
tags_label : "标签:"
categories_label : "分类:"
date_label : "最新的:"
comments_label : "留下评论"
comments_title : "评论"
more_label : "了解更多"
related_label : "猜您还喜欢"
follow_label : "关注:"
feed_label : "Feed"
powered_by : "Powered by"
website_label : "网站"
email_label : "Email"
recent_posts : "最新文章"
undefined_wpm : "Undefined parameter words_per_minute at _config.yml"
comment_form_info : "Your email address will not be published. Required fields are marked"
comment_form_comment_label : "Comment"
comment_form_md_info : "Markdown is supported."
comment_form_name_label : "Name"
comment_form_email_label : "Email address"
comment_form_website_label : "Website (optional)"
comment_btn_submit : "Submit Comment"
comment_btn_submitted : "Submitted"
comment_success_msg : "Thanks for your comment! It will show on the site once it has been approved."
comment_error_msg : "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again."
loading_label : "Loading..."
zh-CN:
<<: *DEFAULT_ZH
zh-HK:
<<: *DEFAULT_ZH
zh-SG:
<<: *DEFAULT_ZH
zh-TW:
<<: *DEFAULT_ZH
# Another locale # Another locale
# -------------- # --------------

View file

@ -1,7 +1,5 @@
{% include base_path %} {% include base_path %}
{% include base_path %}
{% case site.category_archive.type %} {% case site.category_archive.type %}
{% when "liquid" %} {% when "liquid" %}
{% assign path_type = "#" %} {% assign path_type = "#" %}

View file

@ -10,7 +10,7 @@
{% include head/custom.html %} {% include head/custom.html %}
</head> </head>
<body> <body class="layout--{{ page.layout | default: layout.layout }}{% if page.classes or layout.classes %}{{ page.classes | default: layout.classes | join: ' ' | prepend: ' ' }}{% endif %}">
{% include browser-upgrade.html %} {% include browser-upgrade.html %}
{% include masthead.html %} {% include masthead.html %}

View file

@ -1,6 +1,6 @@
{ {
"name": "minimal-mistakes", "name": "minimal-mistakes",
"version": "3.4.6", "version": "3.4.7",
"description": "Minimal Mistakes Jekyll theme npm build scripts", "description": "Minimal Mistakes Jekyll theme npm build scripts",
"repository": { "repository": {
"type": "git", "type": "git",