Mark Otto 12c619f5b9 Merge branch 'master' into boulox-responsive-embed ...

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

2014-03-06 22:40:25 -08:00

..

ads.html

Rearrange repository contents because muahahahahahaha

2013-12-28 22:47:03 -08:00

customizer-variables.html

Merge branch 'master' into popovers-use-radii-var

2014-03-06 21:44:46 -08:00

footer.html

Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs-

2014-02-08 23:24:38 -08:00

header.html

fix css url

2014-01-29 21:44:36 -08:00

nav-about.html

Reorder nav of About docs page

2014-01-21 22:02:54 -08:00

nav-components.html

Rewrite the disabled list group items to simplify styles

2014-03-06 21:40:22 -08:00

nav-css.html

Merge branch 'master' into boulox-responsive-embed

2014-03-06 22:40:25 -08:00

nav-customize.html

Fixes #12555: Rearrange variables to place grids and containers closer

2014-02-07 01:22:30 -08:00

nav-getting-started.html

add docs note to address #12078

2014-01-22 17:28:00 -08:00

nav-javascript.html

Fixes #12744: Document ability to remove animation on modals

2014-02-21 14:52:15 -08:00

nav-main.html

property order because @zdroid <3

2014-02-06 19:34:46 -08:00

nav-migration.html

move migration docs to new separate page, leave callout on getting started page; fixes #12244

2014-01-18 14:09:09 -08:00

social-buttons.html

Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs-

2014-02-08 23:24:38 -08:00