Adam Bradley 78ab65c2b7 conflict fix ...

Conflicts:
	dist/ionic.css
	scss/ionic/_structure-variables.scss

2013-09-09 19:09:52 -05:00

..

_alerts.scss

ionic restructure

2013-08-29 09:13:07 -05:00

_animations.css

Headers and some segmented stuff

2013-09-09 15:44:41 -05:00

_bar.scss

Button on right side

2013-09-09 17:36:35 -05:00

_base.scss

text inputs

2013-09-09 19:06:22 -05:00

_button-group.scss

Header button love

2013-09-09 17:29:30 -05:00

_button.scss

Button bars and default styles for header buttons

2013-09-09 11:59:03 -05:00

_card.scss

changed panels to cards

2013-09-09 11:50:22 -05:00

_form.scss

text inputs

2013-09-09 19:06:22 -05:00

_grid.scss

text inputs

2013-09-09 19:06:22 -05:00

_icon.scss

ionic restructure

2013-08-29 09:13:07 -05:00

_img.scss

ionic restructure

2013-08-29 09:13:07 -05:00

_label.scss

ionic restructure

2013-08-29 09:13:07 -05:00

_listview.scss

ionic restructure

2013-08-29 09:13:07 -05:00

_menu.scss

Added basic toderp

2013-09-01 17:00:05 -05:00

_normalize.scss

ionic restructure

2013-08-29 09:13:07 -05:00

_pull-to-refresh.scss

ionic restructure

2013-08-29 09:13:07 -05:00

_table.scss

ionic restructure

2013-08-29 09:13:07 -05:00

_tabs.scss

Fixed panel buttons zindex

2013-08-31 18:49:48 -05:00