Mark Otto 0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip ...

Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less

2013-02-04 11:12:09 -08:00

..

assets

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-04 11:12:09 -08:00

build

Changing title of docs pages to simply say 'Bootstrap' like the docs home page

2012-10-07 21:38:28 -07:00

examples

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-01 10:34:25 -08:00

templates

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-04 11:12:09 -08:00

base-css.html

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-04 11:12:09 -08:00

components.html

Refactor navbar dividers

2013-02-01 22:56:09 -08:00

css.html

Fixes #6794: incorrect docs mention of th element

2013-02-04 11:11:25 -08:00

customize.html

Remove gallery link from navbar; add to homepage examples section instead

2013-01-31 18:00:11 -08:00

extend.html

Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing

2013-01-14 00:11:55 -08:00

gallery.html

Remove gallery link from navbar; add to homepage examples section instead

2013-01-31 18:00:11 -08:00

getting-started.html

Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes

2013-01-31 18:25:44 -08:00

index.html

Remove gallery link from navbar; add to homepage examples section instead

2013-01-31 18:00:11 -08:00

javascript.html

Remove gallery link from navbar; add to homepage examples section instead

2013-01-31 18:00:11 -08:00

scaffolding.html

Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing

2013-01-14 00:11:55 -08:00