diff --git a/CHANGELOG.md b/CHANGELOG.md index cd3eb3d..371679b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + +# [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 + # [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)

-Version License Total downloads Flextype Discord +Version License Total downloads Flextype Discord

## 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 @@ - + {% block head %} - + - - - + + + - {% do - emitter.emit('onThemeMeta') %} + {% do flextype.emitter.emit('onThemeMeta') %} {% if entry.title %}{{ entry.title|e('html') }} | - {% endif %}{{ registry.get('plugins.site.settings.title')|e('html') }} + {% endif %}{{ flextype.registry.get('plugins.site.settings.title')|e('html') }} - {% 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') %} {% endfor %} {% endif %} - {% do - emitter.emit('onThemeHeader') %} + {% do flextype.emitter.emit('onThemeHeader') %} {% endblock %} @@ -38,11 +36,11 @@
- {{ registry.get('plugins.site.settings.title')|e('html') }} + {{ flextype.registry.get('plugins.site.settings.title')|e('html') }}
- {% 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 %} - {% 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 %} {% endif %} {% endfor %} {% endif %} - {% do - emitter.emit('onThemeTail') %} + {% do flextype.emitter.emit('onThemeTail') %} 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'