root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
3,272 Commits 111 Branches 92 Tags 671 MiB
Commit Graph

830 Commits

Author SHA1 Message Date
Erik van der Kolk 41253fb073 Improve doc for Button sizes 2012-08-18 16:36:40 +02:00
Erik van der Kolk a3c474c404 Move code within <pre> tags as close to the left for Input focus 2012-08-18 16:07:48 +02:00
Erik van der Kolk f4f6783cc0 Add <input> into Help text code snippet as shown in example 2012-08-18 16:03:47 +02:00
Erik van der Kolk 263ed4e239 Add span5 from example into multiple grid inputs code snippet 2012-08-18 15:48:18 +02:00
Erik van der Kolk f37d4b0918 Add missing placeholders and <select> in Grid sizing code snippet 2012-08-18 15:43:00 +02:00
Erik van der Kolk 01dadc05f4 Make Relative sizing code snippet the same as example 2012-08-18 15:31:11 +02:00
Erik van der Kolk 663fd4ff62 Make Extending form ... => Search form code snippet the same as example 2012-08-18 15:29:55 +02:00
Erik van der Kolk a8b18b6f54 Fix typo 2012-08-18 14:54:32 +02:00
Erik van der Kolk 25f8ef3260 Add multiple="multiple" to Forms => Selects as described in explanation 2012-08-18 14:36:30 +02:00
Erik van der Kolk c8b8d914b8 Make Forms => Textarea code snippet the same as example 2012-08-18 14:22:41 +02:00
Erik van der Kolk 7f5aa177f5 Make Forms => Default styles code snippet the same as example 2012-08-18 14:00:33 +02:00
Erik van der Kolk 0c24f51d2a Change .help-block tag for "Forms => Default styles" example into <span> 2012-08-18 13:56:02 +02:00
Erik van der Kolk 05571db109 Add <caption> to Supported table markup example 2012-08-18 13:40:37 +02:00
Mark Otto 5b947b8a2f fix up padding on small buttons, add button examples 2012-08-17 16:11:52 -07:00
Mark Otto 077577c7f3 fixes #4421: add static top navbar class 2012-08-17 11:46:23 -07:00
Mark Otto b8715ddfd0 fixes #4417: proper height on thumbnail placeholder image 2012-08-17 11:27:11 -07:00
Jacob Thornton ae9a2bd93a Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-14 21:06:39 -07:00
Jacob Thornton dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Mark Otto e1659b2c4e add affix plugin to downloads page 2012-08-14 18:57:27 -07:00
Mark Otto f3479a3953 compensate for ie7 button padding with no borders, fix indentation 2012-08-14 15:44:25 -07:00
Mark Otto a80dafbb18 fix width of star github btn in docs 2012-08-14 15:00:22 -07:00
Mark Otto e9b04acb92 Merge pull request #4384 from andriijas/2.1.0-wip-js-typo-fix 
now with 13 custom jquery plugins
 2012-08-14 09:54:04 -07:00
Mark Otto 57ea6fea76 Merge pull request #4376 from kylase/2.1.0-wip 
Changed placeholders values
 2012-08-14 09:30:27 -07:00
Andreas Cederström 2df0a0fdeb now with 13 custom jquery plugins 2012-08-14 13:58:12 +02:00
Mark Otto 97a23ef2e6 fixes #4342: navbar vars not in use, render navbar dividers 2012-08-13 22:57:40 -07:00
kylase d684607976 Amend placeholders values 2012-08-14 13:51:50 +08:00
Mark Otto 0040a78058 merge 2012-08-13 21:35:31 -07:00
Mark Otto 41f4c60a91 fixes #4373: broken examples link on homepage 2012-08-13 21:34:40 -07:00
Henning Hoefer a74457a203 Fixed a typo in inverse navbar code sample 2012-08-14 02:10:07 +02:00
Ben Oakes e31f06b857 Fix wording (presumed typo) 2012-08-13 13:22:08 -05:00
Mark Otto 9f8ce77751 running make on previous changes 2012-08-13 10:05:19 -07:00
Mark Otto e06c257e6b fix gh buttons 2012-08-09 11:25:34 -07:00
Mark Otto 08e4475f00 reorg vars fields on customize page to ensure they are all in three columns for time being 2012-08-07 23:11:23 -07:00
Mark Otto 3c89f7bb5f fix chevron on js docs and run make after table changes 2012-08-07 23:07:53 -07:00
Christian 25c6175311 Update docs/templates/pages/javascript.mustache 
Amended all mentions of 'Javascript' and 'javascript' in the body text to the correct 'JavaScript'.
 2012-08-05 12:39:17 +09:00
