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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	ionic/components.js
This commit is contained in:
Adam Bradley
2015-05-30 13:28:46 -05:00
parent 0638c6a4f3 7b91453a33
commit 24946ff120
24 changed files with 14203 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ionic/components.js.orig Normal file
View File

@ -0,0 +1,35 @@
// DON'T reference this file in the source. Only in demos.
export * from 'ionic/components/app/app'
export * from 'ionic/components/action-menu/action-menu'
// export * from 'ionic/components/alert/alert'
export * from 'ionic/components/aside/aside'
export * from 'ionic/components/button/button'
export * from 'ionic/components/checkbox/checkbox'
export * from 'ionic/components/content/content'
export * from 'ionic/components/icon/icon'
export * from 'ionic/components/item/item'
export * from 'ionic/components/form/form'
export * from 'ionic/components/form/input/input'
export * from 'ionic/components/form/label/label'
// export * from 'ionic/components/layout/layout'
export * from 'ionic/components/list/list'
export * from 'ionic/components/modal/modal'
export * from 'ionic/components/nav/nav'
export * from 'ionic/components/nav/nav-controller'
export * from 'ionic/components/nav/nav-item'
export * from 'ionic/components/nav-bar/nav-bar'
export * from 'ionic/components/slides/slides'
export * from 'ionic/components/radio/radio'
// export * from 'ionic/components/search-bar/search-bar'
// export * from 'ionic/components/split-view/split-view'
export * from 'ionic/components/segment/segment'
export * from 'ionic/components/switch/switch'
<<<<<<< HEAD
export * from 'ionic/components/tabs/tabs'
export * from 'ionic/components/tabs/tab'
=======
export * from 'ionic/components/toolbar/toolbar'
export * from 'ionic/components/view/view'
//export * from 'ionic/components/tabs/tabs'
//export * from 'ionic/components/tabs/tab'
>>>>>>> origin/master