From: Mark Otto <otto@github.com>
Date: Tue, 4 Jun 2013 04:57:51 +0000 (-0700)
Subject: nuke the .col
X-Git-Tag: v3.0.0-rc1~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=245ebda651fcdbc9687c1a436e8bbe3916354da6;p=thirdparty%2Fbootstrap.git

nuke the .col
---

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index d7d49e1b61..68bcbf8d23 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -20,7 +20,7 @@
 
     <div class="container bs-docs-container">
       <div class="row">
-        <div class="col col-lg-3">
+        <div class="col-lg-3">
           <div class="bs-sidebar">
             <ul class="nav bs-sidenav">
               {% if page.slug == "getting-started" %}
@@ -37,7 +37,7 @@
             </ul>
           </div>
         </div>
-        <div class="col col-lg-9">
+        <div class="col-lg-9">
           {{ content }}
         </div>
       </div>
diff --git a/docs/components.html b/docs/components.html
index 20fdd70ddc..44a823a9dd 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -300,7 +300,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
         <div class="controls">
           <div class="input-group">
             <span class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></span>
-            <input class="col col-lg-2" id="inputIcon" type="text">
+            <input class="col-lg-2" id="inputIcon" type="text">
           </div>
         </div>
       </div>
@@ -311,7 +311,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
   <div class="controls">
     <div class="input-group">
       <span class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></span>
-      <input class="col col-lg-2" id="inputIcon" type="text">
+      <input class="col-lg-2" id="inputIcon" type="text">
     </div>
   </div>
 </div>
@@ -1302,7 +1302,7 @@ body { padding-bottom: 70px; }
               </li>
             </ul>
             <form class="navbar-form pull-left" action="">
-              <input type="text" class="col col-lg-8" placeholder="Search">
+              <input type="text" class="col-lg-8" placeholder="Search">
             </form>
             <ul class="nav navbar-nav pull-right">
               <li><a href="#">Link</a></li>
@@ -1379,7 +1379,7 @@ body { padding-bottom: 70px; }
               </li>
             </ul>
             <form class="navbar-form pull-left" action="">
-              <input type="text" class="col col-lg-8" placeholder="Search">
+              <input type="text" class="col-lg-8" placeholder="Search">
             </form>
             <ul class="nav navbar-nav pull-right">
               <li><a href="#">Link</a></li>
@@ -1757,22 +1757,22 @@ body { padding-bottom: 70px; }
     <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
     <div class="bs-example">
       <div class="row">
-        <div class="col col-lg-3">
+        <div class="col-lg-3">
           <a href="#" class="thumbnail">
             <img data-src="holder.js/260x180" alt="">
           </a>
         </div>
-        <div class="col col-lg-3">
+        <div class="col-lg-3">
           <a href="#" class="thumbnail">
             <img data-src="holder.js/260x180" alt="">
           </a>
         </div>
-        <div class="col col-lg-3">
+        <div class="col-lg-3">
           <a href="#" class="thumbnail">
             <img data-src="holder.js/260x180" alt="">
           </a>
         </div>
-        <div class="col col-lg-3">
+        <div class="col-lg-3">
           <a href="#" class="thumbnail">
             <img data-src="holder.js/260x180" alt="">
           </a>
@@ -1781,7 +1781,7 @@ body { padding-bottom: 70px; }
     </div><!-- /.bs-example -->
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-3">
+  <div class="col-lg-3">
     <a href="#" class="thumbnail">
       <img data-src="holder.js/260x180" alt="">
     </a>
@@ -1794,7 +1794,7 @@ body { padding-bottom: 70px; }
     <p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p>
     <div class="bs-example">
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <div class="thumbnail">
             <img data-src="holder.js/300x200" alt="">
             <div class="caption">
@@ -1804,7 +1804,7 @@ body { padding-bottom: 70px; }
             </div>
           </div>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <div class="thumbnail">
             <img data-src="holder.js/300x200" alt="">
             <div class="caption">
@@ -1814,7 +1814,7 @@ body { padding-bottom: 70px; }
             </div>
           </div>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <div class="thumbnail">
             <img data-src="holder.js/300x200" alt="">
             <div class="caption">
@@ -1828,7 +1828,7 @@ body { padding-bottom: 70px; }
     </div><!-- /.bs-example -->
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-3">
+  <div class="col-lg-3">
     <div class="thumbnail">
       <img data-src="holder.js/300x200" alt="">
       <div class="caption">
diff --git a/docs/css.html b/docs/css.html
index 264d4c672c..ca10a731b1 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -70,81 +70,81 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
     <p>Be sure to checkout the <a href="../examples/grid/">full-page grid example</a> as well.</p>
     <div class="bs-docs-grid">
       <div class="row show-grid">
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
       </div>
       <div class="row show-grid">
-        <div class="col col-lg-4">4</div>
-        <div class="col col-lg-4">4</div>
-        <div class="col col-lg-4">4</div>
+        <div class="col-lg-4">4</div>
+        <div class="col-lg-4">4</div>
+        <div class="col-lg-4">4</div>
       </div>
       <div class="row show-grid">
-        <div class="col col-lg-6">6</div>
-        <div class="col col-lg-6">6</div>
+        <div class="col-lg-6">6</div>
+        <div class="col-lg-6">6</div>
       </div>
     </div>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
 </div>
 <div class="row">
-  <div class="col col-lg-4">4</div>
-  <div class="col col-lg-4">4</div>
-  <div class="col col-lg-4">4</div>
+  <div class="col-lg-4">4</div>
+  <div class="col-lg-4">4</div>
+  <div class="col-lg-4">4</div>
 </div>
 <div class="row">
-  <div class="col col-lg-6">6</div>
-  <div class="col col-lg-6">6</div>
+  <div class="col-lg-6">6</div>
+  <div class="col-lg-6">6</div>
 </div>
 {% endhighlight %}
 
     <h3 id="grid-offsetting">Offsetting columns</h3>
-    <p>Move columns to the right using <code>.col-offset-*</code> classes. These classes increase the left margin of a column by <code>*</code> columns. For example, <code>.col-offset-4</code> moves <code>.col col-lg-4</code> over four columns.</p>
+    <p>Move columns to the right using <code>.col-offset-*</code> classes. These classes increase the left margin of a column by <code>*</code> columns. For example, <code>.col-offset-4</code> moves <code>.col-lg-4</code> over four columns.</p>
     <div class="bs-docs-grid">
       <div class="row show-grid">
-        <div class="col col-lg-4">4</div>
-        <div class="col col-lg-4 col-offset-4">4 offset 4</div>
+        <div class="col-lg-4">4</div>
+        <div class="col-lg-4 col-offset-4">4 offset 4</div>
       </div><!-- /row -->
       <div class="row show-grid">
-        <div class="col col-lg-3 col-offset-3">3 offset 3</div>
-        <div class="col col-lg-3 col-offset-3">3 offset 3</div>
+        <div class="col-lg-3 col-offset-3">3 offset 3</div>
+        <div class="col-lg-3 col-offset-3">3 offset 3</div>
       </div><!-- /row -->
       <div class="row show-grid">
-        <div class="col col-lg-6 col-offset-3">6 offset 3</div>
+        <div class="col-lg-6 col-offset-3">6 offset 3</div>
       </div><!-- /row -->
     </div>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-4">...</div>
-  <div class="col col-lg-4 col-offset-4">...</div>
+  <div class="col-lg-4">...</div>
+  <div class="col-lg-4 col-offset-4">...</div>
 </div>
 <div class="row">
-  <div class="col col-lg-3 col-offset-3">3 offset 3</div>
-  <div class="col col-lg-3 col-offset-3">3 offset 3</div>
+  <div class="col-lg-3 col-offset-3">3 offset 3</div>
+  <div class="col-lg-3 col-offset-3">3 offset 3</div>
 </div>
 <div class="row">
-  <div class="col col-lg-6 col-offset-3">...</div>
+  <div class="col-lg-6 col-offset-3">...</div>
 </div>
 {% endhighlight %}
 
