0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Bootstrap/docs
Mark Otto dae1a68fb1 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-07-09 22:19:23 -07:00
..
_data Drop Glyphicons 2014-07-08 00:33:21 -07:00
_includes Merge branch 'master' into derp 2014-07-09 22:19:23 -07:00
_jade Fix #13138: use underscore prefix to ignore directories 2014-03-24 21:47:59 +01:00
_layouts clean up layout 2014-07-08 03:48:56 -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
assets Merge branch 'master' into derp 2014-07-09 22:19:23 -07:00
dist Merge branch 'master' into derp 2014-07-09 22:19:23 -07:00
examples Merge branch 'master' into derp 2014-07-09 22:19:23 -07:00
about.html add svg logos to brand guidelines 2014-03-04 13:32:02 -08:00
apple-touch-icon-precomposed.png Losslessly compress apple-touch-icon-precomposed.png. 2014-06-09 01:15:08 +03:00
browser-bugs.html Add Wall of Browser Bugs entry for #13892 2014-07-03 17:17:18 -07:00
components.html no more iconography 2014-07-09 10:45:57 -07:00
css.html Rewrite grid docs in markdown 2014-07-09 22:00:07 -07:00
customize.html .btn-default to .btn-secondary 2014-07-08 17:14:14 -07:00
favicon.ico Fix favicon.ico after d763b0fe5b. 2014-06-09 11:13:24 +03:00
getting-started.html nuke the v2.x to v3.x migration docs 2014-07-08 03:48:40 -07: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
javascript.html Separate JS includes for alerts and popovers 2014-03-17 15:58:03 +01:00
LICENSE Rename docs/LICENSE-DOCS to docs/LICENSE 2014-01-14 13:47:18 +01:00
robots.txt Add sitemap.xml and robots.txt files. 2014-02-27 17:05:52 +02:00
sitemap.xml Add missing blank line 2014-03-15 22:40:51 +01:00