Mark Otto 663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 ...

Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css

2015-05-27 15:49:55 -07:00

..

alerts.md

rewrite alert docs

2015-04-17 19:51:15 -07:00

badges.md

Merge branch 'master' into derp

2014-09-17 15:21:31 -07:00

breadcrumb.md

Rewrite breadcrumb in markdown

2014-07-12 01:03:13 -07:00

button-dropdown.md

Redo all our callouts with the custom callout plugin

2015-04-16 16:56:40 -07:00

button-group.md

Redo all our callouts with the custom callout plugin

2015-04-16 16:56:40 -07:00

buttons.md

Update buttons.md

2015-04-30 14:39:57 -07:00

card.md

card.md: fix typo

2015-04-23 17:17:48 -07:00

carousel.md

Redo all our callouts with the custom callout plugin

2015-04-16 16:56:40 -07:00

code.md

reorganize code docs

2015-04-17 20:19:51 -07:00

collapse.md

Redo all our callouts with the custom callout plugin

2015-04-16 16:56:40 -07:00

dropdowns.md

Redo all our callouts with the custom callout plugin

2015-04-16 16:56:40 -07:00

forms.md

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

images.md

docs note

2015-04-26 07:49:11 -07:00

index.md

change nav to use index files for each section; stub out index views for everything

2015-04-18 12:28:50 -07:00

input-group.md

input groups: drop the tooltips warning, move accessibility notice to a sub section

2015-03-09 14:48:51 +00:00

jumbotron.md

new headers, ad placements, intro paragraphs on several pages, etc

2015-01-19 20:03:08 -08:00

label.md

remove docs warning on inline vs inline-block for labels

2014-12-06 00:30:28 -08:00

list-group.md

markdownify list group

2014-07-13 01:12:06 -07:00

modal.md

Redo all our callouts with the custom callout plugin

2015-04-16 16:56:40 -07:00

navbar.md

New form control sizing, new navbar condensed variation, update nav and navbar spacing

2015-04-18 18:12:10 -07:00

navs.md

move js tabs docs to navs docs page

2015-04-17 20:59:22 -07:00

pagination.md

Merge branch 'master' into v4

2015-01-03 20:08:58 -08:00

popovers.md

Redo all our callouts with the custom callout plugin

2015-04-16 16:56:40 -07:00

progress.md

rename classes from .bs-docs and .bs to .bd

2015-04-16 14:07:20 -07:00

reboot.md

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

scrollspy.md

Redo all our callouts with the custom callout plugin

2015-04-16 16:56:40 -07:00

tables.md

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00

tooltips.md

Redo all our callouts with the custom callout plugin

2015-04-16 16:56:40 -07:00

typography.md

remove some typography docs from that page because they're covered in the reboot

2015-04-17 17:18:36 -07:00

utilities.md

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2015-05-27 15:49:55 -07:00