@@ -152,13 +152,13 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
     <h3 id="grid-nesting">Nesting columns</h3>
     <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-lg-*</code> columns within an existing <code>.col-lg-*</code> column. Nested rows should include a set of columns that add up to 12.</p>
     <div class="row show-grid">
-      <div class="col col-lg-9">
+      <div class="col-lg-9">
         Level 1: 9 columns
         <div class="row show-grid">
-          <div class="col col-lg-6">
+          <div class="col-lg-6">
             Level 2: 6 columns
           </div>
-          <div class="col col-lg-6">
+          <div class="col-lg-6">
             Level 2: 6 columns
           </div>
         </div>
@@ -166,13 +166,13 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
     </div>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-9">
+  <div class="col-lg-9">
     Level 1: 9 columns
     <div class="row">
-      <div class="col col-lg-6">
+      <div class="col-lg-6">
         Level 2: 6 columns
       </div>
-      <div class="col col-lg-6">
+      <div class="col-lg-6">
         Level 2: 6 columns
       </div>
     </div>
@@ -183,29 +183,29 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
     <h3 id="grid-column-ordering">Column ordering</h3>
     <p>Easily change the order of our built-in grid columns with <code>.col-push-*</code> and <code>.col-pull-*</code> modifier classes.</p>
     <div class="row show-grid">
-      <div class="col col-lg-9 col-push-3">9</div>
-      <div class="col col-lg-3 col-pull-9">3</div>
+      <div class="col-lg-9 col-push-3">9</div>
+      <div class="col-lg-3 col-pull-9">3</div>
     </div>
 
 {% highlight html %}
 <div class="row show-grid">
-  <div class="col col-lg-9 col-push-3">9</div>
-  <div class="col col-lg-3 col-pull-9">3</div>
+  <div class="col-lg-9 col-push-3">9</div>
+  <div class="col-lg-3 col-pull-9">3</div>
 </div>
 {% endhighlight %}
 
     <h3 id="grid-small">Small device grid</h3>
     <p>Use the small device grid classes, like <code>.col-sm-6</code>, to create columned layouts on phone and tablet devices (anything under 768px). Offsets, pushes, and pulls are not available with the small grid at this time.</p>
     <div class="row show-grid">
-      <div class="col col-lg-4 col-sm-6">4 cols, 6 small cols</div>
-      <div class="col col-lg-4 col-sm-6">4 cols, 6 small cols</div>
-      <div class="col col-lg-4 col-sm-12">4 cols, 12 small cols</div>
+      <div class="col-lg-4 col-sm-6">4 cols, 6 small cols</div>
+      <div class="col-lg-4 col-sm-6">4 cols, 6 small cols</div>
+      <div class="col-lg-4 col-sm-12">4 cols, 12 small cols</div>
     </div>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-4 col-sm-6">4 cols, 6 small cols</div>
-  <div class="col col-lg-4 col-sm-6">4 cols, 6 small cols</div>
-  <div class="col col-lg-4 col-sm-12">4 cols, 12 small cols</div>
+  <div class="col-lg-4 col-sm-6">4 cols, 6 small cols</div>
+  <div class="col-lg-4 col-sm-6">4 cols, 6 small cols</div>
+  <div class="col-lg-4 col-sm-12">4 cols, 12 small cols</div>
 </div>
 {% endhighlight %}
 
@@ -918,8 +918,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Use contextual classes to color table rows.</p>
     <table class="table table-bordered table-striped">
       <colgroup>
-        <col class="col col-lg-1">
-        <col class="col col-lg-7">
+        <col class="col-lg-1">
+        <col class="col-lg-7">
       </colgroup>
       <thead>
         <tr>
@@ -1078,14 +1078,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout.</p>
     <form class="bs-example form-horizontal">
       <div class="row">
-        <label for="inputEmail" class="col col-lg-2 control-label">Email</label>
-        <div class="col col-lg-10">
+        <label for="inputEmail" class="col-lg-2 control-label">Email</label>
+        <div class="col-lg-10">
           <input type="text" id="inputEmail" placeholder="Email">
         </div>
       </div>
       <div class="row">
-        <label for="" class="col col-lg-2 control-label">Password</label>
-        <div class="col col-lg-10">
+        <label for="" class="col-lg-2 control-label">Password</label>
+        <div class="col-lg-10">
           <input type="password" id="inputPassword" placeholder="Password">
           <div class="checkbox">
             <label>
@@ -1093,7 +1093,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
             </label>
           </div>
         </div>
-        <div class="col col-lg-10 col-offset-2">
+        <div class="col-lg-10 col-offset-2">
           <button type="submit" class="btn btn-default">Sign in</button>
         </div>
       </div>
@@ -1101,14 +1101,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% highlight html %}
 <form class="form-horizontal">
   <div class="row">
-    <label for="inputEmail" class="col col-lg-2 control-label">Email</label>
-    <div class="col col-lg-10">
+    <label for="inputEmail" class="col-lg-2 control-label">Email</label>
+    <div class="col-lg-10">
       <input type="text" id="inputEmail" placeholder="Email">
     </div>
   </div>
   <div class="row">
-    <label for="" class="col col-lg-2 control-label">Password</label>
-    <div class="col col-lg-10">
+    <label for="" class="col-lg-2 control-label">Password</label>
+    <div class="col-lg-10">
       <input type="password" id="inputPassword" placeholder="Password">
       <div class="checkbox">
         <label>
@@ -1116,7 +1116,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
         </label>
       </div>
     </div>
-    <div class="col col-lg-10 col-offset-2">
+    <div class="col-lg-10 col-offset-2">
       <button type="submit" class="btn btn-default">Sign in</button>
     </div>
   </div>
@@ -1400,34 +1400,34 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     </div>
 
     <form class="bs-example">
-      <div class="input-group col col-lg-9">
+      <div class="input-group col-lg-9">
         <span class="input-group-addon">@</span>
         <input type="text" placeholder="Username">
       </div>
       <br>
-      <div class="input-group col col-lg-6">
+      <div class="input-group col-lg-6">
         <input type="text">
         <span class="input-group-addon">.00</span>
       </div>
       <br>
-      <div class="input-group col col-lg-3">
+      <div class="input-group col-lg-3">
         <span class="input-group-addon">$</span>
         <input type="text">
         <span class="input-group-addon">.00</span>
       </div>
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-9">
+<div class="input-group col-lg-9">
   <span class="input-group-addon">@</span>
   <input type="text" placeholder="Username">
 </div>
 
-<div class="input-group col col-lg-6">
+<div class="input-group col-lg-6">
   <input type="text">
   <span class="input-group-addon">.00</span>
 </div>
 
-<div class="input-group col col-lg-3">
+<div class="input-group col-lg-3">
   <span class="input-group-addon">$</span>
   <input type="text">
   <span class="input-group-addon">.00</span>
@@ -1437,33 +1437,33 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h4>Optional sizes</h4>
     <p>Add the relative form sizing classes to the `.input-group-addon`.</p>
     <form class="bs-example">
-      <div class="input-group col col-lg-9">
+      <div class="input-group col-lg-9">
         <span class="input-group-addon input-large">@</span>
         <input type="text" class="input-large" placeholder="Username">
       </div>
       <br>
-      <div class="input-group col col-lg-9">
+      <div class="input-group col-lg-9">
         <span class="input-group-addon">@</span>
         <input type="text" placeholder="Username">
       </div>
       <br>
-      <div class="input-group col col-lg-9">
+      <div class="input-group col-lg-9">
         <span class="input-group-addon input-small">@</span>
         <input type="text" class="input-small" placeholder="Username">
       </div>
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-9">
+<div class="input-group col-lg-9">
   <span class="input-group-addon input-large">@</span>
   <input type="text" class="input-large" placeholder="Username">
 </div>
 
-<div class="input-group col col-lg-9">
+<div class="input-group col-lg-9">
   <span class="input-group-addon">@</span>
   <input type="text" placeholder="Username">
 </div>
 
