From b606d4d11f245644a0ce464e543800ea18882a87 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Mar 2015 20:53:32 -0700 Subject: [PATCH] Move transitions and overview to a javascript page in the getting started section --- .../overview.md => getting-started/javascript.md} | 7 +++++++ docs/javascript/transitions.md | 12 ------------ 2 files changed, 7 insertions(+), 12 deletions(-) rename docs/{javascript/overview.md => getting-started/javascript.md} (92%) delete mode 100644 docs/javascript/transitions.md diff --git a/docs/javascript/overview.md b/docs/getting-started/javascript.md similarity index 92% rename from docs/javascript/overview.md rename to docs/getting-started/javascript.md index 37e73ef258..fe9afce1b2 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

Third-party libraries

Bootstrap does not officially support third-party JavaScript libraries like Prototype or jQuery UI. Despite .noConflict and namespaced events, there may be compatibility problems that you need to fix on your own.

+ +## 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 d8e64534d3..0000000000 --- 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.