vendor/twitter/bootstrap/less/responsive-navbar.less in bootstrap-generators-2.0.4 vs vendor/twitter/bootstrap/less/responsive-navbar.less in bootstrap-generators-2.1.1

- old
+ new

@@ -1,16 +1,21 @@ +// +// Responsive: Navbar +// -------------------------------------------------- + + // TABLETS AND BELOW // ----------------- -@media (max-width: 979px) { +@media (max-width: @navbarCollapseWidth) { // UNFIX THE TOPBAR // ---------------- // Remove any padding from the body body { padding-top: 0; } - // Unfix the navbar + // Unfix the navbars .navbar-fixed-top, .navbar-fixed-bottom { position: static; } .navbar-fixed-top { @@ -59,11 +64,11 @@ text-shadow: none; } // Nav and dropdown links in navbar .nav-collapse .nav > li > a, .nav-collapse .dropdown-menu a { - padding: 6px 15px; + padding: 9px 15px; font-weight: bold; color: @navbarLinkColor; .border-radius(3px); } // Buttons @@ -77,10 +82,14 @@ } .nav-collapse .nav > li > a:hover, .nav-collapse .dropdown-menu a:hover { background-color: @navbarBackground; } + .navbar-inverse .nav-collapse .nav > li > a:hover, + .navbar-inverse .nav-collapse .dropdown-menu a:hover { + background-color: @navbarInverseBackground; + } // Buttons in the navbar .nav-collapse.in .btn-group { margin-top: 5px; padding: 0; } @@ -104,20 +113,31 @@ display: none; } .nav-collapse .dropdown-menu .divider { display: none; } + .nav-collapse .nav > li > .dropdown-menu { + &:before, + &:after { + display: none; + } + } // Forms in navbar .nav-collapse .navbar-form, .nav-collapse .navbar-search { float: none; padding: (@baseLineHeight / 2) 15px; margin: (@baseLineHeight / 2) 0; border-top: 1px solid @navbarBackground; border-bottom: 1px solid @navbarBackground; - .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)"); + .box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)); } + .navbar-inverse .nav-collapse .navbar-form, + .navbar-inverse .nav-collapse .navbar-search { + border-top-color: @navbarInverseBackground; + border-bottom-color: @navbarInverseBackground; + } // Pull right (secondary) nav content .navbar .nav-collapse .nav.pull-right { float: none; margin-left: 0; } @@ -136,18 +156,22 @@ // ------------- .navbar-static .navbar-inner { padding-left: 10px; padding-right: 10px; } + + } // DEFAULT DESKTOP // --------------- -// Required to make the collapsing navbar work on regular desktops @media (min-width: 980px) { + + // Required to make the collapsing navbar work on regular desktops .nav-collapse.collapse { height: auto !important; overflow: visible !important; } -} \ No newline at end of file + +}