-<div class="input-group col col-lg-9">
+<div class="input-group col-lg-9">
   <span class="input-group-addon input-small">@</span>
   <input type="text" class="input-small" placeholder="Username">
 </div>
@@ -1472,14 +1472,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h4>Buttons instead of text</h4>
     <p>Buttons in input groups are a bit different and require one extra level of nesting. Instead of <code>.input-group-addon</code>, you'll need to use <code>.input-group-btn</code> to wrap the buttons. This is required due to default browser styles that cannot be overridden.</p>
     <form class="bs-example">
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <span class="input-group-btn">
           <button class="btn btn-default" type="button">Go!</button>
         </span>
         <input type="text">
       </div>
       <br>
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <input type="text">
         <span class="input-group-btn">
           <button class="btn btn-default" type="button">Go!</button>
@@ -1487,14 +1487,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       </div>
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <span class="input-group-btn">
     <button class="btn btn-default" type="button">Go!</button>
   </span>
   <input type="text">
 </div>
 
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <input type="text">
   <span class="input-group-btn">
     <button class="btn btn-default" type="button">Go!</button>
@@ -1505,7 +1505,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h4>Button dropdowns</h4>
     <p></p>
     <form class="bs-example">
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <div class="input-group-btn">
           <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
           <ul class="dropdown-menu">
@@ -1519,7 +1519,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
         <input type="text">
       </div><!-- /input-group -->
       <br>
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <input type="text">
         <div class="input-group-btn">
           <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
@@ -1534,7 +1534,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       </div><!-- /input-group -->
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <div class="input-group-btn">
     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
     <ul class="dropdown-menu">
@@ -1548,7 +1548,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   <input type="text">
 </div><!-- /input-group -->
 
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <input type="text">
   <div class="input-group-btn">
     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
@@ -1565,7 +1565,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 
     <h4>Segmented dropdown groups</h4>
     <form class="bs-example">
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <div class="input-group-btn">
           <button type="button" class="btn btn-default" tabindex="-1">Action</button>
           <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1">
@@ -1584,7 +1584,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 
       <br>
 
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <input type="text">
         <div class="input-group-btn">
           <button type="button" class="btn btn-default" tabindex="-1">Action</button>
@@ -1602,14 +1602,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       </div>
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <div class="input-group-btn">
     <!-- Button and dropdown menu -->
   </div>
   <input type="text">
 </div>
 
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <input type="text">
   <div class="input-group-btn btn-group">
     <!-- Button and dropdown menu -->
@@ -1639,27 +1639,27 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Wrap inputs in grid columns, or any custom parent element, to easily enforce desired widths.</p>
     <form class="bs-example" style="padding-bottom: 15px;">
       <div class="row">
-        <div class="col col-lg-2">
-          <input type="text" placeholder="col col-large-2">
+        <div class="col-lg-2">
+          <input type="text" placeholder="col-large-2">
         </div>
-        <div class="col col-lg-3">
-          <input type="text" placeholder="col col-large-3">
+        <div class="col-lg-3">
+          <input type="text" placeholder="col-large-3">
         </div>
-        <div class="col col-lg-4">
-          <input type="text" placeholder="col col-large-4">
+        <div class="col-lg-4">
+          <input type="text" placeholder="col-large-4">
         </div>
       </div>
     </form>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-2">
-    <input type="text" placeholder="col col-large-2">
+  <div class="col-lg-2">
+    <input type="text" placeholder="col-large-2">
   </div>
-  <div class="col col-lg-3">
-    <input type="text" placeholder="col col-large-3">
+  <div class="col-lg-3">
+    <input type="text" placeholder="col-large-3">
   </div>
-  <div class="col col-lg-4">
-    <input type="text" placeholder="col col-large-4">
+  <div class="col-lg-4">
+    <input type="text" placeholder="col-large-4">
   </div>
 </div>
 {% endhighlight %}
diff --git a/docs/customize.html b/docs/customize.html
index 6b3c627d0c..19957867f2 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -17,7 +17,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h3>Basics</h3>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <h4>Layout</h4>
           <div class="checkbox">
             <label>
@@ -44,7 +44,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
             </label>
           </div>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <h4>Global CSS</h4>
           <div class="checkbox">
             <label>
@@ -77,7 +77,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
             </label>
           </div>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <h4>Utility classes</h4>
           <div class="checkbox">
             <label>
@@ -102,7 +102,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h3>Components</h3>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <h4>Navigation</h4>
           <div class="checkbox">
             <label>
@@ -135,7 +135,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
             </label>
           </div>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <h4>Content blocks</h4>
           <div class="checkbox">
             <label>
@@ -162,7 +162,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
             </label>
           </div>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <h4>Behavioral (requires JS)</h4>
           <div class="checkbox">
             <label>
@@ -204,7 +204,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
 
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <h4>Media</h4>
           <div class="checkbox">
             <label>
@@ -231,7 +231,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
             </label>
           </div>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <h4>Miscellaneous</h4>
           <div class="checkbox">
             <label>
@@ -276,7 +276,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <p class="lead">Choose which jQuery plugins should be included in your custom JavaScript files. Unsure what to include? Read the <a href="/javascript/">JavaScript</a> page in the docs.</p>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Linked to components</h4>
           <div class="checkbox">
             <label>
@@ -327,7 +327,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
             </label>
           </div>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Magic</h4>
           <div class="checkbox">
             <label>
@@ -374,7 +374,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h3>Body background</h3>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@body-bg</label>
           <input type="text" placeholder="#fff">
           <p class="help-block">Background color applied to <code>&lt;body&gt;</code>.</p>
@@ -383,7 +383,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h3>Typography</h3>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@font-family-sans-serif</label>
           <input type="text" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
           <p class="help-block">Default sans-serif fonts.</p>
@@ -394,7 +394,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="Monaco, Menlo, Consolas, 'Courier New', monospace">
           <p class="help-block">Default monospace fonts for <code>&lt;code&gt;</code> and <code>&lt;pre&gt;</code>.</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@font-family-base</label>
           <input type="text" placeholder="@font-family-sans-serif">
           <p class="help-block">Used to globally set font-family in Bootstrap.</p>
@@ -415,7 +415,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h3>Colors</h3>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <p>Define custom colors used in several contexts.</p>
           <label>@brand-primary</label>
           <input type="text" placeholder="#428bca">
@@ -433,7 +433,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="#5bc0de">
           <p class="help-block">Used to indicate informational content.</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <p>Define your preferred colors for standard text and links.</p>
           <label>@text-color</label>
           <input type="text" placeholder="@gray-dark">
@@ -450,13 +450,13 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <h3>Media queries breakpoints</h3>
       <p>Define the breakpoints at which your layout will change, adapting to different screen sizes.</p>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@screen-tiny</label>
           <input type="text" placeholder="480px">
           <label>@screen-small</label>
           <input type="text" placeholder="768px">
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@screen-medium</label>
           <input type="text" placeholder="992px">
           <label>@screen-large</label>
@@ -467,7 +467,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <h3>Grid system</h3>
       <p>Define your custom responsive grid.</p>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@grid-columns</label>
           <input type="text" placeholder="12">
           <p class="help-block">Number of columns in the grid.</p>
@@ -475,7 +475,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="30px">
           <p class="help-block">Padding between columns.</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@grid-float-breakpoint</label>
           <input type="text" placeholder="@screen-tablet">
           <p class="help-block">Point at which the navbar stops collapsing.</p>
@@ -485,7 +485,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <h3>Components</h3>
       <p>Define common padding and border radius sizes and more.</p>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Padding</h4>
           <label>@padding-base-vertical</label>
           <input type="text" placeholder="8px">
@@ -500,7 +500,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <label>@padding-small-horizontal</label>
           <input type="text" placeholder="10px">
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Border radius sizes</h4>
           <label>@border-radius-base</label>
           <input type="text" placeholder="4px">
