diff options
| author | Jacob Thornton <[email protected]> | 2012-01-28 00:46:21 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-28 00:46:21 -0800 |
| commit | 81c128fd0b15157cc270c4bde33c399d65fe859d (patch) | |
| tree | 55822c47053600a5bc200c5b025f5151fa57e6d2 /docs/javascript.html | |
| parent | 09df780b7512b1e501aeed3ec3463470e33952aa (diff) | |
| parent | f1851ab1338938bf6315e223789e345f20cfb4b1 (diff) | |
| download | bootstrap-81c128fd0b15157cc270c4bde33c399d65fe859d.tar.xz bootstrap-81c128fd0b15157cc270c4bde33c399d65fe859d.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 0bcbe597c..2d31f0aa4 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -193,7 +193,7 @@ <div class="span9 columns"> <h2>Static example</h2> <p>Below is a statically rendered modal.</p> - <div class="well" style="background-color: #888; border: none;"> + <div class="well modal-example" style="background-color: #888; border: none;"> <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1"> <div class="modal-header"> <a href="#" class="close" data-dismiss="modal">×</a> @@ -743,7 +743,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>number | object</td> <td>0</td> <td> - <p>delay showing/hiding the tooltip (ms)</p> + <p>delay showing and hiding the tooltip (ms)</p> <p>If a number is supplied, delay is applied to both hide/show</p> <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> </td> @@ -855,7 +855,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>number | object</td> <td>0</td> <td> - <p>delay showing/hiding the popover (ms)</p> + <p>delay showing and hiding the popover (ms)</p> <p>If a number is supplied, delay is applied to both hide/show</p> <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> </td> |