diff options
| author | Mark Otto <[email protected]> | 2015-03-30 20:53:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-03-30 20:53:32 -0700 |
| commit | b606d4d11f245644a0ce464e543800ea18882a87 (patch) | |
| tree | 355b0eb4c7efcbd701ab22a299cdb3a820d75409 /docs | |
| parent | fad885fd8af42ea77775fce3955f6e6e1fb5ac04 (diff) | |
| download | bootstrap-b606d4d11f245644a0ce464e543800ea18882a87.tar.xz bootstrap-b606d4d11f245644a0ce464e543800ea18882a87.zip | |
Move transitions and overview to a javascript page in the getting started section
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/getting-started/javascript.md (renamed from docs/javascript/overview.md) | 7 | ||||
| -rw-r--r-- | docs/javascript/transitions.md | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/docs/javascript/overview.md b/docs/getting-started/javascript.md index 37e73ef25..fe9afce1b 100644 --- a/docs/javascript/overview.md +++ b/docs/getting-started/javascript.md @@ -91,3 +91,10 @@ Bootstrap's plugins don't fall back particularly gracefully when JavaScript is d <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.</p> </div> + +## Transitions + +For simple transition effects, include `transition.js` once alongside the other JS files. If you're using the compiled (or minified) `bootstrap.js`, there is no need to include this—it's already there. + +Transition.js is a basic helper for `transitionEnd` events as well as a CSS transition emulator. It's used by the other plugins to check for CSS transition support and to catch hanging transitions. + diff --git a/docs/javascript/transitions.md b/docs/javascript/transitions.md deleted file mode 100644 index d8e64534d..000000000 --- a/docs/javascript/transitions.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -layout: page -title: Transitions ---- - -### About transitions - -For simple transition effects, include `transition.js` once alongside the other JS files. If you're using the compiled (or minified) `bootstrap.js`, there is no need to include this—it's already there. - -### What's inside - -Transition.js is a basic helper for `transitionEnd` events as well as a CSS transition emulator. It's used by the other plugins to check for CSS transition support and to catch hanging transitions. |