aboutsummaryrefslogtreecommitdiff
path: root/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-09-02 00:10:35 +0200
committerMark Otto <[email protected]>2013-09-02 00:10:35 +0200
commit079fa16b9f067ea16995602d1da6f421ca31a191 (patch)
tree5477a7cc2d4a43d8b64d79b3552227b695e0fcf1 /javascript.html
parent14b3a3542f15051e1274ff27cf9c0cf453b93243 (diff)
parentf69da1c2ef2717d791fbcdafae78c37b813a6e0c (diff)
downloadbootstrap-079fa16b9f067ea16995602d1da6f421ca31a191.tar.xz
bootstrap-079fa16b9f067ea16995602d1da6f421ca31a191.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'javascript.html')
-rw-r--r--javascript.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/javascript.html b/javascript.html
index 6aca121e4..496480085 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1899,8 +1899,8 @@ $('#myCarousel').on('slide.bs.carousel', function () {
<div class="bs-callout bs-callout-warning">
<h4>Requires independent styling ;)</h4>
<p>
- Affix toggles between three states/classes: <code>affix</code>, <code>affix-top</code>, and <code>affix-bottom</code>. You must provide the styles for these classes yourself (independent of this plugin).
- The <code>affix-top</code> class should be in the regular flow of the document. The <code>affix</code> class should be fixed to the page. And <code>affix-bottom</code> should be positioned absolute. Note, <code>affix-bottom</code> is special in that the plugin will place the element with JS relative to the <code>offset: { bottom: number }</code> option you've provided.
+ Affix toggles between three states/classes: <code>.affix</code>, <code>.affix-top</code>, and <code>.affix-bottom</code>. You must provide the styles for these classes yourself (independent of this plugin).
+ The <code>.affix-top</code> class should be in the regular flow of the document. The <code>.affix</code> class should be <code>position: fixed</code>. And <code>.affix-bottom</code> should be <code>position: absolute</code>. Note: <code>.affix-bottom</code> is special in that the plugin will place the element with JS relative to the <code>offset: { bottom: number }</code> option you've provided.
</p>
</div>