Merge branch 'release/1.1.1'

This commit is contained in:
Karol Orzeł 2015-09-18 11:53:52 +02:00
commit f2750f9e9b
7 changed files with 17 additions and 7 deletions

View File

@ -1,3 +1,11 @@
# v1.1.1
## 09/18/2015
1. [](#improved)
* compatibility with newest Grav version.
1. [](#bugfix)
* SimpleForm compatibility bugfixes.
# v1.1.0
## 08/25/2015

View File

@ -1,5 +1,5 @@
name: Deliver
version: 1.1.0
version: 1.1.1
description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme."
icon: newspaper-o
author:

View File

@ -1327,7 +1327,8 @@ ul.pagination {
font-size: 1rem; }
.contact button {
font-family: "novecento_sans_widedemibold", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif;
text-transform: uppercase; }
text-transform: uppercase;
display: block; }
.contact #simple_form-success, .contact #simple_form-submit {
display: inline-block; }
.contact #simple_form-success strong, .contact #simple_form-success label, .contact #simple_form-success th, .contact #simple_form-submit strong, .contact #simple_form-submit label, .contact #simple_form-submit th {

File diff suppressed because one or more lines are too long

View File

@ -43,6 +43,7 @@
@extend .default-animation;
font-family: $font-family-header;
text-transform: uppercase;
display: block;
}
#simple_form-success, #simple_form-submit {
display: inline-block;

View File

@ -1,5 +1,5 @@
{% extends 'partials/base.html.twig' %}
{% block content %}
{{ page.content }}
<p>{{ page.content }}</p>
{% endblock %}

View File

@ -2,9 +2,9 @@
<div class="g-grid pure-g-r">
<div id="listing" class="g-block pure-u-2-3">
{% if config.plugins.simple_form.enabled %}
{% set simple_form_config = page.header.simple_form ?: config.themes.deliver.simple_form %}
{{ simple_form(simple_form_config) }}
{% endif %}
{% set simple_form_config = page.header.simple_form ?: config.themes.deliver.simple_form %}
{{ simple_form(simple_form_config) }}
{% endif %}
</div>
<div id="sidebar" class="g-block size-1-3 pure-u-1-3">
{{ content }}