Merge branch 'feature/twig' into develop

This commit is contained in:
James Cole
2015-05-02 21:16:21 +02:00
119 changed files with 6201 additions and 51 deletions

View File

@@ -29,8 +29,8 @@ $(function() {
var url = window.location;
var element = $('ul.nav a').filter(function() {
return this.href == url || url.href.indexOf(this.href) == 0;
}).addClass('active').parent().parent().addClass('in').parent();
}).parent().parent().addClass('in').parent();/*addClass('active')*/
if (element.is('li')) {
element.addClass('active');
//element.addClass('active');
}
});