Merge branch 'develop' into patch-1

This commit is contained in:
bertolds
2017-08-07 09:46:37 -04:00
11 changed files with 11 additions and 11 deletions

View File

@@ -66,7 +66,7 @@ You can use `vue-chartjs` directly in the browser without any build setup. Like
If you're using Gulp, Browserify or Webpack 1 the entry is `vue-chartjs.js` which is __transpiled__ and __bundled__ UMD Module. If you're using Gulp, Browserify or Webpack 1 the entry is `vue-chartjs.js` which is __transpiled__ and __bundled__ UMD Module.
However Vue.js and Chart.js are `deerDependencies` so you have to install them seperately. In most projects you will have `Vue.js` already installed anyways. This way, you can have different versions of Vue.js and Chart.js then in this package. However Vue.js and Chart.js are `peerDependencies` so you have to install them separately. In most projects you will have `Vue.js` already installed anyways. This way, you can have different versions of Vue.js and Chart.js then in this package.
### Webpack 2 ### Webpack 2
If you're using Webpack 2 it will automatically use the `jsnext:main` / `module` entry point. Which is `es/index.js` If you're using Webpack 2 it will automatically use the `jsnext:main` / `module` entry point. Which is `es/index.js`

View File

@@ -1,6 +1,6 @@
{ {
"name": "vue-chartjs", "name": "vue-chartjs",
"version": "2.8.0", "version": "2.8.1",
"description": "vue.js wrapper for chart.js", "description": "vue.js wrapper for chart.js",
"author": "Jakub Juszczak <jakub@posteo.de>", "author": "Jakub Juszczak <jakub@posteo.de>",
"homepage": "http://vue-chartjs.org", "homepage": "http://vue-chartjs.org",

View File

@@ -45,7 +45,7 @@ export default Vue.extend({
default () { default () {
return { return {
width: '100%', width: '100%',
height: '200%', height: '100%',
position: 'relative' position: 'relative'
} }
} }

View File

@@ -46,7 +46,7 @@ export default Vue.extend({
default () { default () {
return { return {
width: '100%', width: '100%',
height: '200%', height: '100%',
position: 'relative' position: 'relative'
} }
} }

View File

@@ -46,7 +46,7 @@ export default Vue.extend({
default () { default () {
return { return {
width: '100%', width: '100%',
height: '200%', height: '100%',
position: 'relative' position: 'relative'
} }
} }

View File

@@ -46,7 +46,7 @@ export default Vue.extend({
default () { default () {
return { return {
width: '100%', width: '100%',
height: '200%', height: '100%',
position: 'relative' position: 'relative'
} }
} }

View File

@@ -46,7 +46,7 @@ export default Vue.extend({
default () { default () {
return { return {
width: '100%', width: '100%',
height: '200%', height: '100%',
position: 'relative' position: 'relative'
} }
} }

View File

@@ -46,7 +46,7 @@ export default Vue.extend({
default () { default () {
return { return {
width: '100%', width: '100%',
height: '200%', height: '100%',
position: 'relative' position: 'relative'
} }
} }

View File

@@ -46,7 +46,7 @@ export default Vue.extend({
default () { default () {
return { return {
width: '100%', width: '100%',
height: '200%', height: '100%',
position: 'relative' position: 'relative'
} }
} }

View File

@@ -46,7 +46,7 @@ export default Vue.extend({
default () { default () {
return { return {
width: '100%', width: '100%',
height: '200%', height: '100%',
position: 'relative' position: 'relative'
} }
} }

View File

@@ -46,7 +46,7 @@ export default Vue.extend({
default () { default () {
return { return {
width: '100%', width: '100%',
height: '200%', height: '100%',
position: 'relative' position: 'relative'
} }
} }