Merge branch 'release/3.4.7'

Update CHANGELOG.md and bump version to 3.4.7
Add classnames to body element (#526 )
2016-09-15 14:55:24 -04:00 · 2016-09-15 14:55:06 -04:00 · 2016-09-15 14:46:04 -04:00 · 2016-09-15 14:36:15 -04:00 · 2016-09-15 14:35:37 -04:00 · 2016-09-15 19:56:46 +08:00
5 changed files with 84 additions and 16 deletions
@@ -1,3 +1,26 @@
+## [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)
+
+### Enhancements
+
+- Add Italian "comments" related localized UI text. [#514](https://github.com/mmistakes/minimal-mistakes/pull/514)
+
+### Bug Fixes
+
+- Disable `compress` HTML layout by default. To enable add `layout: compress` to `_layouts/default.html`.
+
 ## [3.4.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.5)

 ### Enhancements
@@ -253,19 +253,67 @@ it: &DEFAULT_IT
  email_label                : "Email"
  recent_posts               : "Articoli Recenti"
  undefined_wpm              : "Parametro words_per_minute non definito in _config.yml"
-  comment_form_info          :
-  comment_form_comment_label :
-  comment_form_md_info       :
-  comment_form_name_label    :
-  comment_form_email_label   :
-  comment_form_website_label :
-  comment_btn_submit         :
-  comment_btn_submitted      :
-  comment_success_msg        :
-  comment_error_msg          :
-  loading_label              :
+  comment_form_info          : "Il tuo indirizzo email non sarà pubblicato. Sono segnati i campi obbligatori"
+  comment_form_comment_label : "Commenta"
+  comment_form_md_info       : "Il linguaggio Markdown è supportato"
+  comment_form_name_label    : "Nome"
+  comment_form_email_label   : "Indirizzo email"
+  comment_form_website_label : "Sito Web (opzionale)"
+  comment_btn_submit         : "Invia commento"
+  comment_btn_submitted      : "Inviato"
+  comment_success_msg        : "Grazie per il tuo commento! Verrà visualizzato nel sito una volta che sarà approvato."
+  comment_error_msg          : "C'è stato un errore con il tuo invio. Assicurati che tutti i campi richiesti siano stati completati e riprova."
+  loading_label              : "Caricamento..."
 it-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
 # --------------
@@ -1,7 +1,5 @@
 {% include base_path %}

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

 {% include base_path %}
@@ -11,7 +10,7 @@ layout: compress
    {% include head/custom.html %}
  </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 masthead.html %}
@@ -1,6 +1,6 @@
 {
  "name": "minimal-mistakes",
-  "version": "3.4.5",
+  "version": "3.4.7",
  "description": "Minimal Mistakes Jekyll theme npm build scripts",
  "repository": {
    "type": "git",
Author	SHA1	Message	Date
Michael Rose	32d2c7db0d	Merge branch 'release/3.4.7'	2016-09-15 14:55:24 -04:00
Michael Rose	8756c27704	Update CHANGELOG.md and bump version to 3.4.7	2016-09-15 14:55:06 -04:00
Vince Chu	57449b37ca	Add classnames to body element (#526 ) * Expose layout type as class name on body element * Add ability to add classes to body via front matter	2016-09-15 14:46:04 -04:00
Michael Rose	a60257de3d	Merge branch 'feature/zh-cn-translations' into develop	2016-09-15 14:36:15 -04:00
Michael Rose	0c13d0446d	Merge branch 'master' of https://github.com/martinliu/minimal-mistakes into feature/zh-cn-translations	2016-09-15 14:35:37 -04:00
Martin Liu	a1d508d53b	Add zh-CN Add Simplified Chinese UI text.	2016-09-15 19:56:46 +08:00
Vince Chu	54b2da3022	Remove duplicate include of base_path in category-list.html (#522 )	2016-09-13 09:30:52 -04:00
Michael Rose	921f4411c3	Merge branch 'release/3.4.6' into develop	2016-09-09 10:37:37 -04:00
Michael Rose	4092d08c8c	Merge branch 'release/3.4.6'	2016-09-09 10:37:32 -04:00
Michael Rose	f12a902372	Update CHANGELOG.md and bump version to 3.4.6	2016-09-09 10:37:06 -04:00
Michael Rose	6db88b709a	Disable `compress` layout by default - Due to several issues related to content and JavaScript HTML compression has been disabled. - To enable add `layout: compress` to _layout/default.html YAML Front Matter	2016-09-09 10:33:42 -04:00
nmiglio	f5cf9d8fd8	Completed Italian translation (#514 ) cc/ #449	2016-09-09 10:29:15 -04:00
Michael Rose	6617549249	Merge branch 'release/3.4.5' into develop	2016-09-09 10:12:30 -04:00