diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index f3d7c156e3..76a45b45e6 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -14,6 +14,11 @@ body {
   /* We add the padding to the body for >768px only */
 }
 
+.bs-docs-container {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
 /*  */
 .bs-docs-footer {
   padding-left:  15px;
@@ -486,7 +491,8 @@ section > ul li {
 
 .bs-docs-footer {
   text-align: center;
-  padding: 30px 0;
+  padding-top: 30px;
+  padding-bottom: 30px;
   margin-top: 100px;
   border-top: 1px solid #e5e5e5;
 }
@@ -610,6 +616,12 @@ input.focused {
     padding-top: 50px; /* Default height of navbar */
   }
 
+  /* Undo custom padding */
+  .bs-docs-container {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
   /* Tweak display of docs jumbotrons */
   .masthead {
     padding-top:    100px;
diff --git a/docs/components.html b/docs/components.html
index 5e17a6a3e4..06cbe37206 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -14,7 +14,7 @@ title: Components
 </header>
 
 
-  <div class="container">
+  <div class="container bs-docs-container">
 
     <!-- Docs nav
     ================================================== -->
diff --git a/docs/css.html b/docs/css.html
index 874e00ed04..226b55d6db 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -13,7 +13,7 @@ title: CSS
 </header>
 
 
-  <div class="container">
+  <div class="container bs-docs-container">
 
     <!-- Docs nav
     ================================================== -->
diff --git a/docs/customize.html b/docs/customize.html
index 544f41310b..f4e01b3406 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -14,7 +14,7 @@ title: Customize and download
 </header>
 
 
-  <div class="container">
+  <div class="container bs-docs-container">
 
     <!-- Docs nav
     ================================================== -->
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 79b31d25df..5717bfbaa5 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -14,7 +14,7 @@ description: Overview of the project, its contents, and how to get started with
 </header>
 
 
-<div class="container">
+<div class="container bs-docs-container">
 
   <!-- Docs nav
   ================================================== -->
@@ -42,17 +42,17 @@ description: Overview of the project, its contents, and how to get started with
         <p class="lead">Before downloading, be sure to have a code editor (we recommend <a href="http://sublimetext.com/2">Sublime Text 2</a>) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with the compiled Bootstrap files.</p>
 
         <div class="row">
-          <div class="span6">
+          <div class="col-span-6">
             <h2>Compiled</h2>
             <p><strong>Fastest way to get started:</strong> get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.</p>
             <p><a class="btn btn-large btn-primary" href="assets/bootstrap.zip" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p>
           </div>
-          <div class="span6">
+          <div class="col-span-6">
             <h2>Source</h2>
             <p>Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p>
             <p><a class="btn btn-large" href="https://github.com/twitter/bootstrap/zipball/master" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download Bootstrap source</a></p>
           </div>
-          <div class="span6">
+          <div class="col-span-6">
             <h2>Bower</h2>
             <p>Install and manage the original files for all CSS and JavaScript, along with a local copy of the docs, using <a href="http://twitter.github.com/bower">Bower</a>.</p>
             {% highlight bash %}bower install bootstrap{% endhighlight %}
@@ -179,56 +179,56 @@ description: Overview of the project, its contents, and how to get started with
         </div>
         <p class="lead">Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
         <div class="row bs-docs-examples">
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/starter-template/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-starter.png" alt="">
             </a>
             <h4>Starter template</h4>
             <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/jumbotron/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-marketing.png" alt="">
             </a>
             <h4>Basic marketing site</h4>
             <p>Featuring a hero unit for a primary message and three supporting elements.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/jumbotron-narrow/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-jumbotron-narrow.png" alt="">
             </a>
             <h4>Narrow marketing</h4>
             <p>Slim, lightweight marketing template for small projects or teams.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/justified-nav/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-justified-nav.png" alt="">
             </a>
             <h4>Justified nav</h4>
             <p>Marketing page with equal-width navigation links in a modified navbar.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/signin/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-signin.png" alt="">
             </a>
             <h4>Sign in</h4>
             <p>Barebones sign in form with custom, larger form controls and a flexible layout.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/sticky-footer/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
             </a>
             <h4>Sticky footer</h4>
             <p>Pin a fixed-height footer to the bottom of the user's viewport.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/sticky-footer-navbar/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-sticky-footer-navbar.png" alt="">
             </a>
             <h4>Sticky footer w/ navbar</h4>
             <p>Add a fixed navbar to the default sticky footer template.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/carousel/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-carousel.png" alt="">
             </a>
@@ -237,28 +237,28 @@ description: Overview of the project, its contents, and how to get started with
           </div>
 
 
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/navbar/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-navbar.png" alt="">
             </a>
             <h4>Navbar</h4>
             <p>Basic template for showcasing how the navbar works.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/navbar-static-top/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-navbar-static-top.png" alt="">
             </a>
             <h4>Static top navbar</h4>
             <p>Basic template for showcasing the static navbar variation.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/navbar-fixed-top/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-navbar-fixed-top.png" alt="">
             </a>
             <h4>Fixed top navbar</h4>
             <p>Basic template for showcasing the fixed navbar variation.</p>
           </div>
-          <div class="span4">
+          <div class="col-span-4">
             <a class="thumbnail" href="/examples/grid/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-.png" alt="">
             </a>
diff --git a/docs/index.html b/docs/index.html
index 17afe11c43..d2aece152b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -22,7 +22,7 @@ title: Bootstrap
   </div>
 </div>
 
-<div class="container">
+<div class="container bs-docs-container">
 
   <div class="bs-docs-marketing">
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 8e65c61d54..e64908672b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -12,7 +12,7 @@ title: JavaScript plugins
   </div>
 </header>
 
-  <div class="container">
+  <div class="container bs-docs-container">
 
     <!-- Docs nav
     ================================================== -->