Brandy Carney 042f698555 Merge branch 'master' into 3.0 ...

# 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

2017-03-20 18:07:38 -04:00

..

test

Merge branch 'master' into 3.0

2017-03-20 18:07:38 -04:00

modal-component.ts

chore(docs): updating dgeni typescript package

2017-03-14 14:50:31 -05:00

modal-controller.ts

style(lint): fix linter errors

2017-03-03 16:02:24 -06:00

modal-impl.ts

chore(docs): updating dgeni typescript package

2017-03-14 14:50:31 -05:00

modal-options.ts

fix(modal): using cross mode animations

2016-11-30 13:30:28 +01:00

modal-transitions.ts

refactor: improve tree shaking abilities

2017-01-09 09:51:39 -06:00

modal.ios.scss

style(modal): follows ios/md design spec in large screens

2016-11-19 18:25:46 +01:00

modal.md.scss

style(modal): follows ios/md design spec in large screens

2016-11-19 18:25:46 +01:00

modal.module.ts

docs(): hide modules from docs

2017-03-16 11:49:46 -04:00

modal.scss

docs(sass): add documentation for the remaining sass variables

2016-12-05 10:16:40 -05:00

modal.ts

chore(docs): updating dgeni typescript package

2017-03-14 14:50:31 -05:00

modal.wp.scss

docs(modal): add sass variable descriptions

2016-10-29 18:29:25 -05:00