Mark Otto 4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory ...

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less

2012-10-01 23:41:00 -07:00

..

assets

Merge branch '2.1.2-wip' into exploratory

2012-10-01 23:41:00 -07:00

build

optimizing images on 2.1.0-wip branch; saving couple of KBs from package

2012-08-06 13:23:12 +03:00

examples

add sticky footer example per martin bean's suggestion, using the implementation by ryan fait

2012-09-30 22:09:51 -07:00

templates

Merge branch '2.1.2-wip' into exploratory

2012-10-01 23:41:00 -07:00

base-css.html

Merge branch '2.1.2-wip' into exploratory

2012-10-01 11:27:40 -07:00

components.html

Merge branch '2.1.2-wip' into exploratory

2012-10-01 23:41:00 -07:00

customize.html

initial pass at removing navbar-inner from .navbar component

2012-09-25 22:48:02 -07:00

extend.html

initial pass at removing navbar-inner from .navbar component

2012-09-25 22:48:02 -07:00

getting-started.html

Merge branch '2.1.2-wip' into exploratory

2012-09-30 22:45:39 -07:00

index.html

Merge branch '2.1.2-wip' into exploratory

2012-09-30 22:45:39 -07:00

javascript.html

Merge branch '2.1.2-wip' into exploratory

2012-10-01 23:41:00 -07:00

scaffolding.html

Merge branch '2.1.2-wip' into exploratory

2012-10-01 11:27:40 -07:00