diff options
| author | Mark Otto <[email protected]> | 2013-06-25 13:35:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-25 13:35:49 -0700 |
| commit | 211d6831fc8494123216f66aaa287b712e044c76 (patch) | |
| tree | b959bb29e5982aab454f6f4ececaea28cc24a302 | |
| parent | 327a951ca3754285432ae97b6c6be62dcd815905 (diff) | |
| parent | 6ac063430f9581187a7090f26a3dcd4eca7a4535 (diff) | |
| download | bootstrap-211d6831fc8494123216f66aaa287b712e044c76.tar.xz bootstrap-211d6831fc8494123216f66aaa287b712e044c76.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | docs/_includes/nav-javascript.html | 2 | ||||
| -rw-r--r-- | docs/getting-started.html | 5 | ||||
| -rw-r--r-- | docs/javascript.html | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/docs/_includes/nav-javascript.html b/docs/_includes/nav-javascript.html index 9422b27fb..13079580b 100644 --- a/docs/_includes/nav-javascript.html +++ b/docs/_includes/nav-javascript.html @@ -2,7 +2,7 @@ <a href="#js-overview">Overview</a> <ul class="nav"> <li><a href="#js-individual-compiled">Individual or compiled</a></li> - <li><a href="#js-data-attributes">Data attributes</a></li> + <li><a href="#js-data-attrs">Data attributes</a></li> <li><a href="#js-programmatic-api">Programmatic API</a></li> <li><a href="#js-noconflict">No Conflict</a></li> <li><a href="#js-events">Events</a></li> diff --git a/docs/getting-started.html b/docs/getting-started.html index 018c8ed0a..718e8ed79 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -48,6 +48,11 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex <!-- Latest compiled and minified JavaScript --> <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script> {% endhighlight %} + + <div class="bs-callout" id="callout-less-compilation"> + <h4>LESS compilation</h4> + <p>If you download the original files, you need to compile Bootstrap's LESS files into usable CSS. To do that, Bootstrap only officially supports <a href="http://twitter.github.io/recess/">Recess</a>, Twitter's CSS hinter built on top of <a href="http://lesscss.org">less.js</a>.</p> + </div> </div> <!-- File structure 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> |