Commit Graph

12 Commits

Author SHA1 Message Date
Mark Otto 1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Mark Otto b455ed8def add markdown toc stuff 2015-05-29 01:58:52 -07:00
Mark Otto 663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
Chris Rebert cfcc597c85 reboot.md: fix typo 2015-04-23 16:30:12 -07:00
Mark Otto b45d719e37 more reboot edits 2015-04-22 23:13:11 -07:00
Mark Otto 46a3506a42 clarify some docs, improve layout 2015-04-22 23:09:05 -07:00
Mark Otto 4b58ee15b5 remove some typography docs from that page because they're covered in the reboot 2015-04-17 17:18:36 -07:00
Mark Otto f58143e7d6 editing intro 2015-04-17 12:39:39 -07:00
Mark Otto 7049a07444 More reboot work, commenting out things that have been moved over 2015-04-17 00:22:35 -07:00
Mark Otto cbf0e25280 nav and typo 2015-04-16 23:04:42 -07:00
Mark Otto b1f48d3098 more reboot updates 2015-04-16 19:33:42 -07:00
Mark Otto 06c2862d25 start stubbing out a new reboot section and file 2015-04-16 18:39:45 -07:00