Merge branch 'release/1.4.0'

CHANGELOG.md

@@ -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
 ## 12/18/2015
 

blueprints.yaml

@@ -1,5 +1,5 @@
 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."
 icon: newspaper-o
 author:

templates/partials/base.html.twig

@@ -63,13 +63,13 @@
         {% block body %}
         <section id="body" class="{{ class }}">
             {% block content %}{% endblock %}
-            
+
             {% block footer %}
             {% include 'modular/footer.html.twig' %}
             {% endblock %}
         </section>
         {% endblock %}
-        
+
     </div>
     <div class="sb-slidebar sb-left sb-width-thin">
         <div id="panel">

templates/partials/simplesearch_base.html.twig

@@ -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') %}
@@ -63,13 +63,13 @@
         {% block body %}
         <section id="body" class="{{ class }}">
             {% block content %}{% endblock %}
-            
+
             {% block footer %}
             {% include 'modular/footer.html.twig' %}
             {% endblock %}
         </section>
         {% endblock %}
-        
+
     </div>
     <div class="sb-slidebar sb-left sb-width-thin">
         <div id="panel">