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

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

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

..

animations

fix(menu): auto close menu when disabled, always remove listeners

2015-12-02 14:54:10 -06:00

components

Merge branch 'master' into searchbar-fix

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

config

Merge branch 'master' into searchbar-fix

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

fonts

feat: add -path, -font-path

2015-10-30 15:54:12 -05:00

gestures

Merge branch 'master' into searchbar-fix

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

platform

Merge branch 'master' into searchbar-fix

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

themes

chore(sass): fix file paths

2015-12-10 12:42:33 -06:00

translation

Merge branch 'master' into searchbar-fix

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

util

Merge branch 'master' into searchbar-fix

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

components.core.scss

component theme updates

2015-12-04 14:56:57 -06:00

components.ios.scss

refactor(toggle): renamed ion-switch to ion-toggle

2015-12-10 14:50:52 -06:00

components.md.scss

refactor(toggle): renamed ion-switch to ion-toggle

2015-12-10 14:50:52 -06:00

components.ts

Merge branch 'master' into searchbar-fix

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

globals.core.scss

import mode globals in all mode components

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

globals.ios.scss

import mode globals in all mode components

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

globals.md.scss

import mode globals in all mode components

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

ionic.ios.scss

mode font styling

2015-12-05 11:19:09 -06:00

ionic.md.scss

use @at-root for roboto font

2015-12-05 14:47:01 -06:00

ionic.scss

use @at-root for roboto font

2015-12-05 14:47:01 -06:00

ionic.ts

Merge branch 'master' into searchbar-fix

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

util.ts

Merge branch 'master' into searchbar-fix

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