Adam Bradley 50b6fdea8d Merge branch 'master' into alpha38 ...

Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts

2015-10-06 20:38:04 -05:00

..

modes

refactor(search-bar): Added iOS styling for cancel button

2015-10-06 18:10:13 -04:00

test

Fix(demo): Update search bar floating demo for custom cancel action

2015-10-06 17:01:42 -06:00

search-bar.scss

refactor(search-bar): Added MD styling and moved some variables around

2015-10-06 15:46:25 -04:00

search-bar.ts

Merge branch 'master' into alpha38

2015-10-06 20:38:04 -05:00

search-bar.ts.orig

Merge branch 'master' into alpha38

2015-10-06 20:38:04 -05:00