From a1b0311597fdf79965044e6cb17c1c1acf08b1b6 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 11 Sep 2013 19:53:32 -0700 Subject: [PATCH 1/2] document jQuery version requirement; fixes #10355 --- getting-started.html | 2 +- javascript.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/getting-started.html b/getting-started.html index 80880f787e..26bfef3ecd 100644 --- a/getting-started.html +++ b/getting-started.html @@ -84,7 +84,7 @@ bootstrap/

This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). Fonts from Glyphicons are included, as is the optional Bootstrap theme.

jQuery required

-

Please note that all JavaScript plugins require jQuery to be included, as shown in the starter template.

+

Please note that all JavaScript plugins require jQuery to be included, as shown in the starter template. Consult our bower.json to see which versions of jQuery are supported.

diff --git a/javascript.html b/javascript.html index 8305632ac1..ecab0bf9e5 100644 --- a/javascript.html +++ b/javascript.html @@ -24,7 +24,7 @@ base_url: "../"

Plugin dependencies

-

Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included before the plugin files).

+

Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included before the plugin files). Consult our bower.json to see which versions of jQuery are supported.

Data attributes

From 306d850d3a710fd2124b05b8ff23b7f498f3eaae Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 11 Sep 2013 20:08:59 -0700 Subject: [PATCH 2/2] add modal 'remote' option semantics change to migration docs; fixes #10585 --- getting-started.html | 1 + 1 file changed, 1 insertion(+) diff --git a/getting-started.html b/getting-started.html index 80880f787e..e116b9c3d2 100644 --- a/getting-started.html +++ b/getting-started.html @@ -649,6 +649,7 @@ bootstrap/
  • The icons, now .glyphicon, are now font based. Icons also require a base and icon class (e.g. .glyphicon .glyphicon-asterisk).
  • Typeahead has been dropped, in favor of using Twitter Typeahead.
  • Modal markup has changed significantly. The .modal-header, .modal-body, and .modal-footer sections are now wrapped in .modal-content and .modal-dialog for better mobile styling and behavior.
    • +
  • The HTML loaded by the remote modal option is now injected into the .modal instead of into the .modal-body. This allows you to also easily vary the header and footer of the modal, not just the modal body.
  • JavaScript events are namespaced. For example, to handle the modal "show" event, use 'show.bs.modal'. For tabs "shown" use 'shown.bs.tab', etc..

    • For more information on upgrading to v3.0, and code snippets from the community, see Bootply.