diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a599da..0917442 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v1.7.0 +## mm/dd/2019 + +1. [](#new) + * Set Dependency of Grav 1.5.10+ which has support for new **Deferred Block** Twig extension + * Implement assets rendering using **Deferred Block** Twig extension + # v1.6.2 ## 12/20/2016 diff --git a/blueprints.yaml b/blueprints.yaml index 1211fe9..6e1fe18 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Deliver -version: 1.6.2 +version: 1.7.0 description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme." icon: newspaper-o author: @@ -11,6 +11,8 @@ demo: http://demo.getgrav.org/deliver-skeleton/ keywords: deliver, theme, modern, fast, responsive, html5, css3 bugs: https://github.com/getgrav/grav-theme-deliver/issues license: MIT +dependencies: + - { name: grav, version: '>=1.5.10' } form: validation: loose diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig index f416894..738393e 100644 --- a/templates/partials/base.html.twig +++ b/templates/partials/base.html.twig @@ -1,6 +1,6 @@ {% set theme_config = attribute(config.themes, config.system.pages.theme) %} - + {% block head %} @@ -25,7 +25,6 @@ {% do assets.addCss('theme://js/html5shiv-printshiv.min.js') %} {% endif %} {% endblock %} - {{ assets.css() }} {% block javascripts %} {% do assets.add('jquery', 101) %} @@ -38,7 +37,11 @@ {% do assets.addJs('theme://js/fixed-header.js') %} {% endif %} {% endblock %} - {{ assets.js() }} + + {% block assets deferred %} + {{ assets.css()|raw }} + {{ assets.js()|raw }} + {% endblock %} {% endblock head%} @@ -82,7 +85,7 @@ {% block bottom %} - {{ assets.js('bottom') }} + {{ assets.js('bottom')|raw }}