modernize

This commit is contained in:
Andy Miller 2019-03-21 16:50:46 -06:00
parent 09407af482
commit ff1ff51f66
No known key found for this signature in database
GPG Key ID: E82B8D0EAB94EFB9
4 changed files with 17 additions and 8 deletions

View File

@ -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 # v1.6.2
## 12/20/2016 ## 12/20/2016

View File

@ -1,5 +1,5 @@
name: Deliver 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." description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme."
icon: newspaper-o icon: newspaper-o
author: author:
@ -11,6 +11,8 @@ demo: http://demo.getgrav.org/deliver-skeleton/
keywords: deliver, theme, modern, fast, responsive, html5, css3 keywords: deliver, theme, modern, fast, responsive, html5, css3
bugs: https://github.com/getgrav/grav-theme-deliver/issues bugs: https://github.com/getgrav/grav-theme-deliver/issues
license: MIT license: MIT
dependencies:
- { name: grav, version: '>=1.5.10' }
form: form:
validation: loose validation: loose

View File

@ -1,6 +1,6 @@
{% set theme_config = attribute(config.themes, config.system.pages.theme) %} {% set theme_config = attribute(config.themes, config.system.pages.theme) %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ grav.language.getLanguage ?: 'en' }}"> <html lang="{{ grav.language.getActive ?: grav.config.site.default_lang }}">
<head> <head>
{% block head %} {% block head %}
<meta charset="utf-8" /> <meta charset="utf-8" />
@ -25,7 +25,6 @@
{% do assets.addCss('theme://js/html5shiv-printshiv.min.js') %} {% do assets.addCss('theme://js/html5shiv-printshiv.min.js') %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{{ assets.css() }}
{% block javascripts %} {% block javascripts %}
{% do assets.add('jquery', 101) %} {% do assets.add('jquery', 101) %}
@ -38,7 +37,11 @@
{% do assets.addJs('theme://js/fixed-header.js') %} {% do assets.addJs('theme://js/fixed-header.js') %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{{ assets.js() }}
{% block assets deferred %}
{{ assets.css()|raw }}
{{ assets.js()|raw }}
{% endblock %}
{% endblock head%} {% endblock head%}
</head> </head>
@ -82,7 +85,7 @@
</div> </div>
</div> </div>
{% block bottom %} {% block bottom %}
{{ assets.js('bottom') }} {{ assets.js('bottom')|raw }}
<script> <script>
$(function () { $(function () {
$(document).ready(function() { $(document).ready(function() {

View File

@ -1,3 +0,0 @@
{% for meta in page.metadata %}
<meta {% if meta.name %}name="{{ meta.name }}" {% endif %}{% if meta.http_equiv %}http-equiv="{{ meta.http_equiv }}" {% endif %}{% if meta.charset %}charset="{{ meta.charset }}" {% endif %}{% if meta.property %}property="{{ meta.property }}" {% endif %}{% if meta.content %}content="{{ meta.content }}" {% endif %}/>
{% endfor %}