Jacob Thornton 48546c2735 aria-labelledby="myModalLabel" aria-hidden="true" 2012-08-01 20:26:44 -07:00
Dirk Ginader 6977d35eed close #3531 added focus handling and removed the badly announced "times" close button from screenreaders 2012-08-01 20:11:16 -07:00
Mark Otto c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto 7aaf141371 add compability note to image styles 2012-08-01 16:57:27 -07:00
Mark Otto 31b30ab88e copy edits to docs 2012-07-31 00:06:37 -07:00
Mark Otto 9795e9bbe6 place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 2012-07-30 23:48:26 -07:00
Mark Otto 0e62011da0 fix download page links 2012-07-30 15:52:38 -07:00
Mark Otto 04164e4367 fixes #3858: add var for responsive navbar. also add additional examples to navbar docs 2012-07-30 10:25:04 -07:00
Mark Otto a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto fe6a4b0b54 add .btn-block for a full-width button option 2012-07-27 15:42:58 -07:00
Mark Otto 16b4ac0d8f add docs for sub menu support on dropdowns, add caret via :after to submenu toggles 2012-07-27 10:35:15 -07:00
Mark Otto 9d5c431223 add basic support for sub menus in dropdown menus 2012-07-27 10:06:54 -07:00
Mark Otto 1e9b450619 add image styles, for now to scaffolding (soon to own file) 2012-07-27 00:06:43 -07:00
Mark Otto 79067721b1 fix js docs formatting 2012-07-26 23:21:06 -07:00
Mark Otto f75277e62d indenting and such 2012-07-26 21:45:19 -07:00
Mark Otto b7b4fd5c82 wrap footer in bs docs canvas for scrolling doodad 2012-07-24 01:53:32 -07:00
Jacob Thornton e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Jacob Thornton 5b2f2ed821 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-07-24 00:24:25 -07:00
Jacob Thornton 4ea7c47235 slightly fix side bar 2012-07-24 00:21:40 -07:00
Mark Otto f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
 2012-07-23 23:01:38 -07:00
Mark Otto 0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Mark Otto 5b8838aeac more alignment fixes for customize page 2012-07-23 12:51:48 -07:00
Jacob Thornton dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
Jacob Thornton fa1e1e34df Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 14:52:13 -07:00
Jacob Thornton fae6c36874 adds minLength #3960 2012-07-22 14:50:52 -07:00
♒∆✝ 48fc0ad569 Merge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy 
namespace the events for popover/tooltip
 2012-07-22 14:40:09 -07:00
Jon Stevens d76c899142 remove the ns option 2012-07-22 14:36:23 -07:00
Mark Otto b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Jon Stevens 117f65d431 on destroy, also hide. issue #3880, pull #4104 2012-07-20 09:47:12 -07:00
Mark Otto 6c23fff4d6 misc docs content changes 2012-07-18 01:06:52 -07:00
Mark Otto c8fa2600f2 copy change 2012-07-17 23:38:29 -07:00
Mark Otto aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto cb1a59caa0 Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip 
Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
 2012-07-17 23:14:58 -07:00
