diff options
| author | Mark Otto <[email protected]> | 2014-05-22 23:01:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-22 23:01:42 -0700 |
| commit | d66b65ddde1b2f1a5cb14f601d30c552c79d7626 (patch) | |
| tree | d7f07c493e959cebd256939bf28bcbf4af468a28 /docs/_includes/js | |
| parent | 91d51d3fba1cc2f80138bb2858ce67c28c9c8a89 (diff) | |
| parent | 10e9fef85c6afde2b3804df928d9351b0f110a6c (diff) | |
| download | bootstrap-d66b65ddde1b2f1a5cb14f601d30c552c79d7626.tar.xz bootstrap-d66b65ddde1b2f1a5cb14f601d30c552c79d7626.zip | |
Merge branch 'master' into icon_paths
Conflicts:
dist/css/bootstrap.css.map
docs/dist/css/bootstrap.css.map
Diffstat (limited to 'docs/_includes/js')
| -rw-r--r-- | docs/_includes/js/affix.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/js/affix.html b/docs/_includes/js/affix.html index 5b6fec0bb..4ce51cb34 100644 --- a/docs/_includes/js/affix.html +++ b/docs/_includes/js/affix.html @@ -7,7 +7,7 @@ <hr class="bs-docs-separator"> <h2 id="affix-usage">Usage</h2> - <p>Use the affix plugin via data attributes or manually with your own JavaScript. <strong>In both situations, you must provide CSS for the positioning of your content.</strong></p> + <p>Use the affix plugin via data attributes or manually with your own JavaScript. <strong class="text-danger">In both situations, you must provide CSS for the positioning and width of your affixed content.</strong></p> <h3>Positioning via CSS</h3> <p>The affix plugin toggles between three classes, each representing a particular state: <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) to handle the actual positions.</p> |