@@ -513,7 +513,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h4>Active background color</h4>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@component-active-bg</label>
           <input type="text" placeholder="@brand-primary">
           <p class="help-block">Used for active or hovered items in places like navs or dropdowns.</p>
@@ -523,7 +523,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <h2 id="variables-buttons">Buttons</h2>
       <p>For each of Bootstrap's buttons, define text, background and border color.</p>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Default</h4>
           <label>@btn-default-color</label>
           <input type="text" placeholder="#fff">
@@ -546,7 +546,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <label>@btn-info-border</label>
           <input type="text" placeholder="@btn-info-bg">
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Success</h4>
           <label>@btn-success-color</label>
           <input type="text" placeholder="@btn-default-color">
@@ -574,7 +574,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <h2 id="variables-form-states">Form states and alerts</h2>
       <p>Define colors for form feedback states and, by default, alerts.</p>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Success</h4>
           <label>@state-success-text</label>
           <input type="text" placeholder="#468847">
@@ -590,7 +590,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <label>@state-warning-border</label>
           <input type="text" placeholder="darken(spin(@state-warning-bg, -10), 3%)">
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Danger</h4>
           <label>@state-danger-text</label>
           <input type="text" placeholder="#b94a48">
@@ -614,7 +614,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <label>@alert-border-radius</label>
       <input type="text" placeholder="@border-radius-base">
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Success</h4>
           <label>@alert-success-text</label>
           <input type="text" placeholder="@state-success-text">
@@ -630,7 +630,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <label>@alert-warning-border</label>
           <input type="text" placeholder="@state-warning-border">
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Danger</h4>
           <label>@alert-danger-text</label>
           <input type="text" placeholder="@state-danger-text">
@@ -650,7 +650,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h2 id="variables-navbar">Navbar</h2>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h3>Default navbar</h3>
           <h4>Basics</h4>
           <label>@navbar-height</label>
@@ -682,7 +682,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <label>@navbar-brand-hover-bg</label>
           <input type="text" placeholder="transparent">
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h3>Inverted navbar</h3>
           <h4>Basics</h4>
           <label>@navbar-inverse-color</label>
@@ -716,7 +716,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h2 id="variables-tables">Tables</h2>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@table-bg</label>
           <input type="text" placeholder="transparent">
           <p class="help-block">Default background color used for all tables.</p>
@@ -725,7 +725,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="#f9f9f9">
           <p class="help-block">Background color used for <code>.table-striped</code>.</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@table-bg-hover</label>
           <input type="text" placeholder="#f5f5f5">
           <p class="help-block">Background color used for <code>.table-hover</code>.</p>
@@ -737,7 +737,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h2 id="variables-forms">Forms</h2>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h3>Background</h3>
           <label>@input-bg</label>
           <input type="text" placeholder="#fff">
@@ -751,7 +751,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="@gray-light">
           <p class="help-block">Placeholder text color</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h3>Border</h3>
           <label>@input-border</label>
           <input type="text" placeholder="#ccc">
@@ -764,7 +764,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h2 id="variables-dropdowns">Dropdowns</h2>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h3>Background</h3>
           <label>@dropdown-bg</label>
           <input type="text" placeholder="#fff">
@@ -776,7 +776,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="@dropdown-link-active-bg">
           <p class="help-block">Hovered dropdown menu entry background color</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h3>Colors</h3>
           <label>@dropdown-link-color</label>
           <input type="text" placeholder="@gray-dark">
@@ -791,7 +791,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <h3>Dividers</h3>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@dropdown-divider-top</label>
           <input type="text" placeholder="#e5e5e5">
           <p class="help-block">Dropdown divider top border color</p>
@@ -804,7 +804,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <h2 id="variables-panels-wells">Panels and wells</h2>
       <h3>Default panel styles</h3>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@panel-bg</label>
           <input type="text" placeholder="#fff">
           <p class="help-block">Panel body background color</p>
@@ -815,7 +815,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="#f5f5f5">
           <p class="help-block">Panel footer background color</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@panel-border</label>
           <input type="text" placeholder="#ddd">
           <p class="help-block">Panel border color</p>
@@ -826,7 +826,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <h3>Contextual panel colors</h3>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Primary</h4>
           <label>@panel-primary-text</label>
           <input type="text" placeholder="#fff">
@@ -858,7 +858,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="@state-info-bg">
           <p class="help-block">Info heading background color</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <h4>Warning</h4>
           <label>@panel-warning-text</label>
           <input type="text" placeholder="@state-warning-text">
@@ -888,17 +888,17 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h2 id="variables-jumbotron">Jumbotron</h2>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@jumbotron-bg</label>
           <input type="text" placeholder="@gray-lighter">
           <p class="help-block">Jumbotron background color</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@jumbotron-heading-color</label>
           <input type="text" placeholder="inherit">
           <p class="help-block">Jumbotron heading color</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@jumbotron-lead-color</label>
           <input type="text" placeholder="inherit">
           <p class="help-block">Jumbotron lead paragraph color</p>
@@ -906,17 +906,17 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <h2 id="variables-modals">Modals</h2>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@modal-inner-padding</label>
           <input type="text" placeholder="20px">
           <p class="help-block">Padding applied to the modal body</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@modal-title-padding</label>
           <input type="text" placeholder="15px">
           <p class="help-block">Padding applied to the modal title</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@modal-title-line-height</label>
           <input type="text" placeholder="@line-height-base">
           <p class="help-block">Modal title line-height</p>
@@ -925,17 +925,17 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <h2 id="variables-list-group">List group</h2>
       <h3>Background</h3>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@list-group-bg</label>
           <input type="text" placeholder="#fff">
           <p class="help-block">Default background color</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@list-group-hover-bg</label>
           <input type="text" placeholder="#f5f5f5">
           <p class="help-block">Background color of single list elements on hover</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@list-group-active-bg</label>
           <input type="text" placeholder="@component-active-bg">
           <p class="help-block">Background color of active list elements</p>
@@ -943,17 +943,17 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <h3>Borders</h3>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@list-group-border</label>
           <input type="text" placeholder="#ddd">
           <p class="help-block">Default border color</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@list-group-border-radius</label>
           <input type="text" placeholder="@border-radius-base">
           <p class="help-block">List group border radius</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@list-group-active-border</label>
           <input type="text" placeholder="@list-group-active-bg">
           <p class="help-block">Border color of active list elements</p>
@@ -964,7 +964,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <p class="help-block">Text color of active list elements</p>
       <h2 id="variables-thumbnails">Thumbnails</h2>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@thumbnail-caption-color</label>
           <input type="text" placeholder="@text-color">
           <p class="help-block">Custom text color for thumbnail captions</p>
@@ -972,7 +972,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="@body-bg">
           <p class="help-block">Thumbnail background color</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@thumbnail-border</label>
           <input type="text" placeholder="#ddd">
           <p class="help-block">Thumbnail border color</p>
@@ -983,34 +983,34 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <h2 id="variables-progress">Progress bars</h2>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@progress-bg</label>
           <input type="text" placeholder="#f5f5f5">
           <p class="help-block">Background color of the whole progress component</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@progress-bar-bg</label>
           <input type="text" placeholder="@brand-primary">
           <p class="help-block">Default progress bar color</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@progress-bar-success-bg</label>
           <input type="text" placeholder="@brand-success">
           <p class="help-block">Success progress bar color</p>
         </div>
       </div>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@progress-bar-warning-bg</label>
           <input type="text" placeholder="@brand-warning">
           <p class="help-block">Warning progress bar color</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@progress-bar-danger-bg</label>
           <input type="text" placeholder="@brand-danger">
           <p class="help-block">Danger progress bar color</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@progress-bar-info-bg</label>
           <input type="text" placeholder="@brand-info">
           <p class="help-block">Info progress bar color</p>
