Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: use nodebb-scoped bootswatch

Browse Source 
closes #8527
This commit is contained in:
Julian Lam
2020-08-11 12:06:38 -04:00
parent 6e91885836
commit 12edd18b46
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/package.json
View File

@@ -37,7 +37,6 @@
"benchpressjs": "^2.0.2", "benchpressjs": "^2.0.2",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"bootstrap": "^3.4.1", "bootstrap": "^3.4.1",
"bootswatch": "thomaspark/bootswatch#v3.4.1+1",
"chart.js": "^2.9.3", "chart.js": "^2.9.3",
"cli-graph": "^3.2.2", "cli-graph": "^3.2.2",
"clipboard": "^2.0.6", "clipboard": "^2.0.6",
@@ -77,6 +76,7 @@
"mongodb": "3.6.0", "mongodb": "3.6.0",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"mousetrap": "^1.6.5", "mousetrap": "^1.6.5",
"@nodebb/bootswatch": "3.4.2",
"@nodebb/mubsub": "^1.6.0", "@nodebb/mubsub": "^1.6.0",
"@nodebb/socket.io-adapter-mongo": "3.0.1", "@nodebb/socket.io-adapter-mongo": "3.0.1",
"nconf": "^0.10.0", "nconf": "^0.10.0",

4
src/meta/css.js
View File

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