Mark Otto bdc22e71c8 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip ...

Conflicts:
	bootstrap.css

2012-01-05 01:37:06 -08:00

..

assets

tweaks abound, updated prettify styles, new sidenav component started, sprite icons started

2012-01-05 01:34:14 -08:00

base-css.html

add a quick little example of icons in buttons

2012-01-05 01:36:05 -08:00

components.html

tweaks abound, updated prettify styles, new sidenav component started, sprite icons started

2012-01-05 01:34:14 -08:00

index.html

remove button from topbar for testing

2011-12-27 12:40:30 -06:00

javascript.html

clean up options implementation for carousel

2012-01-02 22:55:51 -08:00

less.html

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

2011-12-22 19:15:09 -08:00

scaffolding.html

more js cleanup after gnarly merge

2011-12-22 19:25:29 -08:00

upgrading.html

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

2011-12-22 19:15:09 -08:00