diff options
| author | Mark Otto <[email protected]> | 2013-09-11 21:14:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-11 21:14:25 -0700 |
| commit | 682ee3ab1e3683d2352d01a5be94abd559573e10 (patch) | |
| tree | 23c6078b763660e44c8e4836b74bfd65e10be800 /getting-started.html | |
| parent | 291a23aa4fc62e7593d4471af2b438aa1017a86a (diff) | |
| parent | ecc6978241b86af14ea07c19b59e3c67e10fc43c (diff) | |
| download | bootstrap-682ee3ab1e3683d2352d01a5be94abd559573e10.tar.xz bootstrap-682ee3ab1e3683d2352d01a5be94abd559573e10.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'getting-started.html')
| -rw-r--r-- | getting-started.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/getting-started.html b/getting-started.html index 80880f787..ddd8ebc9f 100644 --- a/getting-started.html +++ b/getting-started.html @@ -84,7 +84,7 @@ bootstrap/ <p>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 (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). Fonts from Glyphicons are included, as is the optional Bootstrap theme.</p> <div class="bs-callout bs-callout-danger"> <h4>jQuery required</h4> - <p>Please note that <strong>all JavaScript plugins require jQuery</strong> to be included, as shown in the <a href="#template">starter template</a>.</p> + <p>Please note that <strong>all JavaScript plugins require jQuery</strong> to be included, as shown in the <a href="#template">starter template</a>. <a href="{{ site.repo }}/blob/v{{ site.current_version }}/bower.json">Consult our <code>bower.json</code></a> to see which versions of jQuery are supported.</p> </div> </div> @@ -649,6 +649,7 @@ bootstrap/ <li>The icons, now <code>.glyphicon</code>, are now font based. Icons also require a base and icon class (e.g. <code>.glyphicon .glyphicon-asterisk</code>).</li> <li>Typeahead has been dropped, in favor of using <a href="http://twitter.github.io/typeahead.js/">Twitter Typeahead</a>.</li> <li>Modal markup has changed significantly. The <code>.modal-header</code>, <code>.modal-body</code>, and <code>.modal-footer</code> sections are now wrapped in <code>.modal-content</code> and <code>.modal-dialog</code> for better mobile styling and behavior.</li> + <li>The HTML loaded by the <code>remote</code> modal option is now injected into the <code>.modal</code> instead of into the <code>.modal-body</code>. This allows you to also easily vary the header and footer of the modal, not just the modal body.</li> <li>JavaScript events are namespaced. For example, to handle the modal "show" event, use <code>'show.bs.modal'</code>. For tabs "shown" use <code>'shown.bs.tab'</code>, etc..</li> </ul> <p>For more information on upgrading to v3.0, and code snippets from the community, see <a href="http://bootply.com/">Bootply</a>.</p> |