mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-07 00:32:47 +01:00
Code Issues Releases Wiki Activity

make fixing of subnav work again

Browse Source
This commit is contained in:
Mark Otto 2012-06-24 21:07:20 -07:00
parent 6662f62236
commit 508a93d9e3
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/assets/css/bootstrap-responsive.css vendored
View File

@ -1004,7 +1004,7 @@
height: auto !important; height: auto !important;
overflow: visible !important; overflow: visible !important;
} }
.subnav-fixed { .navbar-subnav-fixed {
position: fixed; position: fixed;
top: 40px; top: 40px;
right: 0; right: 0;
@ -1020,13 +1020,14 @@
-moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1); -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); box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
} }
.subnav-fixed .nav { .navbar-subnav-fixed .nav {
max-width: 780px; float: none;
max-width: 970px;
padding: 0 1px; padding: 0 1px;
margin: 0 auto; margin: 0 auto;
} }
.subnav .nav > li:first-child > a, .navbar-subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover { .navbar-subnav .nav > li:first-child > a:hover {
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;

8
docs/assets/js/application.js
View File

@ -45,8 +45,8 @@
// fix sub nav on scroll // fix sub nav on scroll
var $win = $(window) var $win = $(window)
, $nav = $('.subnav') , $nav = $('.navbar-subnav')
, navTop = $('.subnav').length && $('.subnav').offset().top - 40 , navTop = $('.navbar-subnav').length && $('.navbar-subnav').offset().top - 40
, isFixed = 0 , isFixed = 0
processScroll() processScroll()
@ -62,10 +62,10 @@
var i, scrollTop = $win.scrollTop() var i, scrollTop = $win.scrollTop()
if (scrollTop >= navTop && !isFixed) { if (scrollTop >= navTop && !isFixed) {
isFixed = 1 isFixed = 1
$nav.addClass('subnav-fixed') $nav.addClass('navbar-subnav-fixed')
} else if (scrollTop <= navTop && isFixed) { } else if (scrollTop <= navTop && isFixed) {
isFixed = 0 isFixed = 0
$nav.removeClass('subnav-fixed') $nav.removeClass('navbar-subnav-fixed')
} }
} }

11
less/responsive-navbar.less
View File

@ -153,7 +153,7 @@
} }
// Fixed subnav on scroll, but only for 980px and up (sorry IE!) // Fixed subnav on scroll, but only for 980px and up (sorry IE!)
.subnav-fixed { .navbar-subnav-fixed {
position: fixed; position: fixed;
top: 40px; top: 40px;
left: 0; left: 0;
@ -169,13 +169,14 @@
box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
} }
.subnav-fixed .nav { .navbar-subnav-fixed .nav {
max-width: 780px; float: none;
max-width: 970px;
margin: 0 auto; margin: 0 auto;
padding: 0 1px; padding: 0 1px;
} }
.subnav .nav > li:first-child > a, .navbar-subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover { .navbar-subnav .nav > li:first-child > a:hover {
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;