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

app.js

@@ -348,7 +348,7 @@ function resetThemes(callback) {
 		type: 'local',
 		id: 'nodebb-theme-persona'
 	}, function(err) {
-		winston.info('[reset] Theme reset to Vanilla');
+		winston.info('[reset] Theme reset to Persona');
 		if (typeof callback === 'function') {
 			callback(err);
 		} else {

public/less/admin/appearance/themes.less

@@ -55,6 +55,12 @@
 		}
 	}
 
+	[data-type="local"] {
+		.mdl-card__supporting-text {
+			height: 150px;
+		}
+	}
+
 	textarea[data-field] {
 		min-height: 450px;
 		width: 100%;

public/src/admin/appearance/skins.js

@@ -60,11 +60,13 @@ define('admin/appearance/skins', function() {
 		}, function(html) {
 			themeContainer.html(html);
 
-			var skin = config['theme:src']
-				.match(/latest\/(\S+)\/bootstrap.min.css/)[1]
-				.replace(/(^|\s)([a-z])/g , function(m,p1,p2){return p1+p2.toUpperCase();});
+			if (config['theme:src']) {
+				var skin = config['theme:src']
+					.match(/latest\/(\S+)\/bootstrap.min.css/)[1]
+					.replace(/(^|\s)([a-z])/g , function(m,p1,p2){return p1+p2.toUpperCase();});
 
-			highlightSelectedTheme(skin);
+				highlightSelectedTheme(skin);
+			}
 		});
 	};
 

src/views/admin/header.tpl

@@ -7,7 +7,6 @@
 	<link rel="stylesheet" href="{relative_path}/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css?{cache-buster}">
 	<link rel="stylesheet" type="text/css" href="{relative_path}/admin.css?{cache-buster}" />
 	<link rel="stylesheet" type="text/css" href="{relative_path}/vendor/mdl/mdl.min.css?{cache-buster}" />
-	<link rel="stylesheet" type="text/css" href="{relative_path}/vendor/snackbar/snackbar.min.css?{cache-buster}" />
 	<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
 
 	<script>