Mark Otto bc0b94a3fd Merge branch 'master' into 3.0.0-wip ...

Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html

2012-12-08 17:40:42 -08:00

..

buttons.html

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

css-tests.css

remove remaining fluid grid css

2012-09-25 22:20:24 -07:00

css-tests.html

Merge branch 'master' into 3.0.0-wip

2012-12-08 17:40:42 -08:00

forms-responsive.html

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

forms.html

more tests for form styles; includes lightening help text

2012-11-30 13:35:20 -08:00

grid.html

more tests and experiments

2012-09-10 10:11:02 -07:00

navbar-fixed-top.html

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

navbar-static-top.html

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

navbar.html

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00