Mark Otto 421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip ...

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less

2013-02-05 22:42:54 -08:00

..

assets

Merge branch '2.3.0-wip' into 3.0.0-wip

2013-02-05 22:42:54 -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-05 19:53:44 -08:00

templates

port docs fix from 2.3.0-wip to new css page

2013-02-05 22:29:01 -08:00

components.html

simplify media docs

2013-02-05 01:12:39 -08:00

css.html

port docs fix from 2.3.0-wip to new css page

2013-02-05 22:29:01 -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

add codecademy to gallery

2013-02-05 21:07:30 -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

Update homepage examples, add hella new sites to gallery

2013-02-05 21:04:46 -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