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

# Conflicts:
#	ionic/components/segment/segment.ts

2015-12-16 15:47:07 -05:00

..

test

feat(toolbar): added transparent toolbar example and styling

2015-12-15 17:03:53 -05:00

toolbar-button.scss

chore(upgrad): ng alpha52 and case-sensitive templates

2015-12-10 22:52:55 -06:00

toolbar.ios.scss

chore(upgrad): ng alpha52 and case-sensitive templates

2015-12-10 22:52:55 -06:00

toolbar.md.scss

fix(toolbar): fixed default button colors for MD in a toolbar, added new function to get this inverse

2015-12-15 16:41:33 -05:00

toolbar.scss

feat(toolbar): added transparent toolbar example and styling

2015-12-15 17:03:53 -05:00

toolbar.ts

Merge remote-tracking branch 'origin/master'

2015-12-16 15:47:07 -05:00