Merge branch 'release/1.0.3'

This commit is contained in:
Andy Miller 2015-03-01 15:47:51 -07:00
commit 1a4bd3f8fa
4 changed files with 9 additions and 7 deletions

View File

@ -1,3 +1,9 @@
# v1.0.3
## 03/01/2015
1. [](#improved)
* Switched to Grav's built-in `jQuery` assets
# v1.0.2
## 02/19/2015

View File

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

File diff suppressed because one or more lines are too long

View File

@ -27,7 +27,7 @@
{{ assets.css() }}
{% 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/deliver.js') %}
{% do assets.addJs('theme://js/slidebars.min.js') %}
@ -42,7 +42,7 @@
{% block header %}
<header id="header">
<div class="logo">
<h3><a href="{{ base_url == '' ? '/' : base_url }}">{{ config.site.title }}</a></h3>
<h3><a href="{{ base_url_absolute }}">{{ config.site.title }}</a></h3>
{% block social %}
{% include 'partials/social.html.twig' %}
{% endblock %}