Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

8 files changed, 66 insertions, 36 deletions

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 75e0838e3..7719e804b 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -236,11 +236,11 @@ body {
 
     <div class="navbar navbar-inverse navbar-static-top">
       <div class="container">
-	    <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+	    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
 	      <span class="icon-bar"></span>
 	      <span class="icon-bar"></span>
 	      <span class="icon-bar"></span>
-	    </a>
+	    </button>
         <a class="navbar-brand" href="#">Project name</a>
         <div class="nav-collapse collapse">
           <ul class="nav navbar-nav">
@@ -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 d14602e4e..14e8ecdf6 100644
--- a/docs/examples/grid.html
+++ b/docs/examples/grid.html
@@ -24,8 +24,8 @@ title: Grid template
   [class*="col-lg-"] {
     padding-top: 15px;
     padding-bottom: 15px;
-    background-color: #f5f5f5;
-    border: 1px solid #e5e5e5;
+    background-color: rgba(185,74,72,.15);
+    border: 1px solid rgba(185,74,72,.2);
   }
 </style>
 
@@ -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,44 @@ 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>
+
+  <h4>Mixed: mobile and desktop</h4>
+  <div class="row">
+    <div class="col-12 col-lg-8">.col-12 .col-lg-8</div>
+    <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+  </div>
+  <div class="row">
+    <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+    <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+    <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+  </div>
+  <div class="row">
+    <div class="col-6 col-lg-6">.col-6 .col-lg-6</div>
+    <div class="col-6 col-lg-6">.col-6 .col-lg-6</div>
+  </div>
+
+  <h4>Mixed: mobile, tablet, and desktop</h4>
+  <div class="row">
+    <div class="col-12 col-sm-8 col-lg-8">.col-12 .col-lg-8</div>
+    <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
+  </div>
+  <div class="row">
+    <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
+    <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
+    <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
+  </div>
+  <div class="row">
+    <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div>
+    <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div>
   </div>
 
 
diff --git a/docs/examples/jumbotron-narrow.html b/docs/examples/jumbotron-narrow.html
index a6fd4e950..b94b00096 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 3627f7ef4..897313449 100644
--- a/docs/examples/jumbotron.html
+++ b/docs/examples/jumbotron.html
@@ -39,11 +39,11 @@ title: Jumbotron template
 
 <div class="navbar navbar-inverse navbar-fixed-top">
   <div class="container">
-    <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
-    </a>
+    </button>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
       <ul class="nav navbar-nav">
@@ -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 afc03a1a8..edf8cfae6 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/examples/navbar-fixed-top.html b/docs/examples/navbar-fixed-top.html
index d56cadfac..2f73f08e4 100644
--- a/docs/examples/navbar-fixed-top.html
+++ b/docs/examples/navbar-fixed-top.html
@@ -20,11 +20,11 @@ title: Fixed navbar template
     <!-- Fixed navbar -->
     <div class="navbar navbar-fixed-top">
       <div class="container">
-        <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
-        </a>
+        </button>
         <a class="navbar-brand" href="#">Project name</a>
         <div class="nav-collapse collapse">
           <ul class="nav navbar-nav">
diff --git a/docs/examples/navbar-static-top.html b/docs/examples/navbar-static-top.html
index 065d16d5f..f22746900 100644
--- a/docs/examples/navbar-static-top.html
+++ b/docs/examples/navbar-static-top.html
@@ -16,11 +16,11 @@ title: Static navbar template
 <!-- Static navbar -->
 <div class="navbar navbar-static-top">
   <div class="container">
-    <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
-    </a>
+    </button>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
       <ul class="nav navbar-nav">
diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html
index 4c0f9938b..f8b25482e 100644
--- a/docs/examples/navbar.html
+++ b/docs/examples/navbar.html
@@ -22,11 +22,11 @@ title: Navbar template
   <!-- Static navbar -->
   <div class="navbar">
     <div class="container">
-      <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
-      </a>
+      </button>
       <a class="navbar-brand" href="#">Project name</a>
       <div class="nav-collapse collapse">
         <ul class="nav navbar-nav">