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
..
_data	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
_includes	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
_layouts	formatting of html	2015-01-06 15:35:49 -08:00
_plugins	Add support for example IDs to {% example %} template tag	2014-12-02 18:46:42 -08:00
about	Core & Sass Teams are now one and the same bigger Team	2015-01-14 10:45:07 -08:00
assets	customizer typo	2015-01-19 09:19:09 -08:00
components	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
content	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
dist	grunt	2015-01-19 08:33:33 -08:00
examples	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
extend	stub out extend section a bit	2014-12-06 00:18:44 -08:00
getting-started	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
javascript	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
layout	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
apple-touch-icon.png	Losslessly compress apple-touch-icon.png.	2014-10-26 08:08:33 +02:00
browser-bugs.md	Merge branch 'master' into derp	2014-11-09 22:02:53 -08:00
favicon.ico	Fix favicon.ico after d763b0fe5b.	2014-06-09 11:13:24 +03:00
index.html	remove lingering references to Less in the docs	2014-12-30 16:14:32 -08:00
LICENSE
migration.md	update responsive utility docs post-overhaul	2015-01-06 17:49:33 -08:00
robots.txt	Remove layout: nil.	2014-08-01 19:45:11 +03:00
search.json	basic docs search	2014-12-24 02:44:38 -08:00
sitemap.xml	Added/removed blank lines in the docs for consitency	2014-10-22 13:52:49 +02:00