diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2195adde9e..b5cea261d0 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -688,7 +688,6 @@ pre code {
 }
 
 .container {
-  max-width: 940px;
   margin-right: auto;
   margin-left: auto;
 }
@@ -4706,8 +4705,6 @@ a.badge:hover {
   }
   .container {
     max-width: 940px;
-    margin-right: auto;
-    margin-left: auto;
   }
   .navbar {
     padding-top: 0;
@@ -4740,6 +4737,16 @@ a.badge:hover {
   }
 }
 
+@media screen and (min-width: 1200px) {
+  .container {
+    max-width: 1170px;
+  }
+  [class^="span"] {
+    padding-right: 15px;
+    padding-left: 15px;
+  }
+}
+
 /*
 // Responsive
 // -------------------------------------------------------------
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 32b09a805e..36e5e70ce5 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -213,6 +213,11 @@ section > ul li {
   }
 }
 
+@media screen and (min-width: 1200px) {
+  .bs-docs-sidenav {
+    width: 260px;
+  }
+}
 
 
 
diff --git a/less/bootstrap.less b/less/bootstrap.less
index 896a91641a..a0a2e868a2 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -88,8 +88,6 @@
 */
   .container {
     max-width: 940px;
-    margin-left: auto;
-    margin-right: auto;
   }
 
   .navbar {
@@ -126,6 +124,19 @@
 
 }
 
+// Responsive: Large desktops and up
+@media screen and (min-width: 1200px) {
+
+  .container {
+    max-width: 1170px;
+  }
+  [class^="span"] {
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+
+}
+
 /*
 // Responsive
 // -------------------------------------------------------------
diff --git a/less/grid.less b/less/grid.less
index 751e9d8c60..b8c1c3beb8 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -6,7 +6,6 @@
 // Set the container width, and override it for fixed navbars in media queries
 .container {
   .container-fixed();
-  max-width: 940px;
 }
 
 // Mobile-first defaults