Commit bae3cfd1 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

parents 3add79c0 36e78bd7
8 merge requests!4427Use variable for desktop media query,!4258Aria,!4248Amended mentions of 'javascript' to the correct 'JavaScript',!4235Patch 1,!4232Fixing the modal z-index issue + make modal stacking possible,!42132.1.0 wip,!4165Patch 2,!39192.1.0 wip
Showing with 2 additions and 2 deletions
+2 -2
......@@ -14,7 +14,7 @@
margin-bottom: @baseLineHeight;
}
// Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
.navbar-inner {
min-height: @navbarHeight;
padding-left: 20px;
......@@ -358,4 +358,4 @@
left: auto;
right: 13px;
}
}
\ No newline at end of file
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment