Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring up to date with origin #1

Merged
merged 5 commits into from
Aug 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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
If you're using Webpack 2 it will automatically use the `jsnext:main` / `module` entry point. Which is `es/index.js`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-chartjs",
"version": "2.8.0",
"version": "2.8.1",
"description": "vue.js wrapper for chart.js",
"author": "Jakub Juszczak <[email protected]>",
"homepage": "http://vue-chartjs.org",
Expand Down
2 changes: 1 addition & 1 deletion src/BaseCharts/Bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default Vue.extend({
default () {
return {
width: '100%',
height: '200%',
height: '100%',
position: 'relative'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/BaseCharts/Bubble.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default Vue.extend({
default () {
return {
width: '100%',
height: '200%',
height: '100%',
position: 'relative'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/BaseCharts/Doughnut.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default Vue.extend({
default () {
return {
width: '100%',
height: '200%',
height: '100%',
position: 'relative'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/BaseCharts/HorizontalBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default Vue.extend({
default () {
return {
width: '100%',
height: '200%',
height: '100%',
position: 'relative'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/BaseCharts/Line.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default Vue.extend({
default () {
return {
width: '100%',
height: '200%',
height: '100%',
position: 'relative'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/BaseCharts/Pie.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default Vue.extend({
default () {
return {
width: '100%',
height: '200%',
height: '100%',
position: 'relative'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/BaseCharts/PolarArea.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default Vue.extend({
default () {
return {
width: '100%',
height: '200%',
height: '100%',
position: 'relative'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/BaseCharts/Radar.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default Vue.extend({
default () {
return {
width: '100%',
height: '200%',
height: '100%',
position: 'relative'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/BaseCharts/Scatter.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default Vue.extend({
default () {
return {
width: '100%',
height: '200%',
height: '100%',
position: 'relative'
}
}
Expand Down