diff options
| author | Mark Otto <[email protected]> | 2012-12-19 23:39:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-19 23:39:40 -0800 |
| commit | 5d776bcfd2e7da0bcce37252dc983149d8b2d377 (patch) | |
| tree | 0b46eb3b33008f4d4b4ea3bd73ce82ed77218d7d /docs/assets/js/application.js | |
| parent | dc6142751feced6761f67503323c0c6e62844d4e (diff) | |
| parent | bbe4625672c5122bb2b06c495f9ea41752c10467 (diff) | |
| download | bootstrap-5d776bcfd2e7da0bcce37252dc983149d8b2d377.tar.xz bootstrap-5d776bcfd2e7da0bcce37252dc983149d8b2d377.zip | |
Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3
Diffstat (limited to 'docs/assets/js/application.js')
| -rw-r--r-- | docs/assets/js/application.js | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index f6c7849c3..ba7767300 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -14,12 +14,14 @@ }) // side bar - $('.bs-docs-sidenav').affix({ - offset: { - top: function () { return $window.width() <= 980 ? 290 : 210 } - , bottom: 270 - } - }) + setTimeout(function () { + $('.bs-docs-sidenav').affix({ + offset: { + top: function () { return $window.width() <= 980 ? 290 : 210 } + , bottom: 270 + } + }) + }, 100) // make code pretty window.prettyPrint && prettyPrint() @@ -34,7 +36,7 @@ // add tipsies to grid for scaffolding if ($('#gridSystem').length) { $('#gridSystem').tooltip({ - selector: '.show-grid > div' + selector: '.show-grid > div:not(.tooltip)' , title: function () { return $(this).width() + 'px' } }) } |