Merge branch 'master' into newmc

diff --combined js/90-mobilenav.js
index f8c9628ca824677e698c6599116fa71f16da4881,c53666967596cf298dfabcfad404a75e1d5fcceb..8c1e38a4b87071034efc9266857a67930f052c9c
--- 1/js/90-mobilenav.js
--- 2/js/90-mobilenav.js
+++ b/js/90-mobilenav.js
@@@ -1,7 -1,7 +1,7 @@@
  $(function(){
-       if(window.innerWidth >= 768)
+       if(document.documentElement.clientWidth >= 768)
                return;
        $('#title')[0].insertAdjacentHTML('beforebegin', '<div class="text-center">Tap title to toggle menu</div>');
        $('nav')[0].classList.add('hidden');
 -      $('#title').on('click', () => $('nav')[0].classList.toggle('hidden'));
 +      $('#title,#logo').on('click', () => $('nav')[0].classList.toggle('hidden'));
  });