Merge branch 'master' into v4

# Conflicts:
#	package.json
#	src/components/badge/badge.scss
#	src/components/slides/slides.scss
This commit is contained in:
Adam Bradley
2017-05-02 12:55:07 -05:00
36 changed files with 199 additions and 133 deletions

View File

@ -11,15 +11,15 @@ header_sub_title: Extend Ionic even further with the power of AngularJS
searchable: false
---
# Ionic 2 API Docs
# Ionic API Docs
<img class="section-header" src="/img/docs/api-intro-header.png" />
Ionic 2 takes everything you know and loved about Ionic 1, and builds on top of it to provide a much more flexible framework.
Ionic takes everything you know and loved about Ionic V1, and builds on top of it to provide a much more flexible framework.
In the API docs, you'll find two kinds of doc pages: Component and Service APIs.
The Component APIs include classes like `Checkbox`, `Toggle` or `Item` and show you how to use them, in addition to listing their selectors, available properties and events.
The Service APIs are classes like `MenuController`, `Config` or `Platform`. These are services provided by Ionic 2 that can be injected into your classes.
The Service APIs are classes like `MenuController`, `Config` or `Platform`. These are services provided by Ionic that can be injected into your classes.