diff options
| author | Mark Otto <[email protected]> | 2011-09-08 23:02:13 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-08 23:02:13 -0700 |
| commit | 1a8fb2dbf76b19c899ff8ae73a87c3727c1113cf (patch) | |
| tree | fc67e274699dd774de3aefadf95635bf071d9b74 /docs/index.html | |
| parent | ba08055a7be248582ce6b5ba00bf04f5c821bcdd (diff) | |
| parent | 5960711d0f79f7031b444bafba9a856c77f697bc (diff) | |
| download | bootstrap-1a8fb2dbf76b19c899ff8ae73a87c3727c1113cf.tar.xz bootstrap-1a8fb2dbf76b19c899ff8ae73a87c3727c1113cf.zip | |
resolve conflict
Diffstat (limited to 'docs/index.html')
| -rw-r--r-- | docs/index.html | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/index.html b/docs/index.html index 5c7e44a5e..558f3fcf2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -20,7 +20,10 @@ <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script> <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script> + <script>$(function () { prettyPrint() })</script> + <script src="assets/js/bootstrap-dropdown.js"></script> <script src="assets/js/application.js"></script> + <script src="assets/js/application-scrollspy.js"></script> <!-- Le fav and touch icons --> <link rel="shortcut icon" href="images/favicon.ico"> @@ -1357,6 +1360,10 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita <td>This plugin is for adding dropdown to the bootstrap nav.</td> </tr> <tr> + <td><a href="./javascript.html#tabs">bootstrap-tabs.js</a></td> + <td>This plugin adds quick, dynamic tab and pill functionality.</td> + </tr> + <tr> <td><a href="./javascript.html#twipsy">bootstrap-twipsy.js</a></td> <td>Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!</td> </tr> |