Merge branch 'release/1.7.0'

This commit is contained in:
Andy Miller 2019-03-21 18:34:10 -06:00
commit 0ba3c7dc47
No known key found for this signature in database
GPG Key ID: E82B8D0EAB94EFB9
8 changed files with 24 additions and 13 deletions

View File

@ -1,3 +1,10 @@
# v1.7.0
## 03/21/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

View File

@ -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

View File

@ -19,8 +19,10 @@
<h1>{{ page.title }}</h1>
</div>
{% endif %}
{% include 'partials/breadcrumbs.html.twig' %}
{% if config.plugins.breadcrumbs.enabled %}
{% include 'partials/breadcrumbs.html.twig' %}
{% endif %}
<div class="blog-content-item g-grid pure-g-r">
<div id="item" class="g-block pure-u-2-3">

View File

@ -1,7 +1,7 @@
<ul class="archives">
{% for month,items in archives_data %}
<li>
<a href="{{ base_url }}/archives_month:{{ month|date('M_Y')|lower|e('url') }}">
<a href="{{ base_url }}/archives_month{{ config.system.param_sep }}{{ month|date('M_Y')|lower|e('url') }}">
<span class="archive_date">{{ month }}</span>
{% if archives_show_count %}
<span>({{ items|length }})</span>

View File

@ -1,6 +1,6 @@
{% set theme_config = attribute(config.themes, config.system.pages.theme) %}
<!DOCTYPE html>
<html lang="{{ grav.language.getLanguage ?: 'en' }}">
<html lang="{{ grav.language.getActive ?: grav.config.site.default_lang }}">
<head>
{% block head %}
<meta charset="utf-8" />
@ -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%}
</head>
@ -82,7 +85,7 @@
</div>
</div>
{% block bottom %}
{{ assets.js('bottom') }}
{{ assets.js('bottom')|raw }}
<script>
$(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 %}

View File

@ -7,7 +7,7 @@
input.on('keypress', function(event) {
if (event.which == 13 && input.val().length > 3) {
event.preventDefault();
window.location.href = input.data('search-input') + ':' + input.val();
window.location.href = input.data('search-input') + '{{ config.system.param_sep }}' + input.val();
}
});
});

View File

@ -6,7 +6,7 @@ jQuery(document).ready(function($){
input.on('keypress', function(event) {
if (event.which == 13 && input.val().length > 3) {
event.preventDefault();
window.location.href = input.data('searchsidebar-input') + ':' + input.val();
window.location.href = input.data('searchsidebar-input') + '{{ config.system.param_sep }}' + input.val();
}
});
});