diff options
| author | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
| commit | 41f3af407bab6c77f61b1d1fc8d3526f5276076f (patch) | |
| tree | cb9a982f2fc56ec1ce71849d37dc06b47d313cf3 /docs/assets/js/src/application.js | |
| parent | 0e47ce959ce6257c8fdde13b1362dbbe19fb56e3 (diff) | |
| parent | 87c9ce5333139eede2f02d6812c083a86db61cdf (diff) | |
| download | bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.tar.xz bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.zip | |
Merge branch 'derp' into derp_navs
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/assets/js/src/application.js')
| -rw-r--r-- | docs/assets/js/src/application.js | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/docs/assets/js/src/application.js b/docs/assets/js/src/application.js index 69a19707c..c4ae6c9bf 100644 --- a/docs/assets/js/src/application.js +++ b/docs/assets/js/src/application.js @@ -32,32 +32,8 @@ e.preventDefault() }) - // Sidenav affixing - // setTimeout(function () { - // var $sideBar = $('.bs-docs-sidebar') - - // $sideBar.affix({ - // offset: { - // top: function () { - // var offsetTop = $sideBar.offset().top - // var sideBarMargin = parseInt($sideBar.children(0).css('margin-top'), 10) - // var navOuterHeight = $('.bs-docs-nav').height() - - // return (this.top = offsetTop - navOuterHeight - sideBarMargin) - // }, - // bottom: function () { - // return (this.bottom = $('.bs-docs-footer').outerHeight(true)) - // } - // } - // }) - // }, 100) - - // setTimeout(function () { - // $('.bs-top').affix() - // }, 100) - // theme toggler - ;(function () { + (function () { var stylesheetLink = $('#bs-theme-stylesheet') var themeBtn = $('.bs-docs-theme-toggle') @@ -81,7 +57,7 @@ localStorage.removeItem('previewTheme') } }) - })(); + }) // Tooltip and popover demos $('.tooltip-demo').tooltip({ |