0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

681 Commits

Author SHA1 Message Date
Mark Otto
069ef6a020 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-12-19 22:59:20 -08:00
Mark Otto
72a536393c mostly docs updates, but also some bug fixes per github issues 2011-12-19 22:58:56 -08:00
Jacob Thornton
7df0d1c7d1 rename transitions to transition and fix scrollspy example 2011-12-14 18:45:33 -08:00
Mark Otto
aa69286c30 rename transitions js file, fix link in js docs 2011-12-13 10:05:19 -08:00
Mark Otto
d681ae9f51 updated docs to include other less apps 2011-12-12 09:51:41 -08:00
Mark Otto
4e8c26d409 updated buttons docs 2011-12-11 02:38:58 -08:00
Mark Otto
54a84f0f7f clearer grid vars docs language 2011-12-11 02:05:50 -08:00
Mark Otto
ecbc9ec4a2 updated footers everywhere 2011-12-11 02:03:16 -08:00
Mark Otto
401f84a7ec center example sites in docs on mobile 2011-12-11 01:58:06 -08:00
Mark Otto
95048c271e fix specificity on pills 2011-12-11 01:03:57 -08:00
Mark Otto
6de3ed5322 Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider
Conflicts:
	bootstrap.css
2011-12-11 00:58:10 -08:00
Mark Otto
200fe25d0a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-12-10 22:30:17 -08:00
Mark Otto
d2e56ad53d unstyle image inputs 2011-12-10 22:29:49 -08:00
Mark Otto
d587845149 tweaks and increase specificity of pills and active classes 2011-12-10 22:21:08 -08:00
Mark Otto
e240aac6cb Merge pull request #777 from ceejayoz/2.0-wip
Updated bordered-table example to use correct class in docs
2011-12-10 15:05:09 -08:00
Mark Otto
4d55356e9b remove uber large responsive stuff 2011-12-09 14:39:23 -08:00
Mark Otto
5c8df1d285 updated index page to add featured sites, more docs tweaks 2011-12-09 14:34:38 -08:00
Mark Otto
97b285896f help tables not look like shit on mobile maybe? also fix bordered table example 2011-12-09 12:51:54 -08:00
Mark Otto
7b810bf9a6 update js in footer, add max-width to img 2011-12-09 12:10:01 -08:00
Mark Otto
1d1805ee5c add jank js for prototyping new topbar to all docs pages 2011-12-09 11:41:00 -08:00
Mark Otto
312ee6cdfb Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-12-09 11:33:02 -08:00
Mark Otto
b12b71bf7c updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings 2011-12-09 11:32:07 -08:00
Chris Sternal-Johnson
e603009fca fix docs for bordered-table 2011-12-08 14:42:42 -05:00
Evan Meagher
6e70d490e1 Add vertical nav divider example in components doc page. 2011-12-02 11:37:39 -08:00
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