root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
bootstrap/docs
History
Mark Otto 089d434895 Merge branch 'master' into derp 
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/glyphicons.html
	docs/_includes/css/forms.html
	docs/_includes/css/tables.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.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/docs.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/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
	less/code.less
	less/panels.less
	less/variables.less
 		2014-08-02 18:30:59 -07:00
..
_data nav update 2014-07-14 08:35:33 -07:00
_includes Merge branch 'master' into derp 2014-08-02 18:30:59 -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 fix paths 2014-07-13 01:38:03 -07:00
assets Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
components Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
dist Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
examples Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
getting-started link the new navbar examples 2014-07-14 09:05:27 -07:00
javascript Merge branch 'master' into derp 2014-08-02 18:30:59 -07:00
layout add css resets outline section to scaffolding docs 2014-07-14 09:14:59 -07:00
LICENSE Rename docs/LICENSE-DOCS to docs/LICENSE 2014-01-14 13:47:18 +01: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-08-02 18:30:59 -07:00
customize.html Merge branch 'master' into derp 2014-08-02 18:30:59 -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
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