vendor/assets/stylesheets/twitter/bootstrap/_responsive-navbar.sass in sass-rails-bootstrap-2.0.4 vs vendor/assets/stylesheets/twitter/bootstrap/_responsive-navbar.sass in sass-rails-bootstrap-2.1.0
- old
+ new
@@ -1,15 +1,20 @@
+//
+// 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
@@ -57,11 +62,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
@@ -73,10 +78,14 @@
margin-bottom: 2px
.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
@@ -132,15 +141,15 @@
// STATIC NAVBAR
// -------------
.navbar-static .navbar-inner
padding-left: 10px
padding-right: 10px
-
-
+
// DEFAULT DESKTOP
// ---------------
@media (min-width: 980px)
+ // Required to make the collapsing navbar work on regular desktops
.nav-collapse.collapse
height: auto !important
-
+ overflow: visible !important