diff --git a/template/_package.json b/template/_package.json
index acb3aee72..182ba876e 100644
--- a/template/_package.json
+++ b/template/_package.json
@@ -73,8 +73,6 @@
<%_ if (ui === 'bootstrap') { _%>
"bootstrap-vue": "^2.0.0-rc.11",
"bootstrap": "^4.1.3",
- <%_ } else if (ui === 'vuetify') { _%>
- "@nuxtjs/vuetify": "0.5.5",
<%_ } else if (ui === 'bulma') { _%>
"@nuxtjs/bulma": "^1.2.1",
<%_ } else if (ui === 'element-ui') { _%>
@@ -105,8 +103,7 @@
<%_ if (ui === 'tailwind') { _%>
"@nuxtjs/tailwindcss": "^1.0.0",
<%_ } else if (ui === 'vuetify') { _%>
- "stylus": "^0.54.5",
- "stylus-loader": "^3.0.2",
+ "@nuxtjs/vuetify": "^1.0.0",
<%_ } _%>
<%_ if (eslint) { _%>
"@nuxtjs/eslint-config": "^1.0.1",
diff --git a/template/frameworks/vuetify/assets/style/app.styl b/template/frameworks/vuetify/assets/style/app.styl
deleted file mode 100644
index dbb267990..000000000
--- a/template/frameworks/vuetify/assets/style/app.styl
+++ /dev/null
@@ -1,2 +0,0 @@
-// Import Vuetify styling
-@require '~vuetify/src/stylus/app.styl'
diff --git a/template/frameworks/vuetify/assets/style/variables.styl b/template/frameworks/vuetify/assets/style/variables.styl
deleted file mode 100644
index 8a26685a8..000000000
--- a/template/frameworks/vuetify/assets/style/variables.styl
+++ /dev/null
@@ -1 +0,0 @@
-@require '~vuetify/src/stylus/settings/_variables.styl'
diff --git a/template/frameworks/vuetify/assets/variables.scss b/template/frameworks/vuetify/assets/variables.scss
new file mode 100644
index 000000000..eddcf778b
--- /dev/null
+++ b/template/frameworks/vuetify/assets/variables.scss
@@ -0,0 +1 @@
+$font-size-root: 20px;
diff --git a/template/frameworks/vuetify/layouts/default.vue b/template/frameworks/vuetify/layouts/default.vue
index 8f6b9969c..dfdc26ec7 100644
--- a/template/frameworks/vuetify/layouts/default.vue
+++ b/template/frameworks/vuetify/layouts/default.vue
@@ -8,45 +8,45 @@
app
>
-
-
+
{{ item.icon }}
-
-
-
-
-
+
+
+
+
+
-
-
+
- {{ `chevron_${miniVariant ? 'right' : 'left'}` }}
+ mdi-{{ `chevron-${miniVariant ? 'right' : 'left'}` }}
- web
+ mdi-application
- remove
+ mdi-minus
@@ -54,9 +54,9 @@
icon
@click.stop="rightDrawer = !rightDrawer"
>
- menu
+ mdi-menu
-
+
@@ -69,14 +69,14 @@
fixed
>
-
-
+
+
- compare_arrows
+ mdi-repeat
-
- Switch drawer (click me)
-
+
+ Switch drawer (click me)
+
-
+
@@ -68,7 +68,6 @@
diff --git a/template/frameworks/vuetify/pages/inspire.vue b/template/frameworks/vuetify/pages/inspire.vue
index be17a824f..008d06519 100644
--- a/template/frameworks/vuetify/pages/inspire.vue
+++ b/template/frameworks/vuetify/pages/inspire.vue
@@ -1,6 +1,6 @@
-
+
,
- {
- rel: 'stylesheet',
- href:
- 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons'
- }
- <%_ } _%>
]
},
/*
@@ -86,6 +79,8 @@ module.exports = {
<%_ if (ui === 'tailwind') { _%>
// Doc: https://github.com/nuxt-community/nuxt-tailwindcss
'@nuxtjs/tailwindcss',
+ <%_ } else if (ui === 'vuetify') { _%>
+ '@nuxtjs/vuetify',
<%_ } _%>
],
/*
@@ -101,8 +96,6 @@ module.exports = {
<%_ } else if (ui === 'buefy') { _%>
// Doc: https://buefy.github.io/#/documentation
'nuxt-buefy',
- <%_ } else if (ui === 'vuetify') { _%>
- '@nuxtjs/vuetify',
<%_ } _%>
<%_ if (axios) { _%>
// Doc: https://axios.nuxtjs.org/usage
@@ -126,14 +119,20 @@ module.exports = {
** https://github.com/nuxt-community/vuetify-module
*/
vuetify: {
+ customVariables: ['~/assets/variables.scss'],
theme: {
- primary: colors.blue.darken2,
- accent: colors.grey.darken3,
- secondary: colors.amber.darken3,
- info: colors.teal.lighten1,
- warning: colors.amber.base,
- error: colors.deepOrange.accent4,
- success: colors.green.accent3
+ dark: true,
+ themes: {
+ dark: {
+ primary: colors.blue.darken2,
+ accent: colors.grey.darken3,
+ secondary: colors.amber.darken3,
+ info: colors.teal.lighten1,
+ warning: colors.amber.base,
+ error: colors.deepOrange.accent4,
+ success: colors.green.accent3
+ }
+ }
}
},
<%_ } _%>
diff --git a/test/snapshots/index.test.js.md b/test/snapshots/index.test.js.md
index 991e8ed18..29b5a1f29 100644
--- a/test/snapshots/index.test.js.md
+++ b/test/snapshots/index.test.js.md
@@ -2992,8 +2992,7 @@ Generated by [AVA](https://ava.li).
'.gitignore',
'README.md',
'assets/README.md',
- 'assets/style/app.styl',
- 'assets/style/variables.styl',
+ 'assets/variables.scss',
'components/Logo.vue',
'components/README.md',
'components/VuetifyLogo.vue',
@@ -3017,13 +3016,11 @@ Generated by [AVA](https://ava.li).
{
dependencies: {
- '@nuxtjs/vuetify': '0.5.5',
nuxt: '^2.0.0',
},
devDependencies: {
+ '@nuxtjs/vuetify': '^1.0.0',
nodemon: '^1.18.9',
- stylus: '^0.54.5',
- 'stylus-loader': '^3.0.2',
},
private: true,
scripts: {
@@ -3053,12 +3050,6 @@ Generated by [AVA](https://ava.li).
],␊
link: [␊
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }␊
- ,␊
- {␊
- rel: 'stylesheet',␊
- href:␊
- 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons'␊
- }␊
]␊
},␊
/*␊
@@ -3079,26 +3070,32 @@ Generated by [AVA](https://ava.li).
** Nuxt.js dev-modules␊
*/␊
devModules: [␊
+ '@nuxtjs/vuetify',␊
],␊
/*␊
** Nuxt.js modules␊
*/␊
modules: [␊
- '@nuxtjs/vuetify',␊
],␊
/*␊
** vuetify module configuration␊
** https://github.com/nuxt-community/vuetify-module␊
*/␊
vuetify: {␊
+ customVariables: ['~/assets/variables.scss'],␊
theme: {␊
- primary: colors.blue.darken2,␊
- accent: colors.grey.darken3,␊
- secondary: colors.amber.darken3,␊
- info: colors.teal.lighten1,␊
- warning: colors.amber.base,␊
- error: colors.deepOrange.accent4,␊
- success: colors.green.accent3␊
+ dark: true,␊
+ themes: {␊
+ dark: {␊
+ primary: colors.blue.darken2,␊
+ accent: colors.grey.darken3,␊
+ secondary: colors.amber.darken3,␊
+ info: colors.teal.lighten1,␊
+ warning: colors.amber.base,␊
+ error: colors.deepOrange.accent4,␊
+ success: colors.green.accent3␊
+ }␊
+ }␊
}␊
},␊
/*␊
diff --git a/test/snapshots/index.test.js.snap b/test/snapshots/index.test.js.snap
index 42db8f5d4..bdf136ab9 100644
Binary files a/test/snapshots/index.test.js.snap and b/test/snapshots/index.test.js.snap differ