diff options
| author | Mark Otto <[email protected]> | 2011-12-19 22:59:20 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-12-19 22:59:20 -0800 |
| commit | 069ef6a020dc177bbf4e18a9b425af36b3395ecf (patch) | |
| tree | 84b32b7ad767b629095aeb027e64933ae3df6962 /docs | |
| parent | 72a536393c2f2aba4f855384e94c4ce09bc2e39c (diff) | |
| parent | 7df0d1c7d18a72f401094d08afa4eaa9142fe511 (diff) | |
| download | bootstrap-069ef6a020dc177bbf4e18a9b425af36b3395ecf.tar.xz bootstrap-069ef6a020dc177bbf4e18a9b425af36b3395ecf.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/docs.css | 6 | ||||
| -rw-r--r-- | docs/javascript.html | 2 |
2 files changed, 7 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> |