diff --git a/Gruntfile.js b/Gruntfile.js index ea8c518ec7..71bc5b033b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -56,12 +56,16 @@ module.exports = function (grunt) { const styleUpdated_Client = pluginList.map(p => `node_modules/${p}/*.less`) .concat(pluginList.map(p => `node_modules/${p}/*.css`)) + .concat(pluginList.map(p => `node_modules/${p}/*.scss`)) .concat(pluginList.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`)) + .concat(pluginList.map(p => `node_modules/${p}/+(public|static|scss)/**/*.scss`)) .concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`)); const styleUpdated_Admin = pluginList.map(p => `node_modules/${p}/*.less`) .concat(pluginList.map(p => `node_modules/${p}/*.css`)) + .concat(pluginList.map(p => `node_modules/${p}/*.scss`)) .concat(pluginList.map(p => `node_modules/${p}/+(public|static|less)/**/*.less`)) + .concat(pluginList.map(p => `node_modules/${p}/+(public|static|scss)/**/*.scss`)) .concat(pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.css`)); const clientUpdated = pluginList.map(p => `node_modules/${p}/+(public|static)/**/*.js`); @@ -75,6 +79,7 @@ module.exports = function (grunt) { styleUpdated_Client: { files: [ 'public/less/**/*.less', + 'public/scss/**/*.scss', ...styleUpdated_Client, ], options: { @@ -84,6 +89,7 @@ module.exports = function (grunt) { styleUpdated_Admin: { files: [ 'public/less/**/*.less', + 'public/scss/**/*.scss', ...styleUpdated_Admin, ], options: { @@ -215,4 +221,4 @@ function addBaseThemes(pluginList) { } } while (baseTheme); return pluginList; -} +} \ No newline at end of file diff --git a/install/package.json b/install/package.json index 0f1d15ae17..cac061f8c7 100644 --- a/install/package.json +++ b/install/package.json @@ -38,7 +38,7 @@ "benchpressjs": "2.4.3", "body-parser": "1.20.0", "bootbox": "5.5.3", - "bootstrap": "3.4.1", + "bootstrap": "5.2.0", "chalk": "4.1.2", "chart.js": "2.9.4", "cli-graph": "3.2.2", @@ -98,7 +98,8 @@ "nodebb-plugin-spam-be-gone": "1.0.0", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", - "nodebb-theme-persona": "12.1.0", + "nodebb-theme-palette": "https://github.com/NodeBB/nodebb-theme-palette.git", + "nodebb-theme-persona": "https://github.com/NodeBB/nodebb-theme-persona.git#bootstrap", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", @@ -118,6 +119,7 @@ "rimraf": "3.0.2", "rss": "1.2.2", "sanitize-html": "2.7.1", + "sass": "1.54.3", "semver": "7.3.7", "serve-favicon": "2.5.0", "sharp": "0.30.7",