root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity
8,550 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

504 Commits

Author SHA1 Message Date
Mark Otto 5517f9907e Fixes #12744: Document ability to remove animation on modals 2014-02-21 14:52:15 -08:00
Chris Rebert f6d029f6ab Use .bs-example-* instead of .bs-* in examples in docs 
Refs #12610
 2014-02-12 11:13:54 -08:00
Chris Rebert dff122f7f0 avoid using .bs-* in example, & improve style 2014-02-12 11:07:04 -08:00
Chris Rebert 77eaa808db tweak phrasing for hopefully greater clarity 2014-02-10 10:12:28 -08:00
Zlatan Vasović bdf9ce4c45 Omit semicolons consistently in docs 2014-02-07 19:31:08 +01:00
Mark Otto b4aaf04b3f Merge pull request #12319 from twbs/address-12007 
Clarify target of dropdown events
 2014-02-07 01:39:00 -08:00
Mark Otto ebd132ce68 Fixes #12611: Mention limitation of one plugin's data attributes per element 2014-02-07 01:10:21 -08:00
Chris Rebert 27e080df4b fix #12527 2014-02-02 22:51:19 -08:00
Chris Rebert e9212e8ab7 update docs about destination of remote modal content; fixes #12494 2014-02-02 22:11:18 -08:00
Chris Rebert 4b194471b0 fix #12484 2014-01-31 10:32:32 -08:00
Julian Thilo 3a62811bbd Update javascript.html 2014-01-28 00:01:10 +01:00
Julian Thilo 0a5cb2f908 Fix typo 2014-01-27 23:07:14 +01:00
Mark Otto 45ea456468 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-27 09:42:33 -08:00
Mark Otto e08e871f01 document id requirement in carousels per #12393 2014-01-27 09:24:51 -08:00
Quy Ton 5c1852fb74 Change positioning reference from left to right in affix's example. 2014-01-27 09:17:57 -08:00
Chris Rebert bc9335650c fix #12007 by clarifying target of dropdown events 2014-01-20 18:39:13 -08:00
Julian Thilo 4a36ecaac6 fix #12314 2014-01-20 23:36:52 +01:00
nkav 4380ca4348 Corrected tag for Alert JS animation example from <a> to <button> 
Also removed href attribute and added type="button"
 2014-01-20 13:46:41 -08:00
Chris Rebert 20772462df grammar: fix plural possessive 2014-01-18 17:17:53 -08:00
Chris Rebert 0be0090983 fix anomalous indentation 2014-01-18 17:13:16 -08:00
Chris Rebert 6af0013ac5 Revert "Add tooltip `viewport` option, respect bounds of the viewport" 
This reverts commit edb221a20c.
Reverting due to broken JS unit tests.

Conflicts:
	docs/javascript.html
 2014-01-16 20:32:59 -08:00
Mark Otto 03f4534307 Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport 
Conflicts:
	docs/javascript.html
 2014-01-16 20:01:28 -08:00
patricker 47f786e6ea Update javascript.html 
Fixed issue in Tabs example where the div had been marked as 'active' but the li had not been.  The correct tab of data would be displayed on load, but no tabs would be highlighted.  The tabs with fade example does not have this issue.  jsFiddle: http://jsfiddle.net/uXV56/
 2014-01-16 11:41:34 -07:00
Mark Otto 14975e4ee9 indentation and page header changes 2014-01-15 13:24:34 -08:00
Chris Rebert 2ba15c3750 upgrade tooltip/popover-in-groups callout from info to warning 2014-01-14 21:01:09 -08:00
Ben Ogle edb221a20c Add tooltip `viewport` option, respect bounds of the viewport 2014-01-14 17:42:29 -08:00
Chris Rebert ae255447f2 add .container(-fluid) to remaining navbar examples for consistency/accuracy 
follow-up to 93a4d6cc5e
 2014-01-05 12:55:03 -08:00
Quy Ton a617c805f2 Fix anchor links 2014-01-04 09:28:56 -08:00
Quy Ton 11f56bbb7b Use relative URLs 2014-01-04 09:10:02 -08:00
Quy Ton a53779d020 Refer to popovers instead of tooltips. 2014-01-03 10:55:06 -08:00
Mark Otto 0df96d8c32 Merge branch 'master' into docs_dir 2013-12-31 10:38:31 -08:00
Mark Otto 70b8b330f0 no more page.base_url 2013-12-28 23:08:46 -08:00
Mark Otto a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Mark Otto a8005b3d0b flatten docs dir back into root 2013-07-18 17:41:30 -07:00
fat 6ec8a1e44f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-18 01:08:19 -07:00
fat 37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Mark Otto 1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto 7cc34ea547 fix broken docs callouts 2013-07-17 20:17:56 -07:00
Mark Otto 542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam 
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
 2013-07-17 19:33:30 -07:00
Mark Otto 6aec8f36fc fix broken scrollspy example 2013-07-15 12:00:01 -07:00
Julian Thilo 88d76e386f Dustin the docs again 
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
 2013-07-09 15:32:28 +02:00
Maurice Wahba 8a84da6341 Carousel no longer dependent on glyphicons 
Used laquo/raquo for control buttons
Updated docs
 2013-07-06 22:26:40 +04:00
Mark Otto 416cc6b2ee fix broke js markup 2013-06-27 19:33:26 -07:00
fat b06ec345ce Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 19:19:57 -07:00
fat 94761c2216 use collapse in dropdown js example 2013-06-27 18:47:35 -07:00
Mark Otto cb29ed0751 Merge pull request #8307 from cvrebert/8287-docs-patch 
Fix #8287
 2013-06-27 18:38:34 -07:00
Julian Thilo b4e0e4fee6 Adjust info callout, add callouts to docs 
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
 2013-06-26 15:59:33 +02:00
Chris Rebert 242d92e09c Fix #8287 2013-06-25 20:18:30 -07:00
Chris Rebert 694c650f8e copyedit JS docs 2013-06-25 19:32:17 -07:00
Julian Thilo a87ea9345b Add IDs, adjust text 2013-06-25 21:59:34 +02:00