libretic
/
grav-theme-libretic
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/1.7.0'

This commit is contained in:
Andy Miller 2019-03-21 18:34:10 -06:00
parent eed103e19b c938b8debf
commit 0ba3c7dc47
No known key found for this signature in database
GPG Key ID: E82B8D0EAB94EFB9
8 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

4
blueprints.yaml
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

6
templates/item.html.twig
View File

@ -19,8 +19,10 @@
<h1>{{ page.title }}</h1> <h1>{{ page.title }}</h1>
</div> </div>
{% endif %} {% 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 class="blog-content-item g-grid pure-g-r">
<div id="item" class="g-block pure-u-2-3"> <div id="item" class="g-block pure-u-2-3">

2
templates/partials/archives.html.twig
View File

@ -1,7 +1,7 @@
<ul class="archives"> <ul class="archives">
{% for month,items in archives_data %} {% for month,items in archives_data %}
<li> <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> <span class="archive_date">{{ month }}</span>
{% if archives_show_count %} {% if archives_show_count %}
<span>({{ items|length }})</span> <span>({{ items|length }})</span>

11
templates/partials/base.html.twig
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() {

3
templates/partials/metadata.html.twig
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 %}

2
templates/partials/search.html.twig
View File

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

2
templates/partials/simplesearch_searchbox.html.twig
View File

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