Purwandi 51c9fa1697 Moved JS to bottom on extends page 2012-07-18 12:19:02 +07:00
Mark Otto 6a663081a7 remove separate examples page, add to getting started page 2012-07-17 21:45:57 -07:00
Mark Otto a1ad6d124a Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip 
Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache
 2012-07-17 20:57:20 -07:00
Jon Stevens 2ee9b2717b namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880 2012-07-16 16:01:11 -07:00
Ben Oakes 9581cbfe32 Two of the three apps are for Linux/Windows; adjust accordingly 2012-07-16 09:29:49 -04:00
Mark Otto 40ab928315 Merge pull request #4083 from martinbean/2.1.0-wip 
Moved JS to bottom as per best practices
 2012-07-15 16:26:42 -07:00
Mark Otto e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00
Mark Otto 750badabf7 copy edits and tweaks to utility classes to ensure they always are specific enough 2012-07-13 14:43:51 -07:00
Martin Bean 74b167b86d Moved JS to bottom as per best practices 2012-07-13 22:25:47 +01:00
Mark Otto 463de252a9 update static assets section of extend page, copy changes elsewhere 2012-07-13 14:20:25 -07:00
Mark Otto 6e622ee763 more content edits to Extend 2012-07-13 11:18:35 -07:00
Mark Otto 93b1519017 content edits to Extend page 2012-07-13 11:17:22 -07:00
Mark Otto 5cb116beb8 cleanup subnav example 2012-07-13 10:58:20 -07:00
Mark Otto 2d4f5eb5a4 fix indenting on getting started page 2012-07-13 00:56:18 -07:00
Mark Otto fae691c3d9 some analytics tracking on getting started 2012-07-12 21:41:51 -07:00
Mark Otto f36060dab5 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:40:25 -07:00
Mark Otto 9343e1e933 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:38:18 -07:00
Mark Otto a12f0e551f overhaul docs on sub pages, clean up css and copy 2012-07-12 18:11:49 -07:00
Mark Otto 549d61fc28 updated footer 2012-07-12 17:02:55 -07:00
Mark Otto 3c775f2432 add chevrons to other docs navs 2012-07-12 16:23:21 -07:00
Mark Otto c884d6eaa6 clean up docs for subnav 2012-07-12 13:50:27 -07:00
Mark Otto 338c7ef2b6 tweak code snippet on pager and clean up type and font-sizes on docs Home 2012-07-12 13:45:07 -07:00
Mark Otto 5b5352c92d fix grid alignment on scaffolding 2012-07-11 11:15:04 -07:00
Mark Otto 5d8e78e0fa fixes #3605: add support for input-prepend/-append to .form-search 2012-07-10 00:32:30 -07:00
Mark Otto 75d952ffd8 fix indenting and remove hidden subnav on Components 2012-07-09 22:40:58 -07:00
Mark Otto 0ca210395c fix indenting and remove hidden subnav on Scaffolding 2012-07-09 22:36:12 -07:00
Mark Otto 3ea309568f fix indenting and remove hidden subnav on Base CSS docs 2012-07-09 22:34:33 -07:00
Mark Otto c74dddd02e fix indenting on extend and js docs pages, remove hidden subnavs 2012-07-09 22:29:53 -07:00
Mark Otto 6f8226a393 update Extend docs page to include side nav and spec out next section for extending with static assets 2012-07-09 22:25:00 -07:00
Mark Otto 64e87a85f5 remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1 2012-07-09 22:14:30 -07:00
Mark Otto f4877c2369 fix up docs popover examples and copy 2012-07-09 21:13:33 -07:00
Mark Otto 413c05a09d fixes #3381: update docs to show correct media query range on responsive utilities 2012-07-09 20:55:11 -07:00
Mark Otto 93be608bf0 fixes #3384: add support for multiple inputs per line when using grid sizing 2012-07-09 20:49:17 -07:00
Mark Otto 9887d3cf4a updating docs examples to remove 13/18 resets, fix up buttons alignments and carets 2012-07-09 00:26:32 -07:00
Mark Otto 410decafad indenting 2012-07-09 00:17:52 -07:00
Mark Otto 16cf6b30cd docs changes for icons 2012-07-09 00:17:36 -07:00
Mark Otto 8b696ad0b5 fix text in docs about default font-size and line-height 2012-07-09 00:14:35 -07:00
Mark Otto 20676ddd4d adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar 2012-07-08 01:47:36 -07:00
Mark Otto 5f861ef517 fix up docs to use default container, fix responsive home changes 2012-07-07 23:16:07 -07:00
Mark Otto 7cc916d137 Merge branch '21jumpst' into 2.1.0-wip 2012-07-07 00:48:15 -07:00
Mark Otto e2336ef02a remove specific values for the fluid grid system and instead use LESS's percentage() function 2012-07-07 00:30:43 -07:00
Mark Otto 6d447079a4 update buttons in docs to include type 2012-07-06 15:18:56 -07:00
Mark Otto 095e052606 adding homepage social buttons 2012-07-06 10:10:56 -07:00
Mark Otto cd6915cdb4 tests cleanup on type, homepage content tweaks 2012-07-05 19:45:32 -07:00
Mark Otto 3c07eaa251 updates to type scale 2012-07-05 15:11:54 -07:00
Mark Otto c6ee96c025 fix up subnav styles, add subnav search form styles, add some basic docs for subnav 2012-07-05 10:37:23 -07:00
Mark Otto a645664e50 update thumbnails to fix display issues and refine aesthetics 2012-07-05 10:12:15 -07:00
Mark Otto 62c386259b rewrite docs homepage, new graphics 2012-07-04 23:31:30 -07:00
Gavin Cooper (work) b4125748b0 added ability to give rows in tables status classes .success .error and .info. 2012-07-04 12:22:34 +01:00
Mark Otto 70e81e6f55 new jumbotron 2012-07-01 08:42:09 -07:00
Mark Otto c09e8473e2 use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta 2012-06-28 10:03:46 -07:00
Mark Otto a683497dbc renamed less.html to extend.html, removing all the vars and mixins 2012-06-27 23:56:00 -07:00
Mark Otto 27845e4492 #3223: make table row hover optional class 2012-06-25 14:11:37 -07:00
Mark Otto 6662f62236 remove subnav file, instead add an optional class for .navbar 2012-06-24 21:03:39 -07:00
Mark Otto 71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Mark Otto 160fe7ca59 create vars for responsive grid values, fixed and fluid, and document them in the customizer 2012-06-20 23:46:51 -07:00
Mark Otto 3875a9f31b Merge branch 'marcusds-2.1.0-wip' into 2.1.0-wip 2012-06-20 20:26:59 -07:00
Mark Otto b353565d4e add docs for fluid offsetting 2012-06-20 20:26:50 -07:00
Jacob Thornton 1e717991e8 Merge pull request #3880 from lookfirst/popover-destroy 
Add popover / tooltip destroy method
 2012-06-20 12:02:05 -07:00