@@ -1018,17 +1018,17 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <h2 id="variables-pagination">Pagination</h2>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@pagination-bg</label>
           <input type="text" placeholder="#fff">
           <p class="help-block">Background color</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@pagination-border</label>
           <input type="text" placeholder="#ddd">
           <p class="help-block">Border color</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <label>@pagination-active-bg</label>
           <input type="text" placeholder="#f5f5f5">
           <p class="help-block">Active background color</p>
@@ -1037,7 +1037,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
       <h2 id="variables-labels">Labels</h2>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@label-success-bg</label>
           <input type="text" placeholder="@brand-success">
           <p class="help-block">Success label background color</p>
@@ -1045,7 +1045,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="@brand-info">
           <p class="help-block">Info label background color</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@label-warning-bg</label>
           <input type="text" placeholder="@brand-warning">
           <p class="help-block">Warning label background color</p>
@@ -1057,7 +1057,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       <h2 id="variables-tooltips-popovers">Tooltips and popovers</h2>
       <h3>Tooltip styles</h3>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@tooltip-color</label>
           <input type="text" placeholder="#fff">
           <p class="help-block">Tooltip text color</p>
@@ -1065,7 +1065,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="rgba(0,0,0,.9)">
           <p class="help-block">Tooltip background color</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@tooltip-arrow-width</label>
           <input type="text" placeholder="5px">
           <p class="help-block">Tooltip arrow width</p>
@@ -1076,7 +1076,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <h3>Popover styles</h3>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@popover-bg</label>
           <input type="text" placeholder="#fff">
           <p class="help-block">Popover body background color</p>
@@ -1084,7 +1084,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
           <input type="text" placeholder="darken(@popover-bg, 3%)">
           <p class="help-block">Popover title background color</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@popover-arrow-width</label>
           <input type="text" placeholder="10px">
           <p class="help-block">Popover arrow width</p>
@@ -1094,12 +1094,12 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
         </div>
       </div>
       <div class="row">
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@popover-arrow-outer-width</label>
           <input type="text" placeholder="(@popover-arrow-width 1)">
           <p class="help-block">Popover outer arrow width</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@popover-arrow-outer-color</label>
           <input type="text" placeholder="rgba(0,0,0,.25)">
           <p class="help-block">Popover outer arrow color</p>
@@ -1107,12 +1107,12 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
       </div>
       <h2 id="variables-other">Other</h2>
       <div class="row">
-      <div class="col col-lg-6">
+      <div class="col-lg-6">
           <label>@hr-border</label>
           <input type="text" placeholder="@gray-lighter">
           <p class="help-block">Horizontal line color</p>
         </div>
-        <div class="col col-lg-6">
+        <div class="col-lg-6">
           <label>@component-offset-horizontal</label>
           <input type="text" placeholder="180px">
           <p class="help-block">Horizontal offset for forms and lists</p>
diff --git a/docs/docs.html b/docs/docs.html
index fe30046b5b..3318ca6205 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -123,63 +123,63 @@ title: Bootstrap Documentation
 
     <h3>Examples</h3>
     <div class="row bs-docs-examples">
-      <div class="col col-lg-4">
+      <div class="col-lg-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 page with Bootstrap's CSS and JavaScript included.</p>
       </div>
-      <div class="col col-lg-4">
+      <div class="col-lg-4">
         <a class="thumbnail" href="/examples/grid/" target="_blank">
           <img src="/assets/img/examples/bootstrap-example-grid.png" alt="">
         </a>
         <h4>Basic grid layouts</h4>
         <p>Simple grid layouts to familiarize you with using the Bootstrap grid system.</p>
       </div>
-      <div class="col col-lg-4">
+      <div class="col-lg-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>Features a jumbotron for primary message and three supporting elements.</p>
       </div>
-      <div class="col col-lg-4">
+      <div class="col-lg-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="col col-lg-4">
+      <div class="col-lg-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="col col-lg-4">
+      <div class="col-lg-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="col col-lg-4">
+      <div class="col-lg-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="col col-lg-4">
+      <div class="col-lg-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="col col-lg-4">
+      <div class="col-lg-4">
         <a class="thumbnail" href="/examples/carousel/" target="_blank">
           <img src="/assets/img/examples/bootstrap-example-carousel.png" alt="">
         </a>
@@ -187,21 +187,21 @@ title: Bootstrap Documentation
         <p>An interactive riff on the basic marketing site featuring a prominent carousel.</p>
       </div>
 
-      <div class="col col-lg-4">
+      <div class="col-lg-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="col col-lg-4">
+      <div class="col-lg-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="col col-lg-4">
+      <div class="col-lg-4">
         <a class="thumbnail" href="/examples/navbar-fixed-top/" target="_blank">
           <img src="/assets/img/examples/bootstrap-example-navbar-fixed-top.png" alt="">
         </a>
@@ -351,81 +351,81 @@ title: Bootstrap Documentation
     <p>On mobile devices, the grid starts out stacked. Above 768px, it becomes horizontal as media queries kick in to apply <code>float</code>s and <code>width</code>s. To create a basic grid layout, wrap a series of <code>.col-span-*</code> elements within a <code>.row</code>. As this is a 12-column grid, each <code>.col-span-*</code> spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent), even at mobile resolutions.</p>
     <div class="bs-docs-grid">
       <div class="row show-grid">
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
-        <div class="col col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
+        <div class="col-lg-1">1</div>
       </div>
       <div class="row show-grid">
-        <div class="col col-lg-4">4</div>
-        <div class="col col-lg-4">4</div>
-        <div class="col col-lg-4">4</div>
+        <div class="col-lg-4">4</div>
+        <div class="col-lg-4">4</div>
+        <div class="col-lg-4">4</div>
       </div>
       <div class="row show-grid">
-        <div class="col col-lg-6">6</div>
-        <div class="col col-lg-6">6</div>
+        <div class="col-lg-6">6</div>
+        <div class="col-lg-6">6</div>
       </div>
     </div>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
-  <div class="col col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
+  <div class="col-lg-1">1</div>
 </div>
 <div class="row">
-  <div class="col col-lg-4">4</div>
-  <div class="col col-lg-4">4</div>
-  <div class="col col-lg-4">4</div>
+  <div class="col-lg-4">4</div>
+  <div class="col-lg-4">4</div>
+  <div class="col-lg-4">4</div>
 </div>
 <div class="row">
-  <div class="col col-lg-6">6</div>
-  <div class="col col-lg-6">6</div>
+  <div class="col-lg-6">6</div>
+  <div class="col-lg-6">6</div>
 </div>
 {% endhighlight %}
 
     <h3 id="grid-offsetting">Offsetting columns</h3>
-    <p>Move columns to the right using <code>.col-offset-*</code> classes. These classes increase the left margin of a column by <code>*</code> columns. For example, <code>.col-offset-4</code> moves <code>.col col-lg-4</code> over four columns.</p>
+    <p>Move columns to the right using <code>.col-offset-*</code> classes. These classes increase the left margin of a column by <code>*</code> columns. For example, <code>.col-offset-4</code> moves <code>.col-lg-4</code> over four columns.</p>
     <div class="bs-docs-grid">
       <div class="row show-grid">
-        <div class="col col-lg-4">4</div>
-        <div class="col col-lg-4 col-offset-4">4 offset 4</div>
+        <div class="col-lg-4">4</div>
+        <div class="col-lg-4 col-offset-4">4 offset 4</div>
       </div><!-- /row -->
       <div class="row show-grid">
-        <div class="col col-lg-3 col-offset-3">3 offset 3</div>
-        <div class="col col-lg-3 col-offset-3">3 offset 3</div>
+        <div class="col-lg-3 col-offset-3">3 offset 3</div>
+        <div class="col-lg-3 col-offset-3">3 offset 3</div>
       </div><!-- /row -->
       <div class="row show-grid">
-        <div class="col col-lg-6 col-offset-3">6 offset 3</div>
+        <div class="col-lg-6 col-offset-3">6 offset 3</div>
       </div><!-- /row -->
     </div>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-4">...</div>
-  <div class="col col-lg-4 col-offset-4">...</div>
+  <div class="col-lg-4">...</div>
+  <div class="col-lg-4 col-offset-4">...</div>
 </div>
 <div class="row">
