Commit Graph

162 Commits

Author SHA1 Message Date
Jacob Thornton 64176caa97 add bootstrap-scrollspy 2011-09-10 22:14:57 -07:00
Jacob Thornton a71d5d8e99 add the dhg flavor back 2011-09-10 19:01:16 -07:00
Jacob Thornton 57a8672b77 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 16:51:03 -07:00
Jacob Thornton 23d2fed905 tooltip 1 word 2011-09-10 16:50:42 -07:00
Mark Otto 0914027609 spelling mistake 2011-09-10 15:32:06 -07:00
Mark Otto f556da42fc zebra stripe that shit 2011-09-10 15:30:42 -07:00
Mark Otto a95a0ed71c conflict 2011-09-10 15:29:53 -07:00
Mark Otto 99ede580cf adding code and .label sections to type section 2011-09-10 15:29:38 -07:00
Jacob Thornton a8d4475827 adds twipsy js to regular index for positioning 2011-09-10 14:52:45 -07:00
Jacob Thornton 5bc455d370 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 13:17:43 -07:00
Mark Otto c797cb61a6 conflict 2011-09-10 13:04:17 -07:00
Mark Otto 5b16150159 trying to solve firefox active outline, make .input less specific 2011-09-10 13:00:07 -07:00
Jacob Thornton 48aa209348 more tests, more js goodness 2011-09-10 12:49:21 -07:00
Jacob Thornton 79d5f90713 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	bootstrap-1.3.0.css
2011-09-09 22:48:57 -07:00
Jacob Thornton 5f4e30ed1d move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like 2011-09-09 22:47:49 -07:00
Mark Otto 0b43bc9bb9 adding docs for customizing the grid 2011-09-09 21:50:41 -07:00
Mark Otto a0c3d48342 fix the stacked form legend style 2011-09-09 21:43:19 -07:00
Mark Otto c56e229ed7 start updating the grid docs for customizing it 2011-09-09 20:47:38 -07:00
Mark Otto dad058326e add version # to docs 2011-09-09 16:00:59 -07:00
Mark Otto 53135839f5 adding nested columns to the grid section 2011-09-09 10:04:07 -07:00
Mark Otto 1a8fb2dbf7 resolve conflict 2011-09-08 23:02:13 -07:00
Mark Otto ba08055a7b update the modals and alert-messages to use the same .close styles, save for some positioning in the modal after knocking down the modal padding 2011-09-08 23:01:28 -07:00
Jacob Thornton 5960711d0f some more js love - update the docs with tabs/pills plugin 2011-09-08 20:21:03 -07:00
Mark Otto c474f996a9 tweaks to table styles to make them use @basefont and @baseline 2011-09-08 10:47:05 -07:00
Mark Otto 1c03a07591 bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere 2011-09-08 10:36:56 -07:00
Mark Otto 1af96b9a58 what up breadcrumbs, we added you 2011-09-08 09:43:37 -07:00
Mark Otto f6d20a8939 remove active state from dropdown 2011-09-06 23:32:20 -07:00
Mark Otto daf903f847 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-06 23:30:45 -07:00
Mark Otto d640c3b14b update diagrams to use smaller border radius, add new container-app example 2011-09-06 23:30:21 -07:00
Jacob Thornton fb8987148a move javascript from examples into docs 2011-09-06 23:20:56 -07:00
Mark Otto d0882c580d first pass at enabling active states in dropdowns in topbar and fixing the bug of having an active class on parent dropdown 2011-09-06 21:54:00 -07:00
Mark Otto dfbb591953 addng docs for the themes stuff and examples 2011-09-04 14:02:56 -07:00
Mark Otto 0b70eb630e Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-02 23:35:44 -07:00
Mark Otto bfa5ce70d4 updated address examples 2011-09-02 23:35:28 -07:00
Mark Otto df8eccbfe1 adding support for and example ul in block-messages 2011-09-02 23:28:01 -07:00
Jacob Thornton cf23dc4f24 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-02 23:16:06 -07:00
Jacob Thornton 2883888a57 adds small js section to docs index 2011-09-02 23:15:38 -07:00
Mark Otto d5e42cf81a tweak readonly, disabled, and uneditable form elements 2011-09-02 21:54:11 -07:00
Mark Otto 8c1e60c638 add reset filter to preboot for turning off gradients in IE when necessary; make :disabled [disabled] for crossbrowser usage 2011-09-02 12:19:43 -07:00
Mark Otto 411e324340 fix dropdown bug, remove second topbar from docs now 2011-09-02 00:58:07 -07:00
Mark Otto 251882892f resolve conflicts 2011-09-02 00:52:22 -07:00
Mark Otto fa94b264fa add temp second topbar to nav section, fix it's compatibility issues 2011-09-02 00:50:05 -07:00
Jacob Thornton ec82b613d3 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
2011-09-02 00:32:09 -07:00
Jacob Thornton 462287e25e div > ul ftw 2011-09-02 00:31:19 -07:00
Mark Otto 479e0ccd6b add backwards compatability for dropdowns in topbar 2011-09-02 00:28:54 -07:00
Jacob Thornton 0159524413 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-01 22:54:59 -07:00
Jacob Thornton 72da5dd54d for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit 2011-09-01 22:53:24 -07:00
Mark Otto 0cb6804b69 merging in remote and recompiling 2011-08-31 16:27:28 -07:00
Mark Otto 6258832776 spelling mistakes and undo of one comment 2011-08-31 16:26:47 -07:00
Jacob Thornton 90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	README.md
	bootstrap-1.2.0.css
2011-08-30 23:37:46 -07:00