Mark Otto 089f42a07f fix html typos 2012-06-20 00:06:05 -07:00
Mark Otto 9df832b4bb add separate vars for dropdown link hover and active states 2012-06-19 19:17:42 -07:00
Mark Otto 40298ddbf1 add note to components about nav list nesting 2012-06-19 15:25:35 -07:00
Mark Otto ff92344f0d remove icons example of nav list--doesn't really add anything useful 2012-06-19 14:46:14 -07:00
Mark Otto b54264cde0 add basic vertical button group support 2012-06-19 14:42:46 -07:00
Mark Otto 64ba423b6d #2764: add disabled styles to navs and dropdowns 2012-06-19 13:52:07 -07:00
Mark Otto 143b6ae2de fix less docs typos 2012-06-19 13:23:30 -07:00
Mark Otto 9aa5a6db12 updated tests and homepage marketing copy 2012-06-19 13:21:35 -07:00
Jon Stevens af88f54e5d small typo fix to docs 2012-06-18 19:56:52 -07:00
Jon Stevens 6a974f9ff7 enable the ability to destroy tooltips and popovers from elements. related to issue #3453 2012-06-18 19:25:54 -07:00
Mark Otto b1cb556503 improve inline-block of append/prepend inputs with font-size: 0; 2012-06-14 11:56:46 -07:00
Mark Otto cda48d41ba fix #gradientBar to .gradientBar in LESS docs 2012-06-13 22:04:02 -07:00
Mark Otto 3ead14a1e0 clarify support of select items (which is none) for input-prepend/append 2012-06-13 22:00:10 -07:00
Mark Otto 2cbff258b9 fix examples page 2012-06-11 22:33:16 -07:00
Mark Otto 1db72f8d77 Merge pull request #3810 from purwandi/develop 
Add space between attrs in docs on navbar button
 2012-06-11 22:31:58 -07:00
