Merge branch 'develop'

less/modules/taskbar.less

@@ -137,11 +137,9 @@
 		}
 	}
 
-
-	@media (max-width: 979px) {
-		/*
-	 		Gets in the way of entering text when writing posts
-		*/
-		display: none !important;
+	@media (max-width: @screen-sm) {
+		.nav.navbar-nav {
+			margin: 0;
+		}
 	}
 }

less/style.less

@@ -1,5 +1,3 @@
-@import url(https://fonts.googleapis.com/css?family=Roboto:300,400,500,700);
-
 html {
 	overflow-y: scroll;
 	min-height: 100%;

library.js

@@ -117,4 +117,14 @@ library.addUserToTopic = function(data, callback) {
 	}
 };
 
+library.getLinkTags = function (data, callback) {
+	data.links.push({
+		rel: 'prefetch stylesheet',
+		type: '',
+		href: 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700',
+	});
+
+	callback(null, data);
+};
+
 module.exports = library;

plugin.json

@@ -7,7 +7,8 @@
 		{ "hook": "filter:config.get", "method": "getThemeConfig" },
 		{ "hook": "static:app.load", "method": "init" },
 		{ "hook": "filter:admin.header.build", "method": "addAdminNavigation" },
-		{ "hook": "filter:topic.build", "method": "addUserToTopic" }
+		{ "hook": "filter:topic.build", "method": "addUserToTopic" },
+		{ "hook": "filter:meta.getLinkTags", "method": "getLinkTags"}
 	],
 	"scripts": [
 		"lib/persona.js",

templates/footer.tpl

@@ -1,10 +1,6 @@
 		</div><!-- END container -->
 	</main>
 
-	<div class="hide">
-	<!-- IMPORT 500-embed.tpl -->
-	</div>
-
 	<div class="topic-search hidden">
 		<div class="btn-group">
 			<button type="button" class="btn btn-default count"></button>
@@ -20,8 +16,20 @@
 		</div>
 	</div>
 
+	<script async src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
+
+	<!-- BEGIN scripts -->
+	<script async defer type="text/javascript" src="{scripts.src}"></script>
+	<!-- END scripts -->
+
 	<script>
-		require(['forum/footer']);
+		window.addEventListener('load', function () {
+			require(['forum/footer']);
+		});
 	</script>
+
+	<div class="hide">
+	<!-- IMPORT 500-embed.tpl -->
+	</div>
 </body>
 </html>

templates/header.tpl

@@ -16,12 +16,6 @@
 		};
 	</script>
 
-	<script src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
-
-	<!-- BEGIN scripts -->
-	<script type="text/javascript" src="{scripts.src}"></script>
-	<!-- END scripts -->
-
 	<!-- IF useCustomJS -->
 	{{customJS}}
 	<!-- ENDIF useCustomJS -->