aboutsummaryrefslogtreecommitdiff
path: root/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-17 15:08:02 -0700
committerMark Otto <[email protected]>2013-08-17 15:08:02 -0700
commit5ba19dc8849b1b87836404acfa8bbb336db1e496 (patch)
tree1b71bf66ebb1f8ec38522db3c96a8fd8b7cbd7df /javascript.html
parent4f97df8aa42d2609efd52ea21f1e84124afbe39d (diff)
parenta01b1dd71ac56667becb42d245213bf698d2cc36 (diff)
downloadbootstrap-5ba19dc8849b1b87836404acfa8bbb336db1e496.tar.xz
bootstrap-5ba19dc8849b1b87836404acfa8bbb336db1e496.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'javascript.html')
-rw-r--r--javascript.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript.html b/javascript.html
index ddef28e9e..d229cc1d2 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1903,7 +1903,7 @@ $('#myCarousel').on('slide.bs.carousel', 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 provided, the offset will be applied in both top and left directions. To provide a unique, bottom and top offset just provide an object <code>offset: { top: 10 }</code> or <code>offset: { top: 10, bottom: 5 }</code>. Use a function when you need to dynamically calculate an offset.</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 bottom directions. To provide a unique, bottom and top offset just provide an object <code>offset: { top: 10 }</code> or <code>offset: { top: 10, bottom: 5 }</code>. Use a function when you need to dynamically calculate an offset.</td>
</tr>
</tbody>
</table>