javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 3.0

Browse Source 
# Conflicts:
#	src/components/action-sheet/test/basic/pages/page-one/page-one.ts
#	src/components/alert/alert.ts
#	src/components/content/content.ts
#	src/components/datetime/datetime.ts
#	src/components/datetime/test/datetime.spec.ts
#	src/components/loading/loading.ts
#	src/components/modal/test/basic/app.module.ts
#	src/components/picker/picker-component.ts
#	src/components/toast/toast.ts
#	src/components/toolbar/toolbar.ios.scss
#	src/components/toolbar/toolbar.md.scss
#	src/components/toolbar/toolbar.wp.scss
#	src/components/virtual-scroll/test/basic/app.module.ts
#	src/util/util.ts
This commit is contained in:
Brandy Carney
2017-03-20 18:07:38 -04:00
parent 5c612aa33e 56364a0503
commit 042f698555
77 changed files with 1789 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/npm/README.md
View File

@ -1,10 +1,10 @@
## Ionic Framework 2.x
## Ionic Framework
The official npm package for [Ionic 2](http://ionicframework.com/), complete with pre-built ES5 bundles, TypeScript definitions, Sass files, CommonJS ES5 files, and more.
The official npm package for [Ionic](http://ionicframework.com/), complete with pre-built ES5 bundles, TypeScript definitions, Sass files, CommonJS ES5 files, and more.
To get started with Ionic 2, please read the [Installation Guide](http://ionicframework.com/docs/v2/getting-started/installation/).
To get started with Ionic, please read the [Installation Guide](http://ionicframework.com/docs/v2/intro/installation/).
[Ionic 2 Documentation](http://ionicframework.com/docs/v2/)
[Ionic Documentation](http://ionicframework.com/docs/)
### Source files
@ -22,7 +22,6 @@ Minified and unminified CommonJS and System.register module format bundles, as w
### Installation and More
To use Ionic 2, we recommend installing and utilizing the [Ionic CLI](http://ionicframework.com/docs/v2/getting-started/installation/) which will help you create pre-configured Ionic apps.
For full instructions on using Ionic 2, please visit the [Ionic 2 Documentation](http://ionicframework.com/docs/v2/)
To use Ionic, we recommend installing and utilizing the [Ionic CLI](http://ionicframework.com/docs/v2/intro/installation/) which will help you create pre-configured Ionic apps.
For full instructions on using Ionic, please visit the [Ionic Documentation](http://ionicframework.com/docs/)