diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index baee1afdd9..26375f6cf7 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index a5ebd1144f..08beeb11f4 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -174,7 +174,7 @@
     float: left;
     margin-left: 20px;
   }
-  .container {
+  .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
     width: 724px;
   }
   .span1 {
@@ -607,7 +607,7 @@
     float: left;
     margin-left: 30px;
   }
-  .container {
+  .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
     width: 1170px;
   }
   .span1 {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 45ae99964d..7a91fa5bd5 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -134,7 +134,7 @@ a:hover {
   float: left;
   margin-left: 20px;
 }
-.container {
+.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
   width: 940px;
 }
 .span1 {
@@ -2698,6 +2698,9 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }
+.navbar .container {
+  width: auto;
+}
 .btn-navbar {
   display: none;
   float: right;
diff --git a/docs/components.html b/docs/components.html
index ee0e17b0fa..8b1a67553e 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -873,7 +873,7 @@
   <p>An example of a static (not fixed to the top) navbar with project name, navigation, and search form.</p>
   <div class="navbar">
     <div class="navbar-inner">
-      <div class="container" style="width: auto;">
+      <div class="container">
         <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 431bf164b6..24ff341b6c 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -797,7 +797,7 @@
   <p>{{_i}}An example of a static (not fixed to the top) navbar with project name, navigation, and search form.{{/i}}</p>
   <div class="navbar">
     <div class="navbar-inner">
-      <div class="container" style="width: auto;">
+      <div class="container">
         <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
diff --git a/less/mixins.less b/less/mixins.less
index 4561e98cb2..7b9b298faa 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -173,8 +173,13 @@
       #gridSystem > .gridColumn(@gridGutterWidth);
     }
     
-    // Fixed container
-    .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); }
+    // Fixed containers
+    // Default container and reset for fixed navbars
+    .container,
+    .navbar-fixed-top .container,
+    .navbar-fixed-bottom .container {
+      #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns);
+    }
 
     // Default columns
     .span1     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); }
diff --git a/less/navbar.less b/less/navbar.less
index 90666133f6..1bc6b185b9 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -20,6 +20,12 @@
   .box-shadow(@shadow);
 }
 
+// Set width to auto for default container
+// We then reset it for fixed navbars in the #gridSystem mixin
+.navbar .container {
+  width: auto;
+}
+
 // Navbar button for toggling navbar items in responsive layouts
 .btn-navbar {
   display: none;