aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-28 00:43:25 -0800
committerMark Otto <[email protected]>2012-01-28 00:43:25 -0800
commitf1851ab1338938bf6315e223789e345f20cfb4b1 (patch)
tree31ea4b2b926a0cf33bd830ea5c5c080325f9ca76 /docs/javascript.html
parentedee985b96dea8f8fdca88a0aa171adede7b2d8b (diff)
downloadbootstrap-f1851ab1338938bf6315e223789e345f20cfb4b1.tar.xz
bootstrap-f1851ab1338938bf6315e223789e345f20cfb4b1.zip
change text on js docs page to improve rendering on iphone, update responsive for carousel considerations
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 4acd844c1..2d31f0aa4 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -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>