aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-28 23:40:52 -0800
committerMark Otto <[email protected]>2012-01-28 23:40:52 -0800
commitbca269299b242c55a2511e752429c07d7639f7d2 (patch)
treef5932ba1ba7bca96eda158374985a52b6bae57d6 /less
parent62f4a1571a3801c867b80c228464cc9c695f1d13 (diff)
downloadbootstrap-bca269299b242c55a2511e752429c07d7639f7d2.tar.xz
bootstrap-bca269299b242c55a2511e752429c07d7639f7d2.zip
removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section
Diffstat (limited to 'less')
-rw-r--r--less/navbar.less28
1 files changed, 13 insertions, 15 deletions
diff --git a/less/navbar.less b/less/navbar.less
index 404782e61..25ca7b4e2 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -7,11 +7,15 @@
.navbar {
overflow: visible;
+ 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 it's own element because overflow visible is not honored by IE when filter is present
.navbar-inner {
- background-color: @navbarBackground;
+ padding-left: 20px;
+ padding-right: 20px;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
+ .border-radius(4px);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
.box-shadow(@shadow);
}
@@ -142,20 +146,9 @@
}
-// STATIC OR FIXED?
-// ----------------
-
-// Static navbar
-.navbar-static {
- margin-bottom: @baseLineHeight;
-}
-.navbar-static .navbar-inner {
- padding-left: 20px;
- padding-right: 20px;
- .border-radius(4px);
-}
+// FIXED NAVBAR
+// ------------
-// Fixed navbar
.navbar-fixed-top {
position: fixed;
top: 0;
@@ -163,6 +156,11 @@
left: 0;
z-index: @zindexFixedNavbar;
}
+.navbar-fixed-top .navbar-inner {
+ padding-left: 0;
+ padding-right: 0;
+ .border-radius(0);
+}
// NAVIGATION