Merge branch 'master' into newmc

Conflicts:
	js/90-mobilenav.js

diff --cc js/90-mobilenav.js
index 8c1e38a4b87071034efc9266857a67930f052c9c,36e7298b9b4b43e834b9fd6c7be2a41f97b72e45..9efe8fccb7b968b8759ab0d2cb78f50d51152771
--- 1/js/90-mobilenav.js
--- 2/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', '<div class="text-center">Tap title to toggle menu</div>');
-       $('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', '<div class="text-center visible-xs-block">Tap title to toggle menu</div>');
 -      $('#title').on('click', () => nav.classList.toggle('hidden-xs'));
++      $('#title,#logo').on('click', () => nav.classList.toggle('hidden-xs'));
  });

diff --cc js/90-nav.js
Simple merge

diff --cc js/90-themes.js
Simple merge