-  <div class="col col-lg-3 col-offset-3">3 offset 3</div>
-  <div class="col col-lg-3 col-offset-3">3 offset 3</div>
+  <div class="col-lg-3 col-offset-3">3 offset 3</div>
+  <div class="col-lg-3 col-offset-3">3 offset 3</div>
 </div>
 <div class="row">
-  <div class="col col-lg-6 col-offset-3">...</div>
+  <div class="col-lg-6 col-offset-3">...</div>
 </div>
 {% endhighlight %}
 
@@ -433,13 +433,13 @@ title: Bootstrap Documentation
     <h3 id="grid-nesting">Nesting columns</h3>
     <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-span-*</code> columns within an existing <code>.col-span-*</code> column. Nested rows should include a set of columns that add up to 12.</p>
     <div class="row show-grid">
-      <div class="col col-lg-9">
+      <div class="col-lg-9">
         Level 1: 9 columns
         <div class="row show-grid">
-          <div class="col col-lg-6">
+          <div class="col-lg-6">
             Level 2: 6 columns
           </div>
-          <div class="col col-lg-6">
+          <div class="col-lg-6">
             Level 2: 6 columns
           </div>
         </div>
@@ -447,13 +447,13 @@ title: Bootstrap Documentation
     </div>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-9">
+  <div class="col-lg-9">
     Level 1: 9 columns
     <div class="row">
-      <div class="col col-lg-6">
+      <div class="col-lg-6">
         Level 2: 6 columns
       </div>
-      <div class="col col-lg-6">
+      <div class="col-lg-6">
         Level 2: 6 columns
       </div>
     </div>
@@ -464,29 +464,29 @@ title: Bootstrap Documentation
     <h3 id="grid-column-ordering">Column ordering</h3>
     <p>Easily change the order of our built-in grid columns with <code>.col-push-*</code> and <code>.col-pull-*</code> modifier classes.</p>
     <div class="row show-grid">
-      <div class="col col-lg-9 col-push-3">9</div>
-      <div class="col col-lg-3 col-pull-9">3</div>
+      <div class="col-lg-9 col-push-3">9</div>
+      <div class="col-lg-3 col-pull-9">3</div>
     </div>
 
 {% highlight html %}
 <div class="row show-grid">
-  <div class="col col-lg-9 col-push-3">9</div>
-  <div class="col col-lg-3 col-pull-9">3</div>
+  <div class="col-lg-9 col-push-3">9</div>
+  <div class="col-lg-3 col-pull-9">3</div>
 </div>
 {% endhighlight %}
 
     <h3 id="grid-small">Small device grid</h3>
     <p>Use the small device grid classes, like <code>.col-sm-6</code>, to create columned layouts on phone and tablet devices (anything under 768px). Offsets, pushes, and pulls are not available with the small grid at this time.</p>
     <div class="row show-grid">
-      <div class="col col-lg-4 col-sm-6">4 cols, 6 small cols</div>
-      <div class="col col-lg-4 col-sm-6">4 cols, 6 small cols</div>
-      <div class="col col-lg-4 col-sm-12">4 cols, 12 small cols</div>
+      <div class="col-lg-4 col-sm-6">4 cols, 6 small cols</div>
+      <div class="col-lg-4 col-sm-6">4 cols, 6 small cols</div>
+      <div class="col-lg-4 col-sm-12">4 cols, 12 small cols</div>
     </div>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-4 col-sm-6">4 cols, 6 small cols</div>
-  <div class="col col-lg-4 col-sm-6">4 cols, 6 small cols</div>
-  <div class="col col-lg-4 col-sm-12">4 cols, 12 small cols</div>
+  <div class="col-lg-4 col-sm-6">4 cols, 6 small cols</div>
+  <div class="col-lg-4 col-sm-6">4 cols, 6 small cols</div>
+  <div class="col-lg-4 col-sm-12">4 cols, 12 small cols</div>
 </div>
 {% endhighlight %}
 
@@ -1199,8 +1199,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Use contextual classes to color table rows.</p>
     <table class="table table-bordered table-striped">
       <colgroup>
-        <col class="col col-lg-1">
-        <col class="col col-lg-7">
+        <col class="col-lg-1">
+        <col class="col-lg-7">
       </colgroup>
       <thead>
         <tr>
@@ -1565,10 +1565,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     </div>
 
     <form class="bs-docs-example form-inline">
-      <input class="col col-lg-3" type="email" placeholder="test@example.com" required>
+      <input class="col-lg-3" type="email" placeholder="test@example.com" required>
     </form>
 {% highlight html %}
-<input class="col col-lg-3" type="email" placeholder="test@example.com" required>
+<input class="col-lg-3" type="email" placeholder="test@example.com" required>
 {% endhighlight %}
 
     <h3 id="forms-disabled-inputs">Disabled inputs</h3>
@@ -1596,10 +1596,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <form class="bs-docs-example form-inline">
       <fieldset disabled>
         <div>
-          <input type="text" class="col col-lg-4" placeholder="Disabled input">
+          <input type="text" class="col-lg-4" placeholder="Disabled input">
         </div>
         <div>
-          <select class="col col-lg-4">
+          <select class="col-lg-4">
             <option>Disabled select</option>
           </select>
         </div>
@@ -1615,10 +1615,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 <form class="form-inline">
   <fieldset disabled>
     <div>
-      <input type="text" class="col col-lg-4" placeholder="Disabled input">
+      <input type="text" class="col-lg-4" placeholder="Disabled input">
     </div>
     <div>
-      <select class="col col-lg-4">
+      <select class="col-lg-4">
         <option>Disabled select</option>
       </select>
     </div>
@@ -1695,34 +1695,34 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     </div>
 
     <form class="bs-docs-example">
-      <div class="input-group col col-lg-9">
+      <div class="input-group col-lg-9">
         <span class="input-group-addon">@</span>
         <input type="text" placeholder="Username">
       </div>
       <br>
-      <div class="input-group col col-lg-6">
+      <div class="input-group col-lg-6">
         <input type="text">
         <span class="input-group-addon">.00</span>
       </div>
       <br>
-      <div class="input-group col col-lg-3">
+      <div class="input-group col-lg-3">
         <span class="input-group-addon">$</span>
         <input type="text">
         <span class="input-group-addon">.00</span>
       </div>
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-9">
+<div class="input-group col-lg-9">
   <span class="input-group-addon">@</span>
   <input type="text" placeholder="Username">
 </div>
 
-<div class="input-group col col-lg-6">
+<div class="input-group col-lg-6">
   <input type="text">
   <span class="input-group-addon">.00</span>
 </div>
 
-<div class="input-group col col-lg-3">
+<div class="input-group col-lg-3">
   <span class="input-group-addon">$</span>
   <input type="text">
   <span class="input-group-addon">.00</span>
@@ -1732,33 +1732,33 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h4>Optional sizes</h4>
     <p>Add the relative form sizing classes to the `.input-group-addon`.</p>
     <form class="bs-docs-example">
-      <div class="input-group col col-lg-9">
+      <div class="input-group col-lg-9">
         <span class="input-group-addon input-large">@</span>
         <input type="text" class="input-large" placeholder="Username">
       </div>
       <br>
-      <div class="input-group col col-lg-9">
+      <div class="input-group col-lg-9">
         <span class="input-group-addon">@</span>
         <input type="text" placeholder="Username">
       </div>
       <br>
-      <div class="input-group col col-lg-9">
+      <div class="input-group col-lg-9">
         <span class="input-group-addon input-small">@</span>
         <input type="text" class="input-small" placeholder="Username">
       </div>
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-9">
+<div class="input-group col-lg-9">
   <span class="input-group-addon input-large">@</span>
   <input type="text" class="input-large" placeholder="Username">
 </div>
 
-<div class="input-group col col-lg-9">
+<div class="input-group col-lg-9">
   <span class="input-group-addon">@</span>
   <input type="text" placeholder="Username">
 </div>
 
