diff options
author | Mark Otto <markotto@twitter.com> | 2012-06-29 08:20:40 +0400 |
---|---|---|
committer | Mark Otto <markotto@twitter.com> | 2012-06-29 08:20:40 +0400 |
commit | 98ebd548000bc080c6eb152cd2ef005938d2e516 (patch) | |
tree | 8e9e0e26808939e08d133e9c125e1cff98b34e7e /less/navbar.less | |
parent | 6f4360c47b0fa2beaabf4595a58bbb929df7cecc (diff) |
address issues with fixed subnav like borders, corners, etc
Diffstat (limited to 'less/navbar.less')
-rw-r--r-- | less/navbar.less | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/less/navbar.less b/less/navbar.less index c298e7ce11..d99894509c 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -205,7 +205,7 @@ float: none; // Vertically center the text given @navbarHeight @elementHeight: 20px; - padding: ((@navbarHeight - @elementHeight) / 2 - 1) 12px ((@navbarHeight - @elementHeight) / 2 + 1); + padding: ((@navbarHeight - @elementHeight) / 2) 12px ((@navbarHeight - @elementHeight) / 2 + 1); line-height: 19px; color: @navbarLinkColor; text-decoration: none; @@ -379,10 +379,8 @@ // Override the default .navbar .navbar-subnav { - height: 36px; } .navbar-subnav .navbar-inner { - min-height: 36px; padding: 0; #gradient > .vertical(#f9f9f9, #f1f1f1); .box-shadow(none); @@ -398,6 +396,13 @@ color: @linkColorHover; } +// Active nav links +.navbar-subnav .nav > .active > a, +.navbar-subnav .nav > .active > a:hover { + color: #777; + background-color: #e5e5e5; +} + // Dropdown carets .navbar-subnav .nav li.dropdown .dropdown-toggle .caret, .navbar-subnav .nav li.dropdown.open .caret { @@ -410,7 +415,6 @@ color: @linkColorHover; } - // Fixed subnav on scroll, but only for 980px and up (sorry IE!) .navbar-subnav-fixed { position: fixed; @@ -418,15 +422,15 @@ left: 0; right: 0; z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */ - border-color: #d5d5d5; - border-width: 0 0 1px; /* drop the border on the fixed edges */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 10px rgba(0,0,0,.1); -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 10px rgba(0,0,0,.1); box-shadow: inset 0 1px 0 #fff, 0 1px 10px rgba(0,0,0,.1); +} +.navbar-subnav-fixed .navbar-inner { + border-color: #d5d5d5; + border-width: 0 0 1px; /* drop the border on the fixed edges */ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */ + .border-radius(0); } .navbar-subnav-fixed .nav { float: none; |