Adam Bradley 31b4a0c4a1 Merge branch 'master' into css-refactor ...

# Conflicts:
#	ionic/components/button/modes/ios.scss

2015-12-08 08:50:10 -06:00

..

modes

import mode globals in all mode components

2015-12-04 21:34:27 -06:00

test/basic

toolbar button updates

2015-12-07 11:18:00 -06:00

modal.scss

import mode globals in all mode components

2015-12-04 21:34:27 -06:00

modal.ts

docs(demos/modal): modal api demo

2015-12-07 20:59:10 -06:00