Mark Otto 2e6d4e9439 more rearrangement and removal of about sections in js docs 2012-06-11 22:28:10 -07:00
Mark Otto bf875d9e36 cleanup options display in all sections, rearrange typeahead section 2012-06-11 22:19:25 -07:00
Purwandi c7ffe6edc8 Add space on navbar button 2012-06-12 12:17:10 +07:00
Mark Otto f453909f39 add a dropdowns section to Components (still needs work) and reformat much of the js docs 2012-06-11 21:48:41 -07:00
Mark Otto 5dd47f1196 keep tables at 13px in docs for now, clean up some modals js docs stuff 2012-06-11 20:33:00 -07:00
Mark Otto 7ed02b461b fix blockquote alignment 2012-06-11 20:20:51 -07:00
Mark Otto a0cd886c56 rewrite the rest of the nav section 2012-06-10 21:24:13 -07:00
Mark Otto c90c66e61f rewrite the split button dropdowns section 2012-06-10 21:00:20 -07:00
Mark Otto 081a07c168 updated button groups section 2012-06-10 20:50:49 -07:00
Mark Otto 017b7cb804 rewrite the navbar section 2012-06-10 20:39:00 -07:00
Mark Otto 0c817bf5e2 redo pagination and breadcrumbs 2012-06-10 16:46:46 -07:00
Mark Otto 3985379cca rearrange hero unit section 2012-06-10 15:14:21 -07:00
Mark Otto f2e39233f5 rewrite alerts and progress bars sections 2012-06-10 15:12:02 -07:00
Mark Otto 4a907709ba redo icons section 2012-06-09 23:26:46 -07:00
Mark Otto 5ef2b6561a realign icons to five cols, fix buttons 2012-06-09 22:47:45 -07:00
Mark Otto fc2481b8e5 fix form display issue in docs 2012-06-09 19:26:06 -07:00
Mark Otto c65006601e overhaul forms docs to simplify presentation of everything, reduce text, and increase visibility of examples 2012-06-09 19:15:46 -07:00
Mark Otto ca63ea2f26 overhaul tables docs for more streamlined content 2012-06-09 13:15:28 -07:00
Mark Otto aff3694f28 remove mention of prettify from docs, fix docs subnav width when fixed 2012-06-09 12:58:55 -07:00
Mark Otto 550e375af0 restore scrollspy to body 2012-06-08 16:35:04 -07:00
Mark Otto 269ce715f1 overhaul js docs top sections, update subhead 2012-06-07 22:24:47 -07:00
Mark Otto 97c7a83a8f remove individual js file download buttons 2012-06-07 22:12:15 -07:00
Mark Otto bba0b34c36 restore top navs entirely 2012-06-07 22:10:36 -07:00
Mark Otto c1c7528dd9 drop the side nav, restore topbar 2012-06-07 21:48:03 -07:00
Mark Otto df869f1eb0 fix grids 2012-06-07 21:45:37 -07:00
Mark Otto ff6dd0cf56 nav and content tweaks 2012-06-07 14:01:03 -07:00
Mark Otto 860a96939a fix grid tooltips, tweaks 2012-06-07 10:58:15 -07:00
Mark Otto a1aa2b188a more content changes to docs 2012-06-07 10:20:52 -07:00
Mark Otto 2ecbd36cbf add back left rail nav, tweak colors 2012-06-06 00:48:31 -07:00
Mark Otto 10d68406fe examples-wrap tables 2012-06-05 23:59:50 -07:00
Mark Otto 2c5ac562d2 updated type section of base css 2012-06-05 20:47:40 -07:00
Mark Otto 5a614fb86d remove sidenav 2012-06-05 19:53:54 -07:00
Mark Otto 09ec0b843e updated less page to single col 2012-06-05 18:29:26 -07:00
Mark Otto 8ee0679522 updated javascripts for first pass at single column 2012-06-05 18:25:46 -07:00
Mark Otto 53cec198c0 update layout for side nav 2012-06-05 17:17:20 -07:00
Mark Otto 22918f8f92 more tweaks to layouts and some docs styles 2012-06-05 17:16:17 -07:00
Mark Otto dd127611e1 two col scaffolding rev 2012-06-05 00:46:16 -07:00
Mark Otto de53f62a04 more changes to js and components, playing with new docs subnav 2012-06-04 23:57:48 -07:00
Mark Otto 47e2c43401 navs tabs pills to single column 2012-06-04 23:37:18 -07:00
Mark Otto b8d8704f90 button groups and dropdowns to single column 2012-06-04 23:34:02 -07:00
Mark Otto 446f9199c6 updated index page and footer 2012-06-04 23:31:26 -07:00
Mark Otto f0ff20ec40 updating scaffolding page to single column 2012-06-04 23:10:30 -07:00
Mark Otto 257890f839 finish off rest of base-css page 2012-06-04 23:03:21 -07:00
Mark Otto 060100cf3a update table section to single column 2012-06-04 21:13:35 -07:00
Mark Otto 094e12f68d convert code section to new layout 2012-06-04 21:10:08 -07:00
Mark Otto c44bd1edf4 revamp docs to have new width, start realigning the base css page to match 2012-06-04 21:08:31 -07:00
Mark Otto 348668ec13 add misc helper classes to components css docs 2012-06-04 20:25:57 -07:00
Mark Otto 589242604f document large and small well classes 2012-06-04 18:56:50 -07:00
Mark Otto b79c100967 add placeholder to input-prepend to confirm FF placeholder looks good 2012-06-04 18:44:50 -07:00
Mark Otto c56eb0962a fix double @@ on less pages 2012-06-04 18:39:02 -07:00
Mark Otto 8eb1488861 wrap download page in form 2012-06-04 08:44:50 -07:00
Jacob Thornton 82ea5847a7 adds remote source to modal. Remote source can be specified in href or by providing a remote option #936 2012-06-03 21:26:54 -07:00
Mark Otto 9a4ee790e1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2012-06-02 22:14:12 -07:00
Mark Otto 9a3a297a47 update version # on homepage, crush assets 2012-06-02 22:12:45 -07:00
Matt Morgan af14f6db5d Merge branch 'async' into 2.1.0-wip 2012-06-03 00:33:06 -04:00
Jacob Thornton a38bc90b48 change note to point out that boostrap.js bundles all plugins #3174 2012-06-02 21:19:56 -07:00
Jacob Thornton f836473129 add html option back to tooltip and popover to explicitly prevent XSS #3421 2012-06-02 17:55:10 -07:00
Jacob Thornton 5e5965ca6f Merge branch 'accessibility' into 2.1.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-06-02 16:11:35 -07:00