Merge branch 'master' of https://github.com/designcreateplay/NodeBB

app.js

@@ -81,7 +81,7 @@
 			winston.info('Base Configuration OK.');
 		}
 
-		if (semver.gt(pkg.dependencies['nodebb-theme-cerulean'], require('./node_modules/nodebb-theme-cerulean/package.json').version)) {
+		if (!semver.satisfies(require('./node_modules/nodebb-theme-cerulean/package.json').version, pkg.dependencies['nodebb-theme-cerulean'])) {
 			winston.error('nodebb-theme-cerulean is out of date - please run npm install.');
 		}
 

public/templates/header.tpl

@@ -4,7 +4,9 @@
 	<title>{browserTitle}</title>
 	{meta_tags}
 	<link rel="icon" type="image/x-icon" href="{brand:favicon}" />
-	<link href="{cssSrc}" rel="stylesheet" media="screen">
+	<!-- IF bootswatchCSS -->
+	<link href="{bootswatchCSS}" rel="stylesheet" media="screen">
+	<!-- ENDIF bootswatchCSS -->
 	<link rel="stylesheet" href="{relative_path}/vendor/fontawesome/css/font-awesome.min.css">
 	<link rel="stylesheet" type="text/css" href="{relative_path}/css/theme.css?{cache-buster}" />
 	{link_tags}

src/webserver.js

@@ -94,7 +94,7 @@ if(nconf.get('ssl')) {
 					href: meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png'
 				}],
 				templateValues = {
-					cssSrc: meta.config['theme:src'] || nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css',
+					bootswatchCSS: meta.config['theme:src'],
 					pluginCSS: plugins.cssFiles.map(function(file) { return { path: nconf.get('relative_path') + file + (meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : '') }; }),
 					title: meta.config.title || '',
 					description: meta.config.description || '',