Mark Otto 58082cd83e Merge branch 'master' into v4 ... Conflicts: .gitignore Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.js dist/js/bootstrap.min.js docs/_includes/components/navbar.html docs/_includes/components/progress-bars.html docs/_includes/css/grid.html docs/_includes/css/overview.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/license.html docs/_includes/getting-started/third-party-support.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/js/transitions.html docs/_includes/nav/javascript.html docs/_includes/nav/main.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/raw-files.min.js docs/assets/js/src/customizer.js docs/dist/css/bootstrap-theme.css 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/migration.html js/affix.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/popover.js js/scrollspy.js js/tab.js js/tests/unit/affix.js js/tests/unit/button.js js/tests/unit/carousel.js js/tests/unit/modal.js js/tests/unit/tooltip.js js/tests/visual/modal.html js/tooltip.js less/component-animations.less less/jumbotron.less less/mixins/background-variant.less less/mixins/buttons.less less/mixins/responsive-visibility.less less/mixins/text-emphasis.less less/navbar.less less/navs.less less/scaffolding.less less/tooltip.less less/utilities.less less/variables.less package.json scss/_buttons.scss scss/_forms.scss scss/_modal.scss		2015-03-29 00:08:54 -07:00
..
_data	Merge branch 'master' into v4	2015-03-29 00:08:54 -07:00
_includes	grunt	2015-03-28 23:33:11 -07:00
_layouts	docs redesign a bit	2015-03-09 14:07:46 +00:00
_plugins	Add support for example IDs to {% example %} template tag	2014-12-02 18:46:42 -08:00
about	Merge branch 'master' into v4	2015-03-29 00:08:54 -07:00
assets	grunt	2015-03-28 23:33:11 -07:00
components	typo	2015-03-09 14:50:40 +00:00
content	update image docs and styles	2015-03-11 19:19:22 +00:00
dist	grunt	2015-03-28 23:33:11 -07:00
examples	fix page layout for examples overview	2015-03-09 15:21:05 +00:00
extend	stub out extend section a bit	2014-12-06 00:18:44 -08:00
getting-started	Merge branch 'master' into v4	2015-03-29 00:08:54 -07:00
javascript	simplify js docs overview section	2015-03-09 15:35:45 +00:00
layout	new headers, ad placements, intro paragraphs on several pages, etc	2015-01-19 20:03:08 -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	docs redesign a bit	2015-03-09 14:07:46 +00:00
LICENSE	Rename docs/LICENSE-DOCS to docs/LICENSE	2014-01-14 13:47:18 +01:00
migration.md	more migration content	2015-03-11 19:50:00 +00: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