diff --git a/aleksis/core/assets/app.js b/aleksis/core/assets/app.js index 95196ba8a18303fcdf0da9fb1a77ff0e488ca55d..daf30dfdb6323cc53ec582702f0964b307014cff 100644 --- a/aleksis/core/assets/app.js +++ b/aleksis/core/assets/app.js @@ -6,6 +6,8 @@ import "vuetify/dist/vuetify.min.css" import ApolloClient from 'apollo-boost' import VueApollo from 'vue-apollo' +import "./css/global.scss" + Vue.use(Vuetify) Vue.use(VueRouter) diff --git a/aleksis/core/static/public/vue_style.scss b/aleksis/core/assets/css/global.scss similarity index 100% rename from aleksis/core/static/public/vue_style.scss rename to aleksis/core/assets/css/global.scss diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index 3313076e8d2649bbbc0fa885e59ea9c5d84dcf62..6a71e0eaf122cc6db48c02b6d882a35e50370afa 100644 --- a/aleksis/core/settings.py +++ b/aleksis/core/settings.py @@ -591,13 +591,13 @@ YARN_INSTALLED_APPS = [ "deepmerge@^4.2.2", "graphql@^15.8.0", "graphql-tag@^2.12.6", - "sass@~1.32", + "sass@^1.32", "vue@^2.7.7", "vue-apollo@^3.1.0", "vuetify@^2.6.7", "vue-router@^3.5.2", "css-loader@^6.7.1", - "sass-loader@^8.0", + "sass-loader@^13.0", "vue-loader@^15.0.0", "vue-style-loader@^4.1.3", "vue-template-compiler@^2.7.7", diff --git a/aleksis/core/webpack.config.js b/aleksis/core/webpack.config.js index 345972389a066fd8f69ae8b821af3ff6019322f0..f33cc60252c0c11bfeacb4c304db7c396a9530ad 100644 --- a/aleksis/core/webpack.config.js +++ b/aleksis/core/webpack.config.js @@ -36,16 +36,15 @@ module.exports = { use: ['vue-style-loader', 'css-loader'], }, { - test: /\.s(c|a)ss$/, + test: /\.scss$/, use: [ 'vue-style-loader', 'css-loader', { loader: 'sass-loader', options: { - implementation: require('sass'), sassOptions: { - indentedSyntax: true + indentedSyntax: false }, }, },