From 846503aebadf842ca15305067ff1485c74636140 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sun, 20 Dec 2020 14:57:24 +0300
Subject: [PATCH] Noir 1.5.0

---
 CHANGELOG.md                 |  7 +++++++
 README.md                    |  4 ++--
 package.json                 |  2 +-
 templates/default.html       | 10 +++++-----
 templates/partials/base.html |  2 +-
 theme.yaml                   |  4 ++--
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7be43a9..cd3eb3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.5.0"></a>
+# [1.5.0](https://github.com/flextype-themes/noir) (2020-12-20)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.13
+
 <a name="1.4.1"></a>
 # [1.4.1](https://github.com/flextype-themes/noir) (2020-12-07)
 
diff --git a/README.md b/README.md
index 279c97c..1f90800 100755
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ![preview](preview.png)
 
 <p align="center">
-<a href="https://github.com/flextype-themes/noir/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-themes/noir.svg?label=version&color=black"></a> <a href="https://github.com/flextype-themes/noir"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-themes/noir"><img src="https://img.shields.io/github/downloads/flextype-themes/noir/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype-themes/noir"><img src="https://img.shields.io/badge/Flextype-0.9.12-green.svg?color=black" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
+<a href="https://github.com/flextype-themes/noir/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-themes/noir.svg?label=version&color=black"></a> <a href="https://github.com/flextype-themes/noir"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-themes/noir"><img src="https://img.shields.io/github/downloads/flextype-themes/noir/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype-themes/noir"><img src="https://img.shields.io/badge/Flextype-0.9.13-green.svg?color=black" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
 </p>
 
 ## Features
@@ -19,7 +19,7 @@ The following dependencies need to be downloaded and installed for Noir Theme.
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.12 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.13 | [download](https://github.com/flextype/flextype/releases) |
 
 ### Plugins
 | Item | Version | Download |
diff --git a/package.json b/package.json
index 2ae1b17..2b02df8 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Noir",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Noir theme for Flextype.",
   "homepage": "http://flextype.org",
   "author": "Sergey Romanenko",
diff --git a/templates/default.html b/templates/default.html
index 9557214..ead0c1b 100644
--- a/templates/default.html
+++ b/templates/default.html
@@ -1,5 +1,5 @@
-{% extends 'themes/' ~ registry.get('plugins.site.settings.theme') ~ '/templates/partials/base.html' %}
-
-{% block content %}
-    {{ entry.content|shortcode|raw }}
-{% endblock %}
+{% extends 'themes/' ~ registry.get('plugins.site.settings.theme') ~ '/templates/partials/base.html' %}
+
+{% block content %}
+    {{ entry.content|shortcode|raw }}
+{% endblock %}
diff --git a/templates/partials/base.html b/templates/partials/base.html
index 0dcb2e8..ed86115 100644
--- a/templates/partials/base.html
+++ b/templates/partials/base.html
@@ -42,7 +42,7 @@
                 </div>
                 <div class="w-full float-right lg:w-9/12 font-noirpro-semibold">
                     <div class="text-right p-2">
-                        {% for item in entries.fetchCollection('').sortBy('menu_item_order', 'ASC').all() %}
+                        {% for item in entries.fetch('', {'collection': true}).sortBy('menu_item_order', 'ASC').all() %}
                             {% if item.menu_item_title %}
                                 <a
                                     href="{{ url() }}/{{ item.menu_item_url }}"
diff --git a/theme.yaml b/theme.yaml
index 371e427..882a2ea 100755
--- a/theme.yaml
+++ b/theme.yaml
@@ -1,5 +1,5 @@
 name: Noir
-version: 1.4.1
+version: 1.5.0
 description: Noir theme for Flextype.
 author:
   name: Sergey Romanenko
@@ -10,6 +10,6 @@ bugs: https://github.com/flextype-themes/noir/issues
 license: MIT
 
 dependencies:
-  flextype: 0.9.12
+  flextype: 0.9.13
   site: '>=1.0.0'
   twig: '>=1.0.0'