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

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

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

..

animations

docs()

2015-12-14 15:06:06 -05:00

components

Merge remote-tracking branch 'origin/master'

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

config

docs(config): fix config docs

2015-12-16 14:52:34 -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 remote-tracking branch 'origin/master' into WIP-api-demos

2015-12-16 11:13:03 -06:00

themes

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

translation

Merge branch 'master' into searchbar-fix

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

util

docs(): labels, keyboard

2015-12-16 14:00:28 -05:00

components.core.scss

component theme updates

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

components.ios.scss

fix(platform): rename cordova iOS file to be more consistent with other files, included the import in iOS components file

2015-12-15 13:57:54 -05: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