Skip to content

Commit

Permalink
Merge branch 'development' of github.com:valor-software/ng2-charts in…
Browse files Browse the repository at this point in the history
…to development
  • Loading branch information
Domainv committed Oct 10, 2019
2 parents 217b104 + 39ba4e7 commit a0618a5
Show file tree
Hide file tree
Showing 3 changed files with 153 additions and 2 deletions.
149 changes: 149 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "ng2-charts-demo",
"version": "1.0.0",
"scripts": {
"demo.deploy-gh-pages": "gh-pages -d dist/ng2-charts-demo",
"ng": "ng",
"start": "ng serve",
"build": "ng build",
Expand Down Expand Up @@ -60,6 +61,7 @@
"codelyzer": "~4.5.0",
"cypress": "3.2.0",
"eyes.images": "^3.6.3",
"gh-pages": "^2.1.1",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
Expand Down
4 changes: 2 additions & 2 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ <h2>API</h2>
ChartsModule
]
```

ё
### Chart types
There are one directive for all chart types: `baseChart`, and there are 8 types of charts: [`line`](/#/LineChart), [`bar`](/#/BarChart), [`radar`](/#/RadarChart), [`pie`](/#/PieChart), [`polarArea`](/#/PolarAreaChart), [`doughnut`](/#/DoughnutChart), [`bubble`](/#/BubbleChart) and [`scatter`](/#/ScatterChart).
There are one directive for all chart types: `baseChart`, and there are 8 types of charts: [`line`](/ng2-charts/#/LineChart), [`bar`](/ng2-charts/#/BarChart), [`radar`](/ng2-charts/#/RadarChart), [`pie`](/ng2-charts/#/PieChart), [`polarArea`](/ng2-charts/#/PolarAreaChart), [`doughnut`](/ng2-charts/#/DoughnutChart), [`bubble`](/ng2-charts/#/BubbleChart) and [`scatter`](/ng2-charts/#/ScatterChart).

### Properties

Expand Down

0 comments on commit a0618a5

Please sign in to comment.