diff --git a/hwe/scss/common/bootstrap5.scss b/hwe/scss/common/bootstrap5.scss index 1802b74b..2e82bee2 100644 --- a/hwe/scss/common/bootstrap5.scss +++ b/hwe/scss/common/bootstrap5.scss @@ -9,7 +9,7 @@ $input-color: #303030; @import "./variables.scss"; @import "./bootswatch_custom_variables.scss"; -@import "/node_modules/bootstrap/scss/bootstrap.scss"; +@import "bootstrap/scss/bootstrap.scss"; @import "./bootswatch_custom.scss"; @import "./bootstrap_sammo.scss"; @import "./vue-multiselect.scss"; \ No newline at end of file diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss index 0eeb1e8f..735d8d69 100644 --- a/hwe/scss/main.scss +++ b/hwe/scss/main.scss @@ -1,5 +1,5 @@ -@import "./common/bootstrap5.scss"; @import "./common/break_500px.scss"; +@import "./common/bootstrap5.scss"; body { color: white; diff --git a/webpack.config.cjs b/webpack.config.cjs index 54c3ec24..f887875a 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -120,13 +120,7 @@ module.exports = (env, argv) => { }, { test: /\.vue\.(s?[ac]ss)$/, - use: ['vue-style-loader', 'css-loader', { - loader: 'esbuild-loader', - options: { - loader: 'css', - minify: true - } - }, 'sass-loader'] + use: ['vue-style-loader', 'css-loader', 'sass-loader'] }, { test: /(?