From: Marius Gavrilescu Date: Mon, 4 May 2015 12:08:39 +0000 (+0300) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=0ffa7a2279c36443ce58a2b0d383e45011b7230e;p=plack-app-gruntmaster.git Merge branch 'master' into newmc Conflicts: js/90-mobilenav.js --- 0ffa7a2279c36443ce58a2b0d383e45011b7230e diff --cc js/90-mobilenav.js index 8c1e38a,36e7298..9efe8fc --- a/js/90-mobilenav.js +++ b/js/90-mobilenav.js @@@ -1,7 -1,6 +1,6 @@@ $(function(){ - if(document.documentElement.clientWidth >= 768) - return; - $('#title')[0].insertAdjacentHTML('beforebegin', '
Tap title to toggle menu
'); - $('nav')[0].classList.add('hidden'); - $('#title,#logo').on('click', () => $('nav')[0].classList.toggle('hidden')); + const nav = $('nav')[0]; + nav.classList.add('hidden-xs'); + $('#title')[0].insertAdjacentHTML('beforebegin', '
Tap title to toggle menu
'); - $('#title').on('click', () => nav.classList.toggle('hidden-xs')); ++ $('#title,#logo').on('click', () => nav.classList.toggle('hidden-xs')); });