Merge branch 'release/1.4.0'
This commit is contained in:
commit
a237e42e61
5 changed files with 16 additions and 8 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
# v1.4.0
|
||||||
|
## 01/06/2016
|
||||||
|
|
||||||
|
1. [](#improved)
|
||||||
|
* Fontawesome updated to 4.5.0
|
||||||
|
1. [](#bugfix)
|
||||||
|
* Searchbox in search results fix
|
||||||
|
|
||||||
# v1.3.1
|
# v1.3.1
|
||||||
## 12/18/2015
|
## 12/18/2015
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
name: Deliver
|
name: Deliver
|
||||||
version: 1.3.1
|
version: 1.4.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:
|
||||||
|
|
4
css/font-awesome.min.css
vendored
4
css/font-awesome.min.css
vendored
File diff suppressed because one or more lines are too long
|
@ -63,13 +63,13 @@
|
||||||
{% block body %}
|
{% block body %}
|
||||||
<section id="body" class="{{ class }}">
|
<section id="body" class="{{ class }}">
|
||||||
{% block content %}{% endblock %}
|
{% block content %}{% endblock %}
|
||||||
|
|
||||||
{% block footer %}
|
{% block footer %}
|
||||||
{% include 'modular/footer.html.twig' %}
|
{% include 'modular/footer.html.twig' %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</section>
|
</section>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="sb-slidebar sb-left sb-width-thin">
|
<div class="sb-slidebar sb-left sb-width-thin">
|
||||||
<div id="panel">
|
<div id="panel">
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
{{ assets.css() }}
|
{{ assets.css() }}
|
||||||
|
|
||||||
{% block javascripts %}
|
{% block javascripts %}
|
||||||
{% do assets.addJs('theme://js/jquery-2.1.1.min.js',101) %}
|
{% do assets.add('jquery', 101) %}
|
||||||
{% do assets.addJs('theme://js/modernizr.custom.71422.js',100) %}
|
{% do assets.addJs('theme://js/modernizr.custom.71422.js',100) %}
|
||||||
{% do assets.addJs('theme://js/deliver.js') %}
|
{% do assets.addJs('theme://js/deliver.js') %}
|
||||||
{% do assets.addJs('theme://js/slidebars.min.js') %}
|
{% do assets.addJs('theme://js/slidebars.min.js') %}
|
||||||
|
@ -63,13 +63,13 @@
|
||||||
{% block body %}
|
{% block body %}
|
||||||
<section id="body" class="{{ class }}">
|
<section id="body" class="{{ class }}">
|
||||||
{% block content %}{% endblock %}
|
{% block content %}{% endblock %}
|
||||||
|
|
||||||
{% block footer %}
|
{% block footer %}
|
||||||
{% include 'modular/footer.html.twig' %}
|
{% include 'modular/footer.html.twig' %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</section>
|
</section>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="sb-slidebar sb-left sb-width-thin">
|
<div class="sb-slidebar sb-left sb-width-thin">
|
||||||
<div id="panel">
|
<div id="panel">
|
||||||
|
|
Loading…
Reference in a new issue