From 12edd18b46b039f812bc20ed8ab012d595d76ccd Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 11 Aug 2020 12:06:38 -0400
Subject: [PATCH] feat: use nodebb-scoped bootswatch

closes #8527
---
 install/package.json | 2 +-
 src/meta/css.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/package.json b/install/package.json
index d8fb12c592..b1f2668795 100644
--- 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
index 3af72f0971..7b20ac6ba4 100644
--- 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(''));