0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Bootstrap/docs/components
Mark Otto d6b0f45fb7 Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/dropdowns.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/less.html
	docs/_includes/css/overview.html
	docs/_includes/css/responsive-utilities.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/getting-started.html
	docs/_layouts/default.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/components.html
	docs/components/navbar.md
	docs/css.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/grid/index.html
	docs/examples/jumbotron-narrow/index.html
	docs/examples/jumbotron/index.html
	docs/examples/justified-nav/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/offcanvas/index.html
	docs/examples/signin/index.html
	docs/examples/starter-template/index.html
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/sticky-footer/index.html
	docs/examples/theme/index.html
	docs/examples/tooltip-viewport/index.html
	docs/getting-started.html
	docs/javascript.html
	docs/migration.html
	less/_animation.less
	less/_modal.less
	less/_navbar.less
	less/_variables.less
	less/glyphicons.less
	less/navs.less
	less/panels.less
	less/progress-bars.less
2014-10-26 22:31:59 -07:00
..
alerts.md rearrange docs components 2014-07-11 22:34:47 -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 markdownify button dropdowns 2014-07-13 01:23:29 -07:00
button-group.md markdownify button group 2014-07-13 01:23:34 -07:00
buttons.md rearrange docs components 2014-07-11 22:34:47 -07:00
card.md cards 2014-08-05 17:12:24 -07:00
code.md rearrange docs components 2014-07-11 22:34:47 -07:00
dropdowns.md Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
forms.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
helpers.md fix helpers 2014-07-13 01:26:48 -07:00
images.md bigger images 2014-08-05 17:23:25 -07:00
input-group.md Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
jumbotron.md rewrite jumbotron less and make heading use a class 2014-09-17 20:03:32 -07:00
label.md markdownify label docs 2014-07-14 09:14:41 -07:00
list-group.md markdownify list group 2014-07-13 01:12:06 -07:00
navbar.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
navs.md rearrange docs components 2014-07-11 22:34:47 -07:00
new-navbar.md Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
page-header.md example page header 2014-07-14 09:14:31 -07:00
pagination.md Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
progress.md Rewrite progress to markdown 2014-07-11 15:45:11 -07:00
responsive-embed.md Merge branch 'master' into derp 2014-10-26 22:31:59 -07:00
tables.md Rename .table-condensed to .table-sm 2014-09-17 22:14:27 -07:00
typography.md fix broke code block 2014-08-05 17:21:54 -07:00