Merge pull request #703 from bratberg/master

Bumped nuxt and vuetify versions
This commit is contained in:
Sébastien Chopin 2017-05-14 19:36:40 +02:00 committed by GitHub
commit 383a9a46c0
5 changed files with 33 additions and 5 deletions

View File

@ -1,4 +1,8 @@
# Using Vuetify.js with Nuxt.js # Using Vuetify.js with Nuxt.js
## Demo
https://nuxt-with-vuetify-example.surge.sh
## Resources
https://nuxtjs.org/examples/with-vuetify<br> https://nuxtjs.org/examples/with-vuetify<br>
https://vuetifyjs.com/ https://vuetifyjs.com/

View File

@ -1 +1,2 @@
@require './vendor/material-icons.styl'
@require './vendor/vuetify.styl' @require './vendor/vuetify.styl'

View File

@ -0,0 +1,21 @@
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: local('Material Icons'), local('MaterialIcons-Regular'), url(https://fonts.gstatic.com/s/materialicons/v22/2fcrYFNaTjcS6g4U3t-Y5UEw0lE80llgEseQY3FEmqw.woff2) format('woff2');
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px;
line-height: 1;
letter-spacing: normal;
text-transform: none;
display: inline-block;
white-space: nowrap;
word-wrap: normal;
direction: ltr;
-webkit-font-feature-settings: 'liga';
-webkit-font-smoothing: antialiased;
}

View File

@ -11,8 +11,7 @@ module.exports = {
], ],
head: { head: {
link: [ link: [
{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/css?family=Roboto' }, { rel: 'preload', as: 'style', href: 'https://fonts.googleapis.com/css?family=Roboto' }
{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/icon?family=Material+Icons' }
] ]
} }
} }

View File

@ -1,13 +1,16 @@
{ {
"name": "with-vuetify", "name": "with-vuetify",
"dependencies": { "dependencies": {
"nuxt": "0.10", "nuxt": "^0.10.7",
"vuetify": "0.9.4" "vuetify": "^0.11.1"
}, },
"scripts": { "scripts": {
"dev": "nuxt", "dev": "nuxt",
"build": "nuxt build", "build": "nuxt build",
"start": "nuxt start" "start": "nuxt start",
"generate": "nuxt generate",
"predeploy": "yarn run generate",
"deploy": "surge --domain nuxt-with-vuetify-example.surge.sh dist"
}, },
"devDependencies": { "devDependencies": {
"stylus": "^0.54.5", "stylus": "^0.54.5",