feat: use nodebb-scoped bootswatch

closes #8527
NodeBB · Aug 11, 2020 · 12edd18 · 12edd18
1 parent 6e91885
commit 12edd18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/install/package.json b/install/package.json
@@ -37,7 +37,6 @@
         "benchpressjs": "^2.0.2",
         "body-parser": "^1.19.0",
         "bootstrap": "^3.4.1",
-        "bootswatch": "thomaspark/bootswatch#v3.4.1+1",
         "chart.js": "^2.9.3",
         "cli-graph": "^3.2.2",
         "clipboard": "^2.0.6",
@@ -77,6 +76,7 @@
         "mongodb": "3.6.0",
         "morgan": "^1.10.0",
         "mousetrap": "^1.6.5",
+        "@nodebb/bootswatch": "3.4.2",
         "@nodebb/mubsub": "^1.6.0",
         "@nodebb/socket.io-adapter-mongo": "3.0.1",
         "nconf": "^0.10.0",

diff --git a/src/meta/css.js b/src/meta/css.js
@@ -166,8 +166,8 @@ function getBundleMetadata(target, callback) {
 				skin: function (cb) {
 					const skinImport = [];
 					if (themeData && themeData.bootswatchSkin) {
-						skinImport.push('\n@import "./bootswatch/' + themeData.bootswatchSkin + '/variables.less";');
-						skinImport.push('\n@import "./bootswatch/' + themeData.bootswatchSkin + '/bootswatch.less";');
+						skinImport.push('\n@import "./@nodebb/bootswatch/' + themeData.bootswatchSkin + '/variables.less";');
+						skinImport.push('\n@import "./@nodebb/bootswatch/' + themeData.bootswatchSkin + '/bootswatch.less";');
 					}
 
 					cb(null, skinImport.join(''));