framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Bootstrap 3.0.1

Browse Source
This commit is contained in:
Chris Carr
2013-10-30 14:30:53 -07:00
parent a3f2210e8e
commit 4ce5eb2dc4
52 changed files with 940 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
assets/less/bootstrap/navbar.less
View File

@@ -10,7 +10,6 @@
.navbar {
position: relative;
z-index: @zindex-navbar;
min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: @navbar-margin-bottom;
border: 1px solid transparent;
@@ -75,7 +74,7 @@
}
&.in {
overflow-y: visible;
overflow-y: auto;
}
// Account for first and last children spacing
@@ -111,12 +110,14 @@
//
// Navbar alignment options
//
// Display the navbar across the entirity of the page or fixed it to the top or
// Display the navbar across the entirety of the page or fixed it to the top or
// bottom of the page.
// Static top (unfixed, but 100% wide) navbar
.navbar-static-top {
z-index: @zindex-navbar;
border-width: 0 0 1px;
@media (min-width: @grid-float-breakpoint) {
border-radius: 0;
}
@@ -128,7 +129,7 @@
position: fixed;
right: 0;
left: 0;
border-width: 0 0 1px;
z-index: @zindex-navbar-fixed;
// Undo the rounded corners
@media (min-width: @grid-float-breakpoint) {
@@ -136,12 +137,13 @@
}
}
.navbar-fixed-top {
z-index: @zindex-navbar-fixed;
top: 0;
border-width: 0 0 1px;
}
.navbar-fixed-bottom {
bottom: 0;
margin-bottom: 0; // override .navbar defaults
border-width: 1px 0 0;
}
@@ -152,6 +154,7 @@
padding: @navbar-padding-vertical @navbar-padding-horizontal;
font-size: @font-size-large;
line-height: @line-height-computed;
&:hover,
&:focus {
text-decoration: none;
@@ -254,7 +257,7 @@
// Component alignment
//
// Repurpose the pull utilities as their own navbar utilities to avoid specifity
// Repurpose the pull utilities as their own navbar utilities to avoid specificity
// issues with parents and chaining. Only do this when the navbar is uncollapsed
// though so that navbar contents properly stack and align in mobile.
@@ -408,7 +411,7 @@
.navbar-collapse,
.navbar-form {
border-color: darken(@navbar-default-bg, 7%);
border-color: @navbar-default-border;
}
// Dropdown menu items and carets