vendor/frameworks/twitter/bootstrap/navbar.scss in anjlab-bootstrap-rails-2.1.0.5 vs vendor/frameworks/twitter/bootstrap/navbar.scss in anjlab-bootstrap-rails-2.1.1.0

- old
+ new

@@ -25,10 +25,13 @@ padding-right: 20px; @include gradient-vertical($navbarBackgroundHighlight, $navbarBackground); border: 1px solid $navbarBorder; @include border-radius(4px); @include box-shadow(0 1px 4px rgba(0,0,0,.065)); + + // Prevent floats from breaking the navbar + @include clearfix(); } // Set width to auto for default container // We then reset it for fixed navbars in the #gridSystem mixin .navbar .container { @@ -85,17 +88,20 @@ // Buttons in navbar // ------------------------- .navbar .btn, .navbar .btn-group { - @include navbar-vertical-align(28px); // Vertically center in navbar + @include navbar-vertical-align(30px); // Vertically center in navbar } -.navbar .btn-group .btn { - margin: 0; // then undo the margin here so we don't accidentally double it +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn { + margin-top: 0; // then undo the margin here so we don't accidentally double it } // Navbar forms +// ------------------------- .navbar-form { margin-bottom: 0; // remove default bottom margin @include clearfix(); input, select, @@ -123,10 +129,11 @@ } } } // Navbar search +// ------------------------- .navbar-search { position: relative; float: left; @include navbar-vertical-align(30px); // Vertically center in navbar margin-bottom: 0; @@ -164,17 +171,17 @@ right: 0; left: 0; z-index: $zindexFixedNavbar; margin-bottom: 0; // remove 18px margin for default navbar } -.navbar-fixed-top, -.navbar-fixed-bottom, -.navbar-static-top { - .navbar-inner { - border: 0; - } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; } +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} .navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @include border-radius(0); @@ -219,10 +226,11 @@ float: left; margin: 0 10px 0 0; } .navbar .nav.pull-right { float: right; // redeclare due to specificity + margin-right: 0; // remove margin on float right nav } .navbar .nav > li { float: left; } @@ -252,12 +260,10 @@ .navbar .nav > .active > a:hover, .navbar .nav > .active > a:focus { color: $navbarLinkColorActive; text-decoration: none; background-color: $navbarLinkBackgroundActive; - -webkit-box-shadow: inset 0 3px 8px rgba(0,0,0,.125); - -moz-box-shadow: inset 0 3px 8px rgba(0,0,0,.125); - box-shadow: inset 0 3px 8px rgba(0,0,0,.125); + @include box-shadow(inset 0 3px 8px rgba(0,0,0,.125)); } // Navbar button for toggling navbar items in responsive layouts // These definitions need to come after '.navbar .btn' .navbar .btn-navbar {