0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Bootstrap/docs/examples
Mark Otto 325748ff68 Merge branch 'master' into v4
Conflicts:
	_config.yml
	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
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	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/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
..
album Fix @mdo's grammar 2014-12-30 12:45:24 -08:00
blog Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
carousel Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
cover Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
dashboard Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
grid tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
jumbotron Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
justified-nav Remove ancillary references to IE<9 in comments+docs 2014-12-16 19:06:57 -08:00
narrow-jumbotron more rem fixes for examples 2014-12-04 14:02:38 -08:00
navbar Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
navbar-top Fix @mdo's grammar 2014-12-30 12:45:24 -08:00
navbar-top-fixed clean up navbar examples 2014-11-29 15:07:13 -08:00
offcanvas Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
screenshots Example: minor image compression improvements. 2014-11-30 13:16:27 +02:00
signin grunt 2014-12-18 20:19:53 -08:00
starter-template Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
sticky-footer Merge branch 'master' into derp 2014-11-09 22:02:53 -08:00
sticky-footer-navbar Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
tooltip-viewport Merge branch 'master' into v4 2015-01-19 14:48:12 -08:00
overview.md move examples index again, clean up nav 2014-12-01 16:51:31 -08:00