Brandy Carney e7d1bb9812 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	demos/component-docs/menus/menus.html

2015-10-08 15:18:24 -04:00

..

actionSheet

Merge remote-tracking branch 'origin/master'

2015-10-08 15:18:24 -04:00

buttons

Merge remote-tracking branch 'origin/master'

2015-10-08 15:18:24 -04:00

cards

docs(demos): use Page instead of IonicView

2015-10-08 14:13:06 -05:00

forms

Merge remote-tracking branch 'origin/master'

2015-10-08 15:18:24 -04:00

icons

Merge remote-tracking branch 'origin/master'

2015-10-08 15:18:24 -04:00

lists

docs(demos): use Page instead of IonicView

2015-10-08 14:13:06 -05:00

menus

refactor(padding): changed padding to attributes

2015-10-08 15:15:20 -04:00

modals

Merge remote-tracking branch 'origin/master'

2015-10-08 15:18:24 -04:00

navigation

docs(demos): use Page instead of IonicView

2015-10-08 14:13:06 -05:00

popups

Merge remote-tracking branch 'origin/master'

2015-10-08 15:18:24 -04:00

slides

docs(demos): use Page instead of IonicView

2015-10-08 14:13:06 -05:00

tabs

docs(demos): use Page instead of IonicView

2015-10-08 14:13:06 -05:00

app.css

docs(demos): update android action sheet

2015-10-07 16:56:37 -05:00

helpers.ts

refactor(demos): give each component section its own view

2015-10-08 10:02:51 -05:00

index.ts

docs(demos): use Page instead of IonicView

2015-10-08 14:13:06 -05:00

main.html

refactor(padding): changed padding to attributes

2015-10-08 15:15:20 -04:00