aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-27 22:34:25 -0800
committerMark Otto <[email protected]>2012-02-27 22:34:25 -0800
commitfbebb046f7134eaed90492bfc67720337c4b625e (patch)
tree11efa415bd82fdaeeabc93f0569dfd0fef91be56 /less
parent6c9547f4115dd0e5851c7cc093bd0a7e75aad89f (diff)
downloadbootstrap-fbebb046f7134eaed90492bfc67720337c4b625e.tar.xz
bootstrap-fbebb046f7134eaed90492bfc67720337c4b625e.zip
fix navbar container for default 940px grid per #2194
Diffstat (limited to 'less')
-rw-r--r--less/mixins.less2
-rw-r--r--less/navbar.less5
2 files changed, 6 insertions, 1 deletions
diff --git a/less/mixins.less b/less/mixins.less
index 6b85be96f..fccd7e349 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -502,7 +502,7 @@
margin-left: @gridGutterWidth;
}
- // Set the container width, and reset it for fixed navbars
+ // Set the container width, and override it for fixed navbars in media queries
.container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container { .span(12); }
diff --git a/less/navbar.less b/less/navbar.less
index 1bc6b185b..6ecb74328 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -179,6 +179,11 @@
.border-radius(0);
}
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+ #grid > .core > .span(@gridColumns);
+}
+
// Fixed to top
.navbar-fixed-top {
top: 0;