diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/javascript.html | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 8932ff295..24c1eb79d 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -15,8 +15,13 @@ lead: "Bring Bootstrap's components to life with over a dozen custom jQuery plug <p>Plugins can be included individually (using Bootstrap's individual <code>*.js</code> files), or all at once (using <code>bootstrap.js</code> or the minified <code>bootstrap.min.js</code>).</p> <div class="bs-callout bs-callout-danger"> - <h4>Do not attempt to include both.</h4> - <p>Both <code>bootstrap.js</code> and <code>bootstrap.min.js</code> contain all plugins in a single file.</p> + <h4>Using the compiled JavaScript</h4> + <p>Both <code>bootstrap.js</code> and <code>bootstrap.min.js</code> contain all plugins in a single file. Include only one.</p> + </div> + + <div class="bs-callout bs-callout-danger"> + <h4>Component data attributes</h4> + <p>Don't mix data attributes from separate plugins on the same component. For example, a button cannot have a tooltip and toggle a modal. To accomplish this, use a wrapping element.</p> </div> <div class="bs-callout bs-callout-danger"> |