-<div class="input-group col col-lg-9">
+<div class="input-group col-lg-9">
   <span class="input-group-addon input-small">@</span>
   <input type="text" class="input-small" placeholder="Username">
 </div>
@@ -1767,14 +1767,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h4>Buttons instead of text</h4>
     <p>Buttons in input groups are a bit different and require one extra level of nesting. Instead of <code>.input-group-addon</code>, you'll need to use <code>.input-group-btn</code> to wrap the buttons. This is required due to default browser styles that cannot be overridden.</p>
     <form class="bs-docs-example">
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <span class="input-group-btn">
           <button class="btn" type="button">Go!</button>
         </span>
         <input type="text">
       </div>
       <br>
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <input type="text">
         <span class="input-group-btn">
           <button class="btn" type="button">Go!</button>
@@ -1782,14 +1782,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       </div>
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <span class="input-group-btn">
     <button class="btn" type="button">Go!</button>
   </span>
   <input type="text">
 </div>
 
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <input type="text">
   <span class="input-group-btn">
     <button class="btn" type="button">Go!</button>
@@ -1800,7 +1800,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h4>Button dropdowns</h4>
     <p></p>
     <form class="bs-docs-example">
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <div class="input-group-btn">
           <button class="btn dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
           <ul class="dropdown-menu">
@@ -1814,7 +1814,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
         <input type="text">
       </div><!-- /input-group -->
       <br>
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <input type="text">
         <div class="input-group-btn">
           <button class="btn dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
@@ -1829,7 +1829,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       </div><!-- /input-group -->
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <div class="input-group-btn">
     <button class="btn dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
     <ul class="dropdown-menu">
@@ -1843,7 +1843,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   <input type="text">
 </div><!-- /input-group -->
 
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <input type="text">
   <div class="input-group-btn">
     <button class="btn dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button>
@@ -1860,7 +1860,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 
     <h4>Segmented dropdown groups</h4>
     <form class="bs-docs-example">
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <div class="input-group-btn">
           <button class="btn" tabindex="-1">Action</button>
           <button class="btn dropdown-toggle" data-toggle="dropdown" tabindex="-1">
@@ -1879,7 +1879,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 
       <br>
 
-      <div class="input-group col col-lg-7">
+      <div class="input-group col-lg-7">
         <input type="text">
         <div class="input-group-btn">
           <button class="btn" tabindex="-1">Action</button>
@@ -1897,14 +1897,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       </div>
     </form>
 {% highlight html %}
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <div class="input-group-btn">
     <!-- Button and dropdown menu -->
   </div>
   <input type="text">
 </div>
 
-<div class="input-group col col-lg-7">
+<div class="input-group col-lg-7">
   <input type="text">
   <div class="input-group-btn btn-group">
     <!-- Button and dropdown menu -->
@@ -1934,27 +1934,27 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Wrap inputs in grid columns, or any custom parent element, to easily enforce desired widths.</p>
     <form class="bs-docs-example" style="padding-bottom: 15px;">
       <div class="row">
-        <div class="col col-lg-2">
-          <input type="text" placeholder="col col-large-2">
+        <div class="col-lg-2">
+          <input type="text" placeholder="col-large-2">
         </div>
-        <div class="col col-lg-3">
-          <input type="text" placeholder="col col-large-3">
+        <div class="col-lg-3">
+          <input type="text" placeholder="col-large-3">
         </div>
-        <div class="col col-lg-4">
-          <input type="text" placeholder="col col-large-4">
+        <div class="col-lg-4">
+          <input type="text" placeholder="col-large-4">
         </div>
       </div>
     </form>
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-2">
-    <input type="text" placeholder="col col-large-2">
+  <div class="col-lg-2">
+    <input type="text" placeholder="col-large-2">
   </div>
-  <div class="col col-lg-3">
-    <input type="text" placeholder="col col-large-3">
+  <div class="col-lg-3">
+    <input type="text" placeholder="col-large-3">
   </div>
-  <div class="col col-lg-4">
-    <input type="text" placeholder="col col-large-4">
+  <div class="col-lg-4">
+    <input type="text" placeholder="col-large-4">
   </div>
 </div>
 {% endhighlight %}
@@ -2651,7 +2651,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
         <div class="controls">
           <div class="input-group">
             <span class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></span>
-            <input class="col col-lg-2" id="inputIcon" type="text">
+            <input class="col-lg-2" id="inputIcon" type="text">
           </div>
         </div>
       </div>
@@ -2662,7 +2662,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   <div class="controls">
     <div class="input-group">
       <span class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></span>
-      <input class="col col-lg-2" id="inputIcon" type="text">
+      <input class="col-lg-2" id="inputIcon" type="text">
     </div>
   </div>
 </div>
