Refs #526 - Update to Bootstrap 2.1

This commit is contained in:
Ben Word
2012-08-20 19:51:11 -05:00
parent 27efb74b44
commit dc386dd611
44 changed files with 1450 additions and 753 deletions

View File

@@ -1,6 +1,11 @@
//
// Responsive: Navbar
// --------------------------------------------------
// TABLETS AND BELOW
// -----------------
@media (max-width: 979px) {
@media (max-width: @navbarCollapseWidth) {
// UNFIX THE TOPBAR
// ----------------
@@ -8,7 +13,7 @@
body {
padding-top: 0;
}
// Unfix the navbar
// Unfix the navbars
.navbar-fixed-top,
.navbar-fixed-bottom {
position: static;
@@ -61,7 +66,7 @@
// 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);
@@ -79,6 +84,10 @@
.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;
@@ -138,16 +147,20 @@
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;
}
}
}