bootstrap/docs
Mark Otto 9f2aeafe85 Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.svg
	docs/_includes/components/badges.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/pagination.html
	docs/_includes/css/forms.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/home-nav.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.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/browser-bugs.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.svg
	less/_button-group.less
	less/_jumbotron.less
	less/_variables.less
	less/mixins/vendor-prefixes.less
	less/panels.less
	less/thumbnails.less
	package.json
2014-09-17 15:21:31 -07:00
..
_data Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
_includes Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
_jade Add drag and drop config import; closes #11004 2014-07-31 11:45:21 -07:00
_layouts fix header 2014-07-13 01:45:26 -07:00
_plugins plugins: add new example doodad hackery bullshitery and markdown block plugin for markdown includes 2014-07-09 20:00:22 -07:00
about move license and translations to about section 2014-08-05 17:19:12 -07:00
assets Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
components Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
dist Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
examples Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
getting-started Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
javascript Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
layout add css resets outline section to scaffolding docs 2014-07-14 09:14:59 -07:00
apple-touch-icon-precomposed.png Losslessly compress apple-touch-icon-precomposed.png. 2014-06-09 01:15:08 +03:00
browser-bugs.md Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
customize.html Merge branch 'master' into derp 2014-09-17 15:21:31 -07:00
favicon.ico Fix favicon.ico after d763b0fe5b. 2014-06-09 11:13:24 +03:00
index.html Docs: Refactor to use .less file instead, importing Bootstrap vars and mixins, and cleaning all the things up 2014-07-09 02:40:05 -07:00
LICENSE Rename docs/LICENSE-DOCS to docs/LICENSE 2014-01-14 13:47:18 +01:00
robots.txt Remove layout: nil. 2014-08-01 19:45:11 +03:00
sitemap.xml Remove layout: nil. 2014-08-01 19:45:11 +03:00