aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-25 13:35:49 -0700
committerMark Otto <[email protected]>2013-06-25 13:35:49 -0700
commit211d6831fc8494123216f66aaa287b712e044c76 (patch)
treeb959bb29e5982aab454f6f4ececaea28cc24a302 /docs/javascript.html
parent327a951ca3754285432ae97b6c6be62dcd815905 (diff)
parent6ac063430f9581187a7090f26a3dcd4eca7a4535 (diff)
downloadbootstrap-211d6831fc8494123216f66aaa287b712e044c76.tar.xz
bootstrap-211d6831fc8494123216f66aaa287b712e044c76.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 955ad31f8..9a5a5b6f0 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -64,6 +64,11 @@ $('#myModal').on('show.bs.modal', function (e) {
if (!data) return e.preventDefault() // stops modal from being shown
})
{% endhighlight %}
+
+ <div class="bs-callout" id="callout-third-party-libs">
+ <h4>Third-party libraries</h4>
+ <p><strong>Bootstrap does not officially support third-party JavaScript libraries</strong> like Prototype or jQuery UI. Despite <code>.noConflict</code> and namespaced events, there may be compatibility problems that you need to fix on your own. Ask on the <a href="http://groups.google.com/group/twitter-bootstrap">mailing list</a> if you need help.</p>
+ </div>
</div>