root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
220 Commits 107 Branches 91 Tags 669 MiB
Commit Graph

23 Commits

Author SHA1 Message Date
Jacob Thornton e11c49cc48 Merge branch 'master' of github.com:twitter/bootstrap 
Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html
 2011-08-21 21:42:56 -07:00
Mark Otto 0df17f06d8 re-add div to error class 2011-08-21 20:53:52 -07:00
Mark Otto 23ec21d049 resolve conflicts 2011-08-21 20:51:13 -07:00
Mark Otto a98d2cccb8 merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
Jacob Thornton 2f6f9ec6e0 Merge branch 'misc_css_fixes' of github.com:twitter/bootstrap into misc_css_fixes 
Conflicts:
	lib/forms.less
 2011-08-21 20:42:54 -07:00
Jacob Thornton 0e92acd9ff more little ie6-7 hacks :/ 2011-08-21 20:41:34 -07:00
Mark Otto f630615d26 remove tags from form selectors 2011-08-21 20:27:19 -07:00
Mark Otto 6db39d0ec3 fix error styles a bit on stacked form fields 2011-08-20 23:56:32 -07:00
Jacob Thornton 6d0b083b7d update whitspace and comment styles 2011-08-16 22:58:01 -07:00
Mark Otto 7962b36dae misc updates to docs and form bug fix 2011-07-01 22:15:16 -07:00
Mark Otto c53e394f71 changing stacked forms to be lined up left side w/ 20px 2011-06-30 13:51:13 -07:00
Mark Otto 588b2da937 updated docs, fixed language, added copy-code js for selecting text on focus 2011-06-30 10:40:28 -07:00
Mark Otto 9e33ab20ab clean up commented out css, slightly updated docs again 2011-06-30 00:15:37 -07:00
Jacob Thornton 1561b20f7c Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-06-29 15:41:33 -07:00
Jacob Thornton e72283ccaf fix comments up for non minified built file 2011-06-29 15:40:52 -07:00
Mark Otto 025f74ef93 form bug fix with new baseline, updated docs to fix topbar bug, tweaks to scaffolding for buttons 2011-06-29 13:48:08 -07:00
Mark Otto 5f818d3d22 bunch of small tweaks, fixed a typo 2011-06-29 07:40:14 -07:00
Mark Otto a92aeda6a1 Merge branch 'master' of http://git.local.twitter.com/baseline 2011-06-28 15:11:44 -07:00
Mark Otto 4e95e558db reseting baseline to 18px, fixing wells, moving pre styles for chili to docs 2011-06-28 15:11:41 -07:00
Jacob Thornton 08c318e008 update makefile and little comments 2011-06-28 15:10:43 -07:00
Jacob Thornton e91a74e8e8 fix license indent and make comments consistent 2011-06-28 14:24:02 -07:00
Mark Otto dd769f9a6e update to use latest version of bootstrap, docs cleanup, etc 2011-06-27 16:47:12 -07:00
Jacob Thornton d447898bf2 rearranging everything 2011-05-03 18:09:25 -07:00