Skip to content
Snippets Groups Projects
Commit 4a3a72a9 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'load-vue-style' into 'master'

Load vue style

See merge request !1078
parents 4f3fd826 c84c2df8
No related branches found
No related tags found
1 merge request!1078Load vue style
Pipeline #84691 canceled
......@@ -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)
......
......@@ -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",
......
......@@ -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
},
},
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment