Brandy Carney ff8169cb0a Merge branch 'master' into searchbar-fix ...

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

2015-12-10 17:55:44 -05:00

..

test/scenarios

fix(toolbar): fix margin and width on toolbar buttons

2015-12-09 16:22:08 -05:00

toolbar-button.scss

refactor(menu-toggle): use .bar-button-menu-toggle and not attr

2015-12-08 14:28:40 -06:00

toolbar.ios.scss

fix(toolbar/tabs): change toolbar-background to use the background property

2015-12-10 11:10:53 -05:00

toolbar.md.scss

fix(toolbar/tabs): change toolbar-background to use the background property

2015-12-10 11:10:53 -05:00

toolbar.scss

refactor(menu-toggle): use .bar-button-menu-toggle and not attr

2015-12-08 14:28:40 -06:00

toolbar.ts

Merge branch 'master' into searchbar-fix

2015-12-10 17:55:44 -05:00