0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

19528 Commits

Author SHA1 Message Date
Evan Meagher
3726df695e Merge remote-tracking branch 'upstream/2.0-wip' into add-vertical-nav-divider 2011-12-02 10:47:46 -08:00
Jacob Thornton
cee2f61898 define constructor on prototypes 2011-11-30 22:42:22 -08:00
Jacob Thornton
b1cba98aab Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-11-30 22:05:49 -08:00
Jacob Thornton
dc628c9115 start of carousel 2011-11-30 22:05:09 -08:00
Mark Otto
bc51c15709 adding temp idea for subnav to docs 2011-11-30 01:00:55 -08:00
Mark Otto
f2c40ee24d adding step nav to components 2011-11-30 00:39:38 -08:00
Mark Otto
447c9322e9 update all leads on docs pages 2011-11-29 23:56:01 -08:00
Mark Otto
90c190d4ef updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks 2011-11-29 23:48:27 -08:00
Mark Otto
0c8d2e37e7 adding bordered table to docs and showing it works with colspan 2011-11-29 23:16:38 -08:00
Evan Meagher
61e84d8762 Add vertical nav divider. 2011-11-29 23:16:09 -08:00
Mark Otto
8f3150cf71 Merge branch 'form-feedback-fix' of https://github.com/tinyfly/bootstrap into tinyfly-form-feedback-fix
Conflicts:
	bootstrap.css
2011-11-29 22:53:12 -08:00
Mark Otto
cbb291b8ab Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
2011-11-29 22:35:58 -08:00
Mark Otto
b36df46310 misc docs updates, revamped tables CSS save for grid columns and tablesorter options 2011-11-29 22:35:03 -08:00
Mark Otto
08d0aff19f Merge pull request #722 from tinyfly/grid-input-size-fix
Match input grid classes to the new 12-col grid.
2011-11-29 19:17:12 -08:00
Jeff Adams
1da19bf65f scope form feedback states to .control-group instead of unused .clearfix 2011-11-29 14:06:31 -06:00
Jeff Adams
d48027d495 add input width calculation fix from #408 to the 2.0 branch 2011-11-29 11:12:32 -06:00
Mark Otto
ba17414d77 Merge pull request #711 from smaboshe/updates-to-2.0-docs
Updates to 2.0 docs to address typos and capitalization
2011-11-28 11:43:36 -08:00
Silumesii Maboshe
1af3596a5e Capitalising 'Bootstrap' and abbreviations. Fixing typos. 2011-11-28 08:13:54 +02:00
Jacob Thornton
7eb340ec58 add code to reset data for collapsed element so that item can be intitialized with correct options 2011-11-27 17:31:12 -08:00
Jacob Thornton
7522517b47 derp 2011-11-27 17:12:58 -08:00
Jacob Thornton
f77d0c21df turn attribute rules to list 2011-11-27 17:12:17 -08:00
Jacob Thornton
76f95f4ea2 change even was removed, in favor of show shown 2011-11-27 17:11:31 -08:00
Jacob Thornton
7f74f11262 fix heading for js readme... 2011-11-27 17:09:31 -08:00
Jacob Thornton
46fe38386a rename tabs to tab - clean up lots of api stuff make href acceptable target val 2011-11-27 17:04:55 -08:00
Jacob Thornton
3925ea9986 remove trailing semicolons - we'll be hosting minified files with semicolons - no reason to make the dev source ugly 2011-11-27 16:01:26 -08:00
Mark Otto
ecc9764c83 Remove static github buttons and replace with iframe versions 2011-11-27 00:44:30 -08:00
Jacob Thornton
3157de8d1d clean up comments for better built files 2011-11-25 21:34:55 -08:00
Jacob Thornton
bd8745a98b allow scrollspy to target a specific nav 2011-11-25 17:30:52 -08:00
Jacob Thornton
98fddaa355 new plugin "collapse" for collapsible lists and "accordion" like support 2011-11-25 17:23:14 -08:00
Jacob Thornton
96adf8f918 fix copy paste bug 2011-11-24 20:27:55 -08:00
Jacob Thornton
53ff2682cd clean up scrollspy a bit - add public api method 2011-11-24 20:27:18 -08:00
Jacob Thornton
b14f551c9c fix some more modal things 2011-11-24 20:12:13 -08:00
Jacob Thornton
1fa02fbda2 refactor modal 2011-11-24 20:04:07 -08:00
Jacob Thornton
69372701cf refactor dropdown in accordance with readme 2011-11-24 19:40:25 -08:00
Jacob Thornton
71654cbf69 refactor alerts + add new readme which idefientifies goals for 2.0 js 2011-11-24 18:55:44 -08:00
Jacob Thornton
b2650859d6 update buttons js for button groups 2011-11-24 14:43:26 -08:00
Jacob Thornton
296fad37b4 Merge pull request #694 from martinbean/patch-1
Fixed a typo (redux)
2011-11-24 11:13:33 -08:00
Martin Bean
fe68f708ce Removed funky characters. 2011-11-24 19:06:00 +00:00
Martin Bean
2b5b87db7d Fixed a typo. Because I'm a Grammar Nazi. 2011-11-24 11:37:08 +00:00
Jacob Thornton
e5fb1da164 push disable setting to the event loop - this allows for form submit to begin 2011-11-20 21:59:31 -08:00
Jacob Thornton
13a59a0124 remove js min from repo 2011-11-20 21:45:09 -08:00
Jacob Thornton
721e7b85d7 add minified source to min dir in js + add uglify to make process 2011-11-20 21:42:52 -08:00
Jacob Thornton
36a7eb3851 add build script for minified files and allow elements to be returned to getContent and title in popovers 2011-11-20 21:36:26 -08:00
Jacob Thornton
47c7f655ac update comment numbers 2011-11-20 21:13:28 -08:00
Jacob Thornton
8a891f2a7b act on all twipsy instances 2011-11-20 21:06:32 -08:00
Jacob Thornton
bc65b58551 merge in js from 1.4... start working through js docs 2011-11-20 20:58:04 -08:00
Jacob Thornton
0b1d5d9189 revert all js stuff back to 1.4 :/ 2011-11-20 18:19:50 -08:00
Mark Otto
4e6275d0fe update property order and do some misc cleanup 2011-11-17 01:28:42 -08:00
Mark Otto
159c7a7fda remove code styling if it's in a pre tag 2011-11-17 00:52:11 -08:00
Mark Otto
ba9fcd8b57 make uneditable inputs work with span* classes 2011-11-17 00:49:51 -08:00