Adam Bradley 406292a289 Merge branch 'master' of https://github.com/driftyco/ionic ...

Conflicts:
	dist/css/ionic-ios7.css

2013-10-24 20:25:54 -05:00

..

controllers

A whole lotta shit

2013-10-21 10:44:35 -05:00

js

Progress on #37

2013-10-15 14:33:49 -05:00

actionsheet.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

alerts.html

alerts

2013-10-22 09:43:37 -05:00

bars-clear.html

Removed ionicIcons build target for CSS

2013-09-27 17:59:18 -05:00

button-bar.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

buttons.html

.button-full updates

2013-10-16 13:45:56 -05:00

cards.html

item-body

2013-10-24 20:20:49 -05:00

footers.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

headerBarTitle.html

More header bar hacking stuff

2013-09-26 22:46:01 -05:00

headers.html

button icon updates

2013-10-21 14:20:46 -05:00

index.html

list item image

2013-10-23 22:58:27 -05:00

input-checkbox.html

rename list-items to just items

2013-10-24 15:20:12 -05:00

input-radio.html

update radio text

2013-10-24 20:23:55 -05:00

input-range.html

range test fixes

2013-10-16 20:56:28 -05:00

input-select.html

1px border lists on retina

2013-10-23 09:55:19 -05:00

input-text.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

input-textarea.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

input-toggle-ios7.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

input-toggle.html

rename list-items to just items

2013-10-24 15:20:12 -05:00

ios7.html

Removed ionicIcons build target for CSS

2013-09-27 17:59:18 -05:00

lists.html

rename list-items to just items

2013-10-24 15:20:12 -05:00

loading.html

A whole lotta shit

2013-10-21 10:44:35 -05:00

menu_controller.html

renamed .content-padded to just .padded

2013-09-23 11:56:16 -05:00

menus.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

modals.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

popovers.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

pull-to-refresh.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

scroll_horiz.html

Don't even try to use the scroll shit, it's broken

2013-10-24 18:56:27 -05:00

scroll.html

Don't even try to use the scroll shit, it's broken

2013-10-24 18:56:27 -05:00

side-menus.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

slideBox.html

Basic pull to refresh shell

2013-10-16 11:22:01 -05:00

swipe.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00

tab-bars.html

rename list-items to just items

2013-10-24 15:20:12 -05:00

tree_bark.png

Scroll messing around and start of cards

2013-09-28 17:49:40 -05:00

type.html

rename padded/padding, inset/margin

2013-10-15 15:08:43 -05:00