From fbebb046f7134eaed90492bfc67720337c4b625e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 27 Feb 2012 22:34:25 -0800
Subject: fix navbar container for default 940px grid per #2194

---
 less/mixins.less | 2 +-
 less/navbar.less | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'less')

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;
-- 
cgit v1.2.3