diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2a5e598c17..99505e7976 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 7b7a810d9b..447a865c8e 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 {
@@ -303,40 +303,43 @@
   .row-fluid > .span12 {
     width: 99.999999993%;
   }
-  input.span1, textarea.span1, .uneditable-input.span1 {
+  input, textarea, .uneditable-input {
+    margin-left: 0;
+  }
+  input > .span1, textarea > .span1, .uneditable-input > .span1 {
     width: 32px;
   }
-  input.span2, textarea.span2, .uneditable-input.span2 {
+  input > .span2, textarea > .span2, .uneditable-input > .span2 {
     width: 94px;
   }
-  input.span3, textarea.span3, .uneditable-input.span3 {
+  input > .span3, textarea > .span3, .uneditable-input > .span3 {
     width: 156px;
   }
-  input.span4, textarea.span4, .uneditable-input.span4 {
+  input > .span4, textarea > .span4, .uneditable-input > .span4 {
     width: 218px;
   }
-  input.span5, textarea.span5, .uneditable-input.span5 {
+  input > .span5, textarea > .span5, .uneditable-input > .span5 {
     width: 280px;
   }
-  input.span6, textarea.span6, .uneditable-input.span6 {
+  input > .span6, textarea > .span6, .uneditable-input > .span6 {
     width: 342px;
   }
-  input.span7, textarea.span7, .uneditable-input.span7 {
+  input > .span7, textarea > .span7, .uneditable-input > .span7 {
     width: 404px;
   }
-  input.span8, textarea.span8, .uneditable-input.span8 {
+  input > .span8, textarea > .span8, .uneditable-input > .span8 {
     width: 466px;
   }
-  input.span9, textarea.span9, .uneditable-input.span9 {
+  input > .span9, textarea > .span9, .uneditable-input > .span9 {
     width: 528px;
   }
-  input.span10, textarea.span10, .uneditable-input.span10 {
+  input > .span10, textarea > .span10, .uneditable-input > .span10 {
     width: 590px;
   }
-  input.span11, textarea.span11, .uneditable-input.span11 {
+  input > .span11, textarea > .span11, .uneditable-input > .span11 {
     width: 652px;
   }
-  input.span12, textarea.span12, .uneditable-input.span12 {
+  input > .span12, textarea > .span12, .uneditable-input > .span12 {
     width: 714px;
   }
 }
@@ -466,7 +469,7 @@
     float: left;
     margin-left: 30px;
   }
-  .container {
+  .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
     width: 1170px;
   }
   .span1 {
@@ -595,40 +598,43 @@
   .row-fluid > .span12 {
     width: 100%;
   }
-  input.span1, textarea.span1, .uneditable-input.span1 {
+  input, textarea, .uneditable-input {
+    margin-left: 0;
+  }
+  input > .span1, textarea > .span1, .uneditable-input > .span1 {
     width: 60px;
   }
-  input.span2, textarea.span2, .uneditable-input.span2 {
+  input > .span2, textarea > .span2, .uneditable-input > .span2 {
     width: 160px;
   }
-  input.span3, textarea.span3, .uneditable-input.span3 {
+  input > .span3, textarea > .span3, .uneditable-input > .span3 {
     width: 260px;
   }
-  input.span4, textarea.span4, .uneditable-input.span4 {
+  input > .span4, textarea > .span4, .uneditable-input > .span4 {
     width: 360px;
   }
-  input.span5, textarea.span5, .uneditable-input.span5 {
+  input > .span5, textarea > .span5, .uneditable-input > .span5 {
     width: 460px;
   }
-  input.span6, textarea.span6, .uneditable-input.span6 {
+  input > .span6, textarea > .span6, .uneditable-input > .span6 {
     width: 560px;
   }
-  input.span7, textarea.span7, .uneditable-input.span7 {
+  input > .span7, textarea > .span7, .uneditable-input > .span7 {
     width: 660px;
   }
-  input.span8, textarea.span8, .uneditable-input.span8 {
+  input > .span8, textarea > .span8, .uneditable-input > .span8 {
     width: 760px;
   }
-  input.span9, textarea.span9, .uneditable-input.span9 {
+  input > .span9, textarea > .span9, .uneditable-input > .span9 {
     width: 860px;
   }
-  input.span10, textarea.span10, .uneditable-input.span10 {
+  input > .span10, textarea > .span10, .uneditable-input > .span10 {
     width: 960px;
   }
-  input.span11, textarea.span11, .uneditable-input.span11 {
+  input > .span11, textarea > .span11, .uneditable-input > .span11 {
     width: 1060px;
   }
-  input.span12, textarea.span12, .uneditable-input.span12 {
+  input > .span12, textarea > .span12, .uneditable-input > .span12 {
     width: 1160px;
   }
   .thumbnails {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d07c7a182e..36f3fde55c 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 {
@@ -726,40 +726,43 @@ textarea[class*="span"],
   float: none;
   margin-left: 0;
 }
-input.span1, textarea.span1, .uneditable-input.span1 {
+input, textarea, .uneditable-input {
+  margin-left: 0;
+}
+input > .span1, textarea > .span1, .uneditable-input > .span1 {
   width: 50px;
 }
-input.span2, textarea.span2, .uneditable-input.span2 {
+input > .span2, textarea > .span2, .uneditable-input > .span2 {
   width: 130px;
 }
-input.span3, textarea.span3, .uneditable-input.span3 {
+input > .span3, textarea > .span3, .uneditable-input > .span3 {
   width: 210px;
 }
-input.span4, textarea.span4, .uneditable-input.span4 {
+input > .span4, textarea > .span4, .uneditable-input > .span4 {
   width: 290px;
 }
-input.span5, textarea.span5, .uneditable-input.span5 {
+input > .span5, textarea > .span5, .uneditable-input > .span5 {
   width: 370px;
 }
-input.span6, textarea.span6, .uneditable-input.span6 {
+input > .span6, textarea > .span6, .uneditable-input > .span6 {
   width: 450px;
 }
-input.span7, textarea.span7, .uneditable-input.span7 {
+input > .span7, textarea > .span7, .uneditable-input > .span7 {
   width: 530px;
 }
-input.span8, textarea.span8, .uneditable-input.span8 {
+input > .span8, textarea > .span8, .uneditable-input > .span8 {
   width: 610px;
 }
-input.span9, textarea.span9, .uneditable-input.span9 {
+input > .span9, textarea > .span9, .uneditable-input > .span9 {
   width: 690px;
 }
-input.span10, textarea.span10, .uneditable-input.span10 {
+input > .span10, textarea > .span10, .uneditable-input > .span10 {
   width: 770px;
 }
-input.span11, textarea.span11, .uneditable-input.span11 {
+input > .span11, textarea > .span11, .uneditable-input > .span11 {
   width: 850px;
 }
-input.span12, textarea.span12, .uneditable-input.span12 {
+input > .span12, textarea > .span12, .uneditable-input > .span12 {
   width: 930px;
 }
 input[disabled],
diff --git a/less/mixins.less b/less/mixins.less
index 2cd9167071..6b85be96fb 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -502,33 +502,36 @@
       margin-left: @gridGutterWidth;
     }
 
-    .container { .span(12); }
+    // Set the container width, and reset it for fixed navbars
+    .container,
+    .navbar-fixed-top .container,
+    .navbar-fixed-bottom .container { .span(12); }
 
-    .span1 { .span(1) }
-    .span2 { .span(2) }
-    .span3 { .span(3) }
-    .span4 { .span(4) }
-    .span5 { .span(5) }
-    .span6 { .span(6) }
-    .span7 { .span(7) }
-    .span8 { .span(8) }
-    .span9 { .span(9) }
-    .span10 { .span(10) }
-    .span11 { .span(11) }
-    .span12 { .span(12) }
+    .span1 { .span(1); }
+    .span2 { .span(2); }
+    .span3 { .span(3); }
+    .span4 { .span(4); }
+    .span5 { .span(5); }
+    .span6 { .span(6); }
+    .span7 { .span(7); }
+    .span8 { .span(8); }
+    .span9 { .span(9); }
+    .span10 { .span(10); }
+    .span11 { .span(11); }
+    .span12 { .span(12); }
 
-    .offset1 { .offset(1) }
-    .offset2 { .offset(2) }
-    .offset3 { .offset(3) }
-    .offset4 { .offset(4) }
-    .offset5 { .offset(5) }
-    .offset6 { .offset(6) }
-    .offset7 { .offset(7) }
-    .offset8 { .offset(8) }
-    .offset9 { .offset(9) }
-    .offset10 { .offset(10) }
-    .offset11 { .offset(11) }
-    .offset12 { .offset(12) }
+    .offset1 { .offset(1); }
+    .offset2 { .offset(2); }
+    .offset3 { .offset(3); }
+    .offset4 { .offset(4); }
+    .offset5 { .offset(5); }
+    .offset6 { .offset(6); }
+    .offset7 { .offset(7); }
+    .offset8 { .offset(8); }
+    .offset9 { .offset(9); }
+    .offset10 { .offset(10); }
+    .offset11 { .offset(11); }
+    .offset12 { .offset(12); }
 
   }
 
@@ -548,18 +551,18 @@
       > [class*="span"]:first-child {
         margin-left: 0;
       }
-      > .span1 { .span(1) }
-      > .span2 { .span(2) }
-      > .span3 { .span(3) }
-      > .span4 { .span(4) }
-      > .span5 { .span(5) }
-      > .span6 { .span(6) }
-      > .span7 { .span(7) }
-      > .span8 { .span(8) }
-      > .span9 { .span(9) }
-      > .span10 { .span(10) }
-      > .span11 { .span(11) }
-      > .span12 { .span(12) }
+      > .span1 { .span(1); }
+      > .span2 { .span(2); }
+      > .span3 { .span(3); }
+      > .span4 { .span(4); }
+      > .span5 { .span(5); }
+      > .span6 { .span(6); }
+      > .span7 { .span(7); }
+      > .span8 { .span(8); }
+      > .span9 { .span(9); }
+      > .span10 { .span(10); }
+      > .span11 { .span(11); }
+      > .span12 { .span(12); }
     }
 
   }
@@ -573,18 +576,19 @@
     input,
     textarea,
     .uneditable-input {
-      &.span1 { .span(1) }
-      &.span2 { .span(2) }
-      &.span3 { .span(3) }
-      &.span4 { .span(4) }
-      &.span5 { .span(5) }
-      &.span6 { .span(6) }
-      &.span7 { .span(7) }
-      &.span8 { .span(8) }
-      &.span9 { .span(9) }
-      &.span10 { .span(10) }
-      &.span11 { .span(11) }
-      &.span12 { .span(12) }
+      margin-left: 0; // override margin-left from core grid system
+      > .span1 { .span(1); }
+      > .span2 { .span(2); }
+      > .span3 { .span(3); }
+      > .span4 { .span(4); }
+      > .span5 { .span(5); }
+      > .span6 { .span(6); }
+      > .span7 { .span(7); }
+      > .span8 { .span(8); }
+      > .span9 { .span(9); }
+      > .span10 { .span(10); }
+      > .span11 { .span(11); }
+      > .span12 { .span(12); }
     }
 
   }