diff options
| author | fat <[email protected]> | 2013-05-16 11:08:46 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-05-16 11:08:46 -0700 |
| commit | a4c16155a21c7bcad9b1d52e2141425cdb7df494 (patch) | |
| tree | 490759c71a56d0b54fb46d5ae56851074a31a992 /docs/assets/js | |
| parent | 14651035deda4d02a1ca02c6088c34f770f897f6 (diff) | |
| parent | f3d857773455a940fca0c8d2ef1ca26982700031 (diff) | |
| download | bootstrap-a4c16155a21c7bcad9b1d52e2141425cdb7df494.tar.xz bootstrap-a4c16155a21c7bcad9b1d52e2141425cdb7df494.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
Makefile
docs/_site/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.min.js
docs/customize.html
docs/docs.html
Diffstat (limited to 'docs/assets/js')
| -rw-r--r-- | docs/assets/js/application.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 170a1953d..9467ea84c 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -14,17 +14,17 @@ }) // back to top - // setTimeout(function () { - // $('.bs-docs-sidenav').affix({ - // offset: { - // top: function () { return $window.width() <= 980 ? 290 : 210 } - // , bottom: 270 - // } - // }) - // }, 100) + setTimeout(function () { + $('.bs-sidebar').affix({ + offset: { + top: function () { return $window.width() <= 980 ? 290 : 210 } + , bottom: 270 + } + }) + }, 100) setTimeout(function () { - $('.bs-docs-top').affix() + $('.bs-top').affix() }, 100) // make code pretty |