From 022b5c1f40dfeb3270dbb4fc79db2ff0f851ebe9 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Wed, 30 Dec 2020 15:47:43 +0300
Subject: [PATCH] Noir 1.6.0

---
 CHANGELOG.md                 |  8 ++++++++
 README.md                    |  4 ++--
 package.json                 |  4 ++--
 templates/default.html       | 10 +++++-----
 templates/partials/base.html | 37 +++++++++++++++++-------------------
 theme.yaml                   |  4 ++--
 6 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd3eb3d..371679b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="1.6.0"></a>
+# [1.6.0](https://github.com/flextype-themes/noir) (2020-12-30)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.14
+* **core** use new TWIG Plugin 1.7.0
+
 <a name="1.5.0"></a>
 # [1.5.0](https://github.com/flextype-themes/noir) (2020-12-20)
 
diff --git a/README.md b/README.md
index 1f90800..1ce287f 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.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>
+<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.14-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.13 | [download](https://github.com/flextype/flextype/releases) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.14 | [download](https://github.com/flextype/flextype/releases) |
 
 ### Plugins
 | Item | Version | Download |
diff --git a/package.json b/package.json
index 2b02df8..9100a31 100755
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "Noir",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Noir theme for Flextype.",
-  "homepage": "http://flextype.org",
+  "homepage": "https://flextype.org",
   "author": "Sergey Romanenko",
   "license": "MIT",
   "keywords": [
diff --git a/templates/default.html b/templates/default.html
index ead0c1b..b83cb5f 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/' ~ flextype.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 ed86115..b2ca786 100644
--- a/templates/partials/base.html
+++ b/templates/partials/base.html
@@ -1,35 +1,33 @@
 <!doctype html>
-<html lang="{{ registry.get('flextype.settings.locale') }}">
+<html lang="{{ flextype.registry.get('flextype.settings.locale') }}">
     <head>
         {% block head %}
-            <meta charset="{{ registry.get('flextype.settings.charset')|lower }}">
+            <meta charset="{{ flextype.registry.get('flextype.settings.charset')|lower }}">
             <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-            <meta name="description" content="{% if entry.description %}{{ entry.description }}{% else %}{{ registry.get('plugins.site.settings.description') }}{% endif %}">
-            <meta name="keywords" content="{% if entry.keywords %}{{ entry.keywords }}{% else %}{{ registry.get('plugins.site.settings.keywords') }}{% endif %}">
-            <meta name="robots" content="{% if entry.robots %}{{ entry.robots }}{% else %}{{ registry.get('plugins.site.settings.robots') }}{% endif %}">
+            <meta name="description" content="{% if entry.description %}{{ entry.description }}{% else %}{{ flextype.registry.get('plugins.site.settings.description') }}{% endif %}">
+            <meta name="keywords" content="{% if entry.keywords %}{{ entry.keywords }}{% else %}{{ flextype.registry.get('plugins.site.settings.keywords') }}{% endif %}">
+            <meta name="robots" content="{% if entry.robots %}{{ entry.robots }}{% else %}{{ flextype.registry.get('plugins.site.settings.robots') }}{% endif %}">
             <meta name="generator" content="Powered by Flextype"/>
 
-            {% do
-                emitter.emit('onThemeMeta') %}
+            {% do flextype.emitter.emit('onThemeMeta') %}
 
             <title>
                 {% if entry.title %}{{ entry.title|e('html') }}
                     |
-                {% endif %}{{ registry.get('plugins.site.settings.title')|e('html') }}</title>
+                {% endif %}{{ flextype.registry.get('plugins.site.settings.title')|e('html') }}</title>
 
             <link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i,900,900i&display=swap&subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet">
 
-            {% set theme = registry.get('plugins.site.settings.theme') %}
-            {% do registry.set('assets.site.css.ness', 'project/themes/' ~ theme ~ '/assets/dist/css/build.min.css') %}
+            {% set theme = flextype.registry.get('plugins.site.settings.theme') %}
+            {% do flextype.registry.set('assets.site.css.ness', 'project/themes/' ~ theme ~ '/assets/dist/css/build.min.css') %}
 
-            {% if registry.has('assets.site.css') %}
-                {% for css in registry.get('assets.site.css') %}
+            {% if flextype.registry.has('assets.site.css') %}
+                {% for css in flextype.registry.get('assets.site.css') %}
                     <link href="{{ url() }}/{{ css }}" rel="stylesheet">
                 {% endfor %}
             {% endif %}
 
-            {% do
-                emitter.emit('onThemeHeader') %}
+            {% do flextype.emitter.emit('onThemeHeader') %}
         {% endblock %}
     </head>
     <body>
@@ -38,11 +36,11 @@
                 <div class="w-full lg:w-2/12
                           text-center lg:text-left
                           float-left text-white py-2 uppercase tracking-wide">
-                    <a href="{{ url() }}" class="w-full lg:w-2/12 text-center text-base no-underline">{{ registry.get('plugins.site.settings.title')|e('html') }}</a>
+                    <a href="{{ url() }}" class="w-full lg:w-2/12 text-center text-base no-underline">{{ flextype.registry.get('plugins.site.settings.title')|e('html') }}</a>
                 </div>
                 <div class="w-full float-right lg:w-9/12 font-noirpro-semibold">
                     <div class="text-right p-2">
-                        {% for item in entries.fetch('', {'collection': true}).sortBy('menu_item_order', 'ASC').all() %}
+                        {% for item in flextype.entries.fetch('', {'collection': true}).sortBy('menu_item_order', 'ASC').all() %}
                             {% if item.menu_item_title %}
                                 <a
                                     href="{{ url() }}/{{ item.menu_item_url }}"
@@ -81,15 +79,14 @@
             </footer>
         </main>
 
-        {% if registry.has('assets.site.js') %}
-            {% for js in registry.get('assets.site.js') %}
+        {% if flextype.registry.has('assets.site.js') %}
+            {% for js in flextype.registry.get('assets.site.js') %}
                 {% if js %}
                     <script type="text/javascript" src="{{ url() }}/{{ js }}"></script>
                 {% endif %}
             {% endfor %}
         {% endif %}
 
-        {% do
-            emitter.emit('onThemeTail') %}
+        {% do flextype.emitter.emit('onThemeTail') %}
     </body>
 </html>
diff --git a/theme.yaml b/theme.yaml
index 882a2ea..1e8fa65 100755
--- a/theme.yaml
+++ b/theme.yaml
@@ -1,5 +1,5 @@
 name: Noir
-version: 1.5.0
+version: 1.6.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.13
+  flextype: 0.9.14
   site: '>=1.0.0'
   twig: '>=1.0.0'