diff options
| author | Mark Otto <[email protected]> | 2012-01-28 12:43:45 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-28 12:43:45 -0800 |
| commit | 698d4b414c234f74ae93384a8d83c14c15ab2cc9 (patch) | |
| tree | cc4e20b82963c0e51c2df122d24eaa9afee33aae /docs/javascript.html | |
| parent | 2bfda031cebcde7361797dd54badeb91d4cb98cf (diff) | |
| parent | f768242759903151c9957a493c5349f931d882ef (diff) | |
| download | bootstrap-698d4b414c234f74ae93384a8d83c14c15ab2cc9.tar.xz bootstrap-698d4b414c234f74ae93384a8d83c14c15ab2cc9.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 2d31f0aa4..f1ce98658 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -748,12 +748,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> </td> </tr> - <tr> - <td>z-index</td> - <td>number</td> - <td>1020</td> - <td>The tooltips z-index value</td> - </tr> </tbody> </table> <div class="alert alert-info"> @@ -860,12 +854,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> </td> </tr> - <tr> - <td>z-index</td> - <td>number</td> - <td>1010</td> - <td>The popovers z-index value</td> - </tr> </tbody> </table> <div class="alert alert-info"> @@ -1086,7 +1074,7 @@ $('#my-alert').bind('closed', function () { <div class="span9 columns"> <h2>Example accordion</h2> <p>Using the collapse plugin, we built a simple accordion style widget:</p> - + <div class="accordion" id="accordion2"> <div class="accordion-group"> <div class="accordion-heading"> @@ -1126,7 +1114,7 @@ $('#my-alert').bind('closed', function () { </div> </div> - + <hr> <h2>Using bootstrap-collapse.js</h2> <p>Enable via javascript:</p> |