Merge pull request apertureless#1 from apertureless/develop

Bring up to date with origin
syshex · Aug 7, 2017 · f95ea49 · f95ea49
2 parents 85fafd9 + 4bf4f57
commit f95ea49
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -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`

diff --git a/package.json b/package.json
@@ -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",

diff --git a/src/BaseCharts/Bar.js b/src/BaseCharts/Bar.js
@@ -45,7 +45,7 @@ export default Vue.extend({
       default () {
         return {
           width: '100%',
-          height: '200%',
+          height: '100%',
           position: 'relative'
         }
       }

diff --git a/src/BaseCharts/Bubble.js b/src/BaseCharts/Bubble.js
@@ -46,7 +46,7 @@ export default Vue.extend({
       default () {
         return {
           width: '100%',
-          height: '200%',
+          height: '100%',
           position: 'relative'
         }
       }

diff --git a/src/BaseCharts/Doughnut.js b/src/BaseCharts/Doughnut.js
@@ -46,7 +46,7 @@ export default Vue.extend({
       default () {
         return {
           width: '100%',
-          height: '200%',
+          height: '100%',
           position: 'relative'
         }
       }

diff --git a/src/BaseCharts/HorizontalBar.js b/src/BaseCharts/HorizontalBar.js
@@ -46,7 +46,7 @@ export default Vue.extend({
       default () {
         return {
           width: '100%',
-          height: '200%',
+          height: '100%',
           position: 'relative'
         }
       }

diff --git a/src/BaseCharts/Line.js b/src/BaseCharts/Line.js
@@ -46,7 +46,7 @@ export default Vue.extend({
       default () {
         return {
           width: '100%',
-          height: '200%',
+          height: '100%',
           position: 'relative'
         }
       }

diff --git a/src/BaseCharts/Pie.js b/src/BaseCharts/Pie.js
@@ -46,7 +46,7 @@ export default Vue.extend({
       default () {
         return {
           width: '100%',
-          height: '200%',
+          height: '100%',
           position: 'relative'
         }
       }

diff --git a/src/BaseCharts/PolarArea.js b/src/BaseCharts/PolarArea.js
@@ -46,7 +46,7 @@ export default Vue.extend({
       default () {
         return {
           width: '100%',
-          height: '200%',
+          height: '100%',
           position: 'relative'
         }
       }

diff --git a/src/BaseCharts/Radar.js b/src/BaseCharts/Radar.js
@@ -46,7 +46,7 @@ export default Vue.extend({
       default () {
         return {
           width: '100%',
-          height: '200%',
+          height: '100%',
           position: 'relative'
         }
       }

diff --git a/src/BaseCharts/Scatter.js b/src/BaseCharts/Scatter.js
@@ -46,7 +46,7 @@ export default Vue.extend({
       default () {
         return {
           width: '100%',
-          height: '200%',
+          height: '100%',
           position: 'relative'
         }
       }