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

11 years ago · 030cfbffa4
parent ed1c276739 9c9fadb5a1
commit 030cfbffa4
4 changed files with 7 additions and 3 deletions
--- a/package.json
+++ b/package.json
@ -38,7 +38,7 @@
    "prompt": "~0.2.11",
    "uglify-js": "~2.4.0",
    "validator": "~1.5.1",
-    "nodebb-plugin-mentions": "~0.2",
+    "nodebb-plugin-mentions": "~0.3",
    "nodebb-plugin-markdown": "~0.3",
    "nodebb-theme-vanilla": "~0.0.13",
    "nodebb-theme-cerulean": "~0.0.12",
--- a/public/src/forum/admin/themes.js
+++ b/public/src/forum/admin/themes.js
@ -114,7 +114,7 @@ define(function() {

 		for (var x = 0; x < numThemes; x++) {
 			var theme = bootswatch.themes[x];
-			themeEl.setAttribute('data-css', theme.cssMin);
+			themeEl.setAttribute('data-css', theme.cssCdn);
 			themeEl.setAttribute('data-theme', theme.name);
 			themeEl.innerHTML = '<img src="' + theme.thumbnail + '" />' +
 				'<div>' +
--- a/public/src/translator.js
+++ b/public/src/translator.js
@ -39,6 +39,10 @@
 					languageCode = 'cz';
 					break;

+				case 'zh_cn':
+					languageCode = 'zh-CN';
+					break;
+
 				default:
 					languageCode = config.defaultLang;
 					break;
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@ -37,7 +37,7 @@
 	<script src="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
 	<script src="{relative_path}/src/utils.js"></script>

-	<link rel="stylesheet" type="text/css" href="{relative_path}/css/theme.css" />
+	<link rel="stylesheet" type="text/css" href="{relative_path}/css/theme.css?{cache-buster}" />
 </head>

 <body class="admin">