From: Marius Gavrilescu Date: Wed, 8 Apr 2015 17:41:01 +0000 (+0300) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=f2752dd5062a025917bb88bda9ced71bc6d06875;p=plack-app-gruntmaster.git Merge branch 'master' into newmc Conflicts: js/90-mobilenav.js --- f2752dd5062a025917bb88bda9ced71bc6d06875 diff --cc js/90-mobilenav.js index d66ebe4,ad354ac..cf0adfc --- a/js/90-mobilenav.js +++ b/js/90-mobilenav.js @@@ -6,7 -6,7 +6,7 @@@ return; $('#title').before('
Tap title to toggle menu
'); $('nav').addClass('hidden'); - $('#title,#logo').css('margin', '6px').on('click', function () { - $('#title').on('click', function () { ++ $('#title,#logo').on('click', function () { $('nav').toggleClass('hidden'); }); });