@@ -3685,7 +3685,7 @@ body {
               </li>
             </ul>
             <form class="navbar-form pull-left" action="">
-              <input type="text" class="col col-lg-8" placeholder="Search">
+              <input type="text" class="col-lg-8" placeholder="Search">
             </form>
             <ul class="nav navbar-nav pull-right">
               <li><a href="#">Link</a></li>
@@ -3762,7 +3762,7 @@ body {
               </li>
             </ul>
             <form class="navbar-form pull-left" action="">
-              <input type="text" class="col col-lg-8" placeholder="Search">
+              <input type="text" class="col-lg-8" placeholder="Search">
             </form>
             <ul class="nav navbar-nav pull-right">
               <li><a href="#">Link</a></li>
@@ -4152,22 +4152,22 @@ body {
     <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
     <div class="bs-docs-example">
       <div class="row">
-        <div class="col col-lg-3">
+        <div class="col-lg-3">
           <a href="#" class="thumbnail">
             <img data-src="holder.js/260x180" alt="">
           </a>
         </div>
-        <div class="col col-lg-3">
+        <div class="col-lg-3">
           <a href="#" class="thumbnail">
             <img data-src="holder.js/260x180" alt="">
           </a>
         </div>
-        <div class="col col-lg-3">
+        <div class="col-lg-3">
           <a href="#" class="thumbnail">
             <img data-src="holder.js/260x180" alt="">
           </a>
         </div>
-        <div class="col col-lg-3">
+        <div class="col-lg-3">
           <a href="#" class="thumbnail">
             <img data-src="holder.js/260x180" alt="">
           </a>
@@ -4176,7 +4176,7 @@ body {
     </div><!-- /.bs-docs-example -->
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-3">
+  <div class="col-lg-3">
     <a href="#" class="thumbnail">
       <img data-src="holder.js/260x180" alt="">
     </a>
@@ -4189,7 +4189,7 @@ body {
     <p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p>
     <div class="bs-docs-example">
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <div class="thumbnail">
             <img data-src="holder.js/300x200" alt="">
             <div class="caption">
@@ -4199,7 +4199,7 @@ body {
             </div>
           </div>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <div class="thumbnail">
             <img data-src="holder.js/300x200" alt="">
             <div class="caption">
@@ -4209,7 +4209,7 @@ body {
             </div>
           </div>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <div class="thumbnail">
             <img data-src="holder.js/300x200" alt="">
             <div class="caption">
@@ -4223,7 +4223,7 @@ body {
     </div><!-- /.bs-docs-example -->
 {% highlight html %}
 <div class="row">
-  <div class="col col-lg-3">
+  <div class="col-lg-3">
     <div class="thumbnail">
       <img data-src="holder.js/300x200" alt="">
       <div class="caption">
@@ -6578,7 +6578,7 @@ $('.carousel').carousel({
             <h2>Example</h2>
             <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
             <div class="bs-docs-example" style="background-color: #f5f5f5;">
-              <input type="text" class="col col-lg-3" style="margin: 0 auto;" data-provide="typeahead" data-items="4" data-source='["Alabama","Alaska","Arizona","Arkansas","California","Colorado","Connecticut","Delaware","Florida","Georgia","Hawaii","Idaho","Illinois","Indiana","Iowa","Kansas","Kentucky","Louisiana","Maine","Maryland","Massachusetts","Michigan","Minnesota","Mississippi","Missouri","Montana","Nebraska","Nevada","New Hampshire","New Jersey","New Mexico","New York","North Dakota","North Carolina","Ohio","Oklahoma","Oregon","Pennsylvania","Rhode Island","South Carolina","South Dakota","Tennessee","Texas","Utah","Vermont","Virginia","Washington","West Virginia","Wisconsin","Wyoming"]'>
+              <input type="text" class="col-lg-3" style="margin: 0 auto;" data-provide="typeahead" data-items="4" data-source='["Alabama","Alaska","Arizona","Arkansas","California","Colorado","Connecticut","Delaware","Florida","Georgia","Hawaii","Idaho","Illinois","Indiana","Iowa","Kansas","Kentucky","Louisiana","Maine","Maryland","Massachusetts","Michigan","Minnesota","Mississippi","Missouri","Montana","Nebraska","Nevada","New Hampshire","New Jersey","New Mexico","New York","North Dakota","North Carolina","Ohio","Oklahoma","Oregon","Pennsylvania","Rhode Island","South Carolina","South Dakota","Tennessee","Texas","Utah","Vermont","Virginia","Washington","West Virginia","Wisconsin","Wyoming"]'>
             </div><!-- /example -->
 {% highlight html %}
 <input type="text" data-provide="typeahead">
diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index a3c9cb9851..7719e804b8 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -323,19 +323,19 @@ body {
 
   <!-- Three columns of text below the carousel -->
   <div class="row">
-    <div class="col col-lg-4">
+    <div class="col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
       <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
     </div><!-- /.col-lg-4 -->
-    <div class="col col-lg-4">
+    <div class="col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
       <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
     </div><!-- /.col-lg-4 -->
-    <div class="col col-lg-4">
+    <div class="col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
diff --git a/docs/examples/grid.html b/docs/examples/grid.html
index d14602e4ec..98dd760da5 100644
--- a/docs/examples/grid.html
+++ b/docs/examples/grid.html
@@ -37,22 +37,22 @@ title: Grid template
 
   <h4>Three equal columns</h4>
   <div class="row">
-    <div class="col col-lg-4">.col .col-lg-4</div>
-    <div class="col col-lg-4">.col .col-lg-4</div>
-    <div class="col col-lg-4">.col .col-lg-4</div>
+    <div class="col-lg-4">.col-lg-4</div>
+    <div class="col-lg-4">.col-lg-4</div>
+    <div class="col-lg-4">.col-lg-4</div>
   </div>
 
   <h4>Three unequal columns</h4>
   <div class="row">
-    <div class="col col-lg-3">.col .col-lg-3</div>
-    <div class="col col-lg-6">.col .col-lg-6</div>
-    <div class="col col-lg-3">.col .col-lg-3</div>
+    <div class="col-lg-3">.col-lg-3</div>
+    <div class="col-lg-6">.col-lg-6</div>
+    <div class="col-lg-3">.col-lg-3</div>
   </div>
 
   <h4>Two columns</h4>
   <div class="row">
-    <div class="col col-lg-8">.col .col-lg-8</div>
-    <div class="col col-lg-4">.col .col-lg-4</div>
+    <div class="col-lg-8">.col-lg-8</div>
+    <div class="col-lg-4">.col-lg-4</div>
   </div>
 
   <h4>Full width, single column</h4>
@@ -60,14 +60,14 @@ title: Grid template
 
   <h4>Two columns with two nested columns</h4>
   <div class="row">
-    <div class="col col-lg-8">
-      .col .col-lg-8
+    <div class="col-lg-8">
+      .col-lg-8
       <div class="row">
-        <div class="col col-lg-6">.col .col-lg-6</div>
-        <div class="col col-lg-6">.col .col-lg-6</div>
+        <div class="col-lg-6">.col-lg-6</div>
+        <div class="col-lg-6">.col-lg-6</div>
       </div>
     </div>
-    <div class="col col-lg-4">.col .col-lg-4</div>
+    <div class="col-lg-4">.col-lg-4</div>
   </div>
 
 
diff --git a/docs/examples/jumbotron-narrow.html b/docs/examples/jumbotron-narrow.html
index a6fd4e9503..b94b000962 100644
--- a/docs/examples/jumbotron-narrow.html
+++ b/docs/examples/jumbotron-narrow.html
@@ -104,7 +104,7 @@ title: Narrow page template
   </div>
 
   <div class="row marketing">
-    <div class="col col-lg-6">
+    <div class="col-lg-6">
       <h4>Subheading</h4>
       <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
 
@@ -115,7 +115,7 @@ title: Narrow page template
       <p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
     </div>
 
-    <div class="col col-lg-6">
+    <div class="col-lg-6">
       <h4>Subheading</h4>
       <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
 
diff --git a/docs/examples/jumbotron.html b/docs/examples/jumbotron.html
index af2952dbda..897313449d 100644
--- a/docs/examples/jumbotron.html
+++ b/docs/examples/jumbotron.html
@@ -85,17 +85,17 @@ title: Jumbotron template
 
     <!-- Example row of columns -->
     <div class="row">
-      <div class="col col-lg-4">
+      <div class="col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
       </div>
-      <div class="col col-lg-4">
+      <div class="col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
      </div>
-      <div class="col col-lg-4">
+      <div class="col-lg-4">
         <h2>Heading</h2>
         <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
         <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html
index afc03a1a85..edf8cfae62 100644
--- a/docs/examples/justified-nav.html
+++ b/docs/examples/justified-nav.html
@@ -118,17 +118,17 @@ title: Justified nav template
 
     <!-- Example row of columns -->
     <div class="row">
-      <div class="col col-lg-4">
+      <div class="col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
       </div>
-      <div class="col col-lg-4">
+      <div class="col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
      </div>
-      <div class="col col-lg-4">
+      <div class="col-lg-4">
         <h2>Heading</h2>
         <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.</p>
         <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index b34ed831dd..018c8ed0a0 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -118,21 +118,21 @@ bootstrap/
     <h3 id="examples-list">Examples</h3>
     <div class="bs-examples">
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-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 page with Bootstrap's CSS and JavaScript included.</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <a class="thumbnail" href="/examples/grid/" target="_blank">
             <img src="/assets/img/examples/bootstrap-example-grid.png" alt="">
           </a>
           <h4>Basic grid layouts</h4>
           <p>Simple grid layouts to familiarize you with using the Bootstrap grid system.</p>
         </div>
-        <div class="col col-lg-4">
+        <div class="col-lg-4">
           <a class="thumbnail" href="/examples/jumbotron/" target="_blank">
             <img src="/assets/img/examples/bootstrap-example-marketing.png" alt="">
           </a>
@@ -141,21 +141,21 @@ bootstrap/
         </div>
       </div>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-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="col col-lg-4">
+        <div class="col-lg-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="col col-lg-4">
+        <div class="col-lg-4">
           <a class="thumbnail" href="/examples/signin/" target="_blank">
             <img src="/assets/img/examples/bootstrap-example-signin.png" alt="">
           </a>
@@ -164,21 +164,21 @@ bootstrap/
         </div>
       </div>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-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="col col-lg-4">
+        <div class="col-lg-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="col col-lg-4">
+        <div class="col-lg-4">
           <a class="thumbnail" href="/examples/carousel/" target="_blank">
             <img src="/assets/img/examples/bootstrap-example-carousel.png" alt="">
           </a>
@@ -187,21 +187,21 @@ bootstrap/
         </div>
       </div>
       <div class="row">
-        <div class="col col-lg-4">
+        <div class="col-lg-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="col col-lg-4">
+        <div class="col-lg-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="col col-lg-4">
+        <div class="col-lg-4">
           <a class="thumbnail" href="/examples/navbar-fixed-top/" target="_blank">
             <img src="/assets/img/examples/bootstrap-example-navbar-fixed-top.png" alt="">
           </a>