diff options
| -rw-r--r-- | docs/assets/css/docs.css | 6 | ||||
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | js/bootstrap-transition.js | 45 |
3 files changed, 52 insertions, 1 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3cf2208e9..8432f92ea 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -318,6 +318,12 @@ h2 + table { width: 290px; } +.scrollspy-example { + height: 200px; + overflow: auto; + position: relative; +} + /* Responsive Docs -------------------------------------------------- */ diff --git a/docs/javascript.html b/docs/javascript.html index 56e60e98c..568991969 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -39,7 +39,7 @@ <script src="assets/js/google-code-prettify/prettify.js"></script> <script>$(function () { prettyPrint() })</script> - <script src="../js/bootstrap-transitions.js"></script> + <script src="../js/bootstrap-transition.js"></script> <script src="../js/bootstrap-alert.js"></script> <script src="../js/bootstrap-modal.js"></script> <script src="../js/bootstrap-dropdown.js"></script> diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js new file mode 100644 index 000000000..25f8b111f --- /dev/null +++ b/js/bootstrap-transition.js @@ -0,0 +1,45 @@ +/* =================================================== + * bootstrap-transitions.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html + * =================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +$(function () { + + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + * ======================================================= */ + + $.support.transition = (function () { + var thisBody = document.body || document.documentElement + , thisStyle = thisBody.style + , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined + + return support && { + end: (function () { + var transitionEnd = "TransitionEnd" + if ( $.browser.webkit ) { + transitionEnd = "webkitTransitionEnd" + } else if ( $.browser.mozilla ) { + transitionEnd = "transitionend" + } else if ( $.browser.opera ) { + transitionEnd = "oTransitionEnd" + } + return transitionEnd + }()) + } + })() + +})
\ No newline at end of file |