diff options
author | Mark Otto <markotto@twitter.com> | 2012-06-29 07:59:16 +0400 |
---|---|---|
committer | Mark Otto <markotto@twitter.com> | 2012-06-29 07:59:16 +0400 |
commit | c31a4e51316eb8767baebe9d8e370c782f15ea38 (patch) | |
tree | 01ce304b7bb096b6fb4bc8ec15b3bcfbec6e0894 /less | |
parent | c09e8473e2be483d3f53186840c002167647c44b (diff) |
remove responsive subnav from docs and place in navbar-responsive.less
Diffstat (limited to 'less')
-rw-r--r-- | less/navbar.less | 39 | ||||
-rw-r--r-- | less/responsive-navbar.less | 73 |
2 files changed, 79 insertions, 33 deletions
diff --git a/less/navbar.less b/less/navbar.less index 3305f722a1..c298e7ce11 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -168,11 +168,17 @@ // Fixed to top .navbar-fixed-top { top: 0; + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); } // Fixed to bottom .navbar-fixed-bottom { bottom: 0; + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); } @@ -378,7 +384,7 @@ .navbar-subnav .navbar-inner { min-height: 36px; padding: 0; - #gradient > .vertical(#f9f9f9, #eeeeee); + #gradient > .vertical(#f9f9f9, #f1f1f1); .box-shadow(none); border: 1px solid #e5e5e5; } @@ -405,3 +411,34 @@ } +// Fixed subnav on scroll, but only for 980px and up (sorry IE!) +.navbar-subnav-fixed { + position: fixed; + top: 40px; + 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); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */ +} +.navbar-subnav-fixed .nav { + float: none; + max-width: 970px; + margin: 0 auto; + padding: 0 1px; +} +.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/less/responsive-navbar.less b/less/responsive-navbar.less index 480939f7cf..5a66a05592 100644 --- a/less/responsive-navbar.less +++ b/less/responsive-navbar.less @@ -8,9 +8,10 @@ body { padding-top: 0; } - // Unfix the navbar + // Unfix the navbars .navbar-fixed-top, - .navbar-fixed-bottom { + .navbar-fixed-bottom, + .navbar-subnav-fixed { position: static; } .navbar-fixed-top { @@ -138,6 +139,44 @@ padding-left: 10px; padding-right: 10px; } + + // STATIC SUBNAV + // ------------- + .navbar-subnav { + width: auto; + height: auto; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .navbar-subnav .navbar-inner { + background-color: #fff; + background-image: none; // Remove gradient + } + .navbar-subnav .nav { + float: none; + margin-right: 0; + } + .navbar-subnav .nav > li { + float: none; + } + .navbar-subnav .nav > li > a { + border: 0; + } + .navbar-subnav .nav > li > a:hover { + background-color: #f5f5f5; + } + .navbar-subnav .nav > li + li > a { + border-top: 1px solid #e5e5e5; + } + .navbar-subnav .nav > li:first-child > a, + .navbar-subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; + } + + } @@ -152,34 +191,4 @@ overflow: visible !important; } - // Fixed subnav on scroll, but only for 980px and up (sorry IE!) - .navbar-subnav-fixed { - position: fixed; - top: 40px; - 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 5px rgba(0,0,0,.1); - -moz-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 */ - } - .navbar-subnav-fixed .nav { - float: none; - max-width: 970px; - margin: 0 auto; - padding: 0 1px; - } - .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; - } - } |