diff options
| author | Mark Otto <markotto@twitter.com> | 2012-06-25 08:07:20 +0400 |
|---|---|---|
| committer | Mark Otto <markotto@twitter.com> | 2012-06-25 08:07:20 +0400 |
| commit | 508a93d9e307457426f2aa2fcfa740858ebd851a (patch) | |
| tree | 870b10f64d5e69c9d276f5183086b9af6ba50a0d /docs | |
| parent | 6662f62236cd1800952fb45a528b79d9a899f5d5 (diff) | |
make fixing of subnav work again
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 11 | ||||
| -rw-r--r-- | docs/assets/js/application.js | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index ec23b0fe01..a8bf03d725 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1004,7 +1004,7 @@ height: auto !important; overflow: visible !important; } - .subnav-fixed { + .navbar-subnav-fixed { position: fixed; top: 40px; right: 0; @@ -1020,13 +1020,14 @@ -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); } - .subnav-fixed .nav { - max-width: 780px; + .navbar-subnav-fixed .nav { + float: none; + max-width: 970px; padding: 0 1px; margin: 0 auto; } - .subnav .nav > li:first-child > a, - .subnav .nav > li:first-child > a:hover { + .navbar-subnav .nav > li:first-child > a, + .navbar-subnav .nav > li:first-child > a:hover { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index f38ee4956b..b2499b6b09 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -45,8 +45,8 @@ // fix sub nav on scroll var $win = $(window) - , $nav = $('.subnav') - , navTop = $('.subnav').length && $('.subnav').offset().top - 40 + , $nav = $('.navbar-subnav') + , navTop = $('.navbar-subnav').length && $('.navbar-subnav').offset().top - 40 , isFixed = 0 processScroll() @@ -62,10 +62,10 @@ var i, scrollTop = $win.scrollTop() if (scrollTop >= navTop && !isFixed) { isFixed = 1 - $nav.addClass('subnav-fixed') + $nav.addClass('navbar-subnav-fixed') } else if (scrollTop <= navTop && isFixed) { isFixed = 0 - $nav.removeClass('subnav-fixed') + $nav.removeClass('navbar-subnav-fixed') } } |