diff options
| author | Mark Otto <[email protected]> | 2012-11-02 09:36:51 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-02 09:36:51 -0700 |
| commit | 1477e081d46ebf6a5e6acb06debb7edb1a324918 (patch) | |
| tree | 4467cd66b0999856636cda0c486004c63e25f119 /docs/javascript.html | |
| parent | 7732d8b9b06d359be7096880135f9ff546a898a2 (diff) | |
| parent | d0c75bbc8324a552b93817b1f565fa798f6574cf (diff) | |
| download | bootstrap-1477e081d46ebf6a5e6acb06debb7edb1a324918.tar.xz bootstrap-1477e081d46ebf6a5e6acb06debb7edb1a324918.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/getting-started.html
docs/templates/pages/getting-started.mustache
less/accordion.less
less/alerts.less
less/breadcrumbs.less
less/buttons.less
less/code.less
less/dropdowns.less
less/forms.less
less/navbar.less
less/progress-bars.less
less/responsive-navbar.less
less/tables.less
less/thumbnails.less
less/tooltip.less
less/wells.less
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index f62a1ac7b..6595784c6 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>Javascript · Twitter Bootstrap</title> + <title>Javascript · Bootstrap</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="description" content=""> <meta name="author" content=""> @@ -19,7 +19,7 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.png"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> @@ -71,7 +71,7 @@ ================================================== --> <header class="jumbotron subhead"> <div class="container"> - <h1>JavaScript for Bootstrap</h1> + <h1>JavaScript</h1> <p class="lead">Bring Bootstrap's components to life—now with 13 custom jQuery plugins. </div> </header> @@ -110,7 +110,7 @@ </div> <h3>Individual or compiled</h3> - <p>If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of the plugins listed on this page.</p> + <p>Plugins can be included individually (though some have required dependencies), or all at once. Both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all plugins in a single file.</p> <h3>Data attributes</h3> <p>You can use all Bootstrap plugins purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first class API and should be your first consideration when using a plugin.</p> @@ -185,7 +185,7 @@ $('#myModal').on('show', function (e) { <h3>Modal header</h3> </div> <div class="modal-body"> - <p>One fine body…</p> + <p>One fine body…</p> </div> <div class="modal-footer"> <a href="#" class="btn">Close</a> @@ -200,7 +200,7 @@ $('#myModal').on('show', function (e) { <h3>Modal header</h3> </div> <div class="modal-body"> - <p>One fine body…</p> + <p>One fine body…</p> </div> <div class="modal-footer"> <a href="#" class="btn">Close</a> @@ -257,7 +257,7 @@ $('#myModal').on('show', function (e) { <h3 id="myModalLabel">Modal header</h3> </div> <div class="modal-body"> - <p>One fine body…</p> + <p>One fine body…</p> </div> <div class="modal-footer"> <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> @@ -1617,6 +1617,12 @@ $('.carousel').carousel({ <td>Method used to sort autocomplete results. Accepts a single argument <code>items</code> and has the scope of the typeahead instance. Reference the current query with <code>this.query</code>.</td> </tr> <tr> + <td>updater</td> + <td>function</td> + <td>returns selected item</td> + <td>The method used to return selected item. Accepts a single argument, the <code>item</code> and has the scope of the typeahead instance.</td> + </tr> + <tr> <td>highlighter</td> <td>function</td> <td>highlights all default matches</td> @@ -1684,7 +1690,7 @@ $('[data-spy="affix"]').each(function () { <td>offset</td> <td>number | function | object</td> <td>10</td> - <td>Pixels to offset from screen when calculating position of scroll. If a single number is provide, the offset will be applied in both top and left directions. To listen for a single direction, or multiple unique offsets, just provided an object <code>offset: { x: 10 }</code>. Use a function when you need to dynamically provide an offset (useful for some responsive designs).</td> + <td>Pixels to offset from screen when calculating position of scroll. If a single number is provided, the offset will be applied in both top and left directions. To listen for a single direction, or multiple unique offsets, just provide an object <code>offset: { x: 10 }</code>. Use a function when you need to dynamically provide an offset (useful for some responsive designs).</td> </tr> </tbody> </table> @@ -1704,12 +1710,14 @@ $('[data-spy="affix"]').each(function () { <footer class="footer"> <div class="container"> <p class="pull-right"><a href="#">Back to top</a></p> - <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> - <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> - <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> + <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> + <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> + <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <ul class="footer-links"> - <li><a href="http://blog.getbootstrap.com">Read the blog</a></li> - <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li> + <li><a href="http://blog.getbootstrap.com">Blog</a></li> + <li class="muted">·</li> + <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li> + <li class="muted">·</li> <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li> </ul> </div> |