Merge branch '3.0.0-wip' into bs3-flatten

1 files changed, 59 insertions, 138 deletions

diff --git a/docs/components.html b/docs/components.html
index 4f49688f5..20ac32133 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1189,29 +1189,25 @@
           <h2>Standard pagination</h2>
           <p>Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.</p>
           <div class="bs-docs-example">
-            <div class="pagination">
-              <ul>
-                <li><a href="#">&laquo;</a></li>
-                <li><a href="#">1</a></li>
-                <li><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li><a href="#">&raquo;</a></li>
-              </ul>
-            </div>
+            <ul class="pagination">
+              <li><a href="#">&laquo;</a></li>
+              <li><a href="#">1</a></li>
+              <li><a href="#">2</a></li>
+              <li><a href="#">3</a></li>
+              <li><a href="#">4</a></li>
+              <li><a href="#">5</a></li>
+              <li><a href="#">&raquo;</a></li>
+            </ul>
           </div>
 <pre class="prettyprint linenums">
-&lt;div class="pagination"&gt;
-  &lt;ul&gt;
-    &lt;li&gt;&lt;a href="#"&gt;Prev&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="#"&gt;1&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="#"&gt;2&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="#"&gt;3&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="#"&gt;4&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="#"&gt;Next&lt;/a&gt;&lt;/li&gt;
-  &lt;/ul&gt;
-&lt;/div&gt;
+&lt;ul class="pagination"&gt;
+  &lt;li&gt;&lt;a href="#"&gt;Prev&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#"&gt;1&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#"&gt;2&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#"&gt;3&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#"&gt;4&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#"&gt;Next&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
 </pre>
 
 
@@ -1223,43 +1219,37 @@
           <h3>Disabled and active states</h3>
           <p>Links are customizable for different circumstances. Use <code>.disabled</code> for unclickable links and <code>.active</code> to indicate the current page.</p>
           <div class="bs-docs-example">
-            <div class="pagination pagination-centered">
-              <ul>
-                <li class="disabled"><a href="#">&laquo;</a></li>
-                <li class="active"><a href="#">1</a></li>
-                <li><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li><a href="#">&raquo;</a></li>
-             </ul>
-            </div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="pagination"&gt;
-  &lt;ul&gt;
-    &lt;li class="disabled"&gt;&lt;a href="#"&gt;Prev&lt;/a&gt;&lt;/li&gt;
-    &lt;li class="active"&gt;&lt;a href="#"&gt;1&lt;/a&gt;&lt;/li&gt;
-    ...
-  &lt;/ul&gt;
-&lt;/div&gt;
+            <ul class="pagination">
+              <li class="disabled"><a href="#">&laquo;</a></li>
+              <li class="active"><a href="#">1</a></li>
+              <li><a href="#">2</a></li>
+              <li><a href="#">3</a></li>
+              <li><a href="#">4</a></li>
+              <li><a href="#">5</a></li>
+              <li><a href="#">&raquo;</a></li>
+           </ul>
+          </div>
+<pre class="prettyprint linenums">
+&lt;ul class="pagination"&gt;
+  &lt;li class="disabled"&gt;&lt;a href="#"&gt;Prev&lt;/a&gt;&lt;/li&gt;
+  &lt;li class="active"&gt;&lt;a href="#"&gt;1&lt;/a&gt;&lt;/li&gt;
+  ...
+&lt;/ul&gt;
 </pre>
           <p>You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.</p>
 <pre class="prettyprint linenums">
-&lt;div class="pagination"&gt;
-  &lt;ul&gt;
-    &lt;li class="disabled"&gt;&lt;span&gt;Prev&lt;/span&gt;&lt;/li&gt;
-    &lt;li class="active"&gt;&lt;span&gt;1&lt;/span&gt;&lt;/li&gt;
-    ...
-  &lt;/ul&gt;
-&lt;/div&gt;
+&lt;ul class="pagination"&gt;
+  &lt;li class="disabled"&gt;&lt;span&gt;Prev&lt;/span&gt;&lt;/li&gt;
+  &lt;li class="active"&gt;&lt;span&gt;1&lt;/span&gt;&lt;/li&gt;
+  ...
+&lt;/ul&gt;
 </pre>
 
           <h3>Sizes</h3>
           <p>Fancy larger or smaller pagination? Add <code>.pagination-large</code>, <code>.pagination-small</code>, or <code>.pagination-mini</code> for additional sizes.</p>
           <div class="bs-docs-example">
-            <div class="pagination pagination-large">
-              <ul>
+            <div>
+              <ul class="pagination pagination-large">
                 <li><a href="#">&laquo;</a></li>
                 <li><a href="#">1</a></li>
                 <li><a href="#">2</a></li>
@@ -1269,19 +1259,8 @@
                 <li><a href="#">&raquo;</a></li>
               </ul>
             </div>
-            <div class="pagination">
-              <ul>
-                <li><a href="#">&laquo;</a></li>
-                <li><a href="#">1</a></li>
-                <li><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li><a href="#">&raquo;</a></li>
-             </ul>
-            </div>
-            <div class="pagination pagination-small">
-              <ul>
+            <div>
+              <ul class="pagination">
                 <li><a href="#">&laquo;</a></li>
                 <li><a href="#">1</a></li>
                 <li><a href="#">2</a></li>
@@ -1291,8 +1270,8 @@
                 <li><a href="#">&raquo;</a></li>
               </ul>
             </div>
-            <div class="pagination pagination-mini">
-              <ul>
+            <div>
+              <ul class="pagination pagination-small">
                 <li><a href="#">&laquo;</a></li>
                 <li><a href="#">1</a></li>
                 <li><a href="#">2</a></li>
@@ -1302,53 +1281,8 @@
                 <li><a href="#">&raquo;</a></li>
               </ul>
             </div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="pagination pagination-large"&gt;
-  &lt;ul&gt;
-    ...
-  &lt;/ul&gt;
-&lt;/div&gt;
-&lt;div class="pagination"&gt;
-  &lt;ul&gt;
-    ...
-  &lt;/ul&gt;
-&lt;/div&gt;
-&lt;div class="pagination pagination-small"&gt;
-  &lt;ul&gt;
-    ...
-  &lt;/ul&gt;
-&lt;/div&gt;
-&lt;div class="pagination pagination-mini"&gt;
-  &lt;ul&gt;
-    ...
-  &lt;/ul&gt;
-&lt;/div&gt;
-</pre>
-
-          <h3>Alignment</h3>
-          <p>Add one of two optional classes to change the alignment of pagination links: <code>.pagination-centered</code> and <code>.pagination-right</code>.</p>
-          <div class="bs-docs-example">
-            <div class="pagination pagination-centered">
-              <ul>
-                <li><a href="#">&laquo;</a></li>
-                <li><a href="#">1</a></li>
-                <li><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li><a href="#">&raquo;</a></li>
-             </ul>
-            </div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="pagination pagination-centered"&gt;
-  ...
-&lt;/div&gt;
-</pre>
-          <div class="bs-docs-example">
-            <div class="pagination pagination-right">
-              <ul>
+            <div>
+              <ul class="pagination pagination-mini">
                 <li><a href="#">&laquo;</a></li>
                 <li><a href="#">1</a></li>
                 <li><a href="#">2</a></li>
@@ -1360,9 +1294,18 @@
             </div>
           </div>
 <pre class="prettyprint linenums">
-&lt;div class="pagination pagination-right"&gt;
+&lt;ul class="pagination pagination-large"&gt;
   ...
-&lt;/div&gt;
+&lt;/ul&gt;
+&lt;ul class="pagination"&gt;
+  ...
+&lt;/ul&gt;
+&lt;ul class="pagination pagination-small"&gt;
+  ...
+&lt;/ul&gt;
+&lt;ul class="pagination pagination-mini"&gt;
+  ...
+&lt;/ul&gt;
 </pre>
 
 
@@ -1478,7 +1421,7 @@
               </tr>
               <tr>
                 <td>
-                  Important
+                  Danger
                 </td>
                 <td>
                   <span class="badge badge-danger">6</span>
@@ -1487,28 +1430,6 @@
                   <code>&lt;span class="badge badge-danger"&gt;6&lt;/span&gt;</code>
                 </td>
               </tr>
-              <tr>
-                <td>
-                  Info
-                </td>
-                <td>
-                  <span class="badge badge-info">8</span>
-                </td>
-                <td>
-                  <code>&lt;span class="badge badge-info"&gt;8&lt;/span&gt;</code>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  Inverse
-                </td>
-                <td>
-                  <span class="badge badge-inverse">10</span>
-                </td>
-                <td>
-                  <code>&lt;span class="badge badge-inverse"&gt;10&lt;/span&gt;</code>
-                </td>
-              </tr>
             </tbody>
           </table>
 
@@ -2138,7 +2059,7 @@ class="muted"
 </pre>
 
           <h4>.clearfix</h4>
-          <p>Clear the <code>float</code> on any element.</p>
+          <p>Clear the <code>float</code> on any element. Utilizes <a href="http://nicolasgallagher.com/micro-clearfix-hack/">the micro clearfix</a> as popularized by Nicolas Gallagher.</p>
 <pre class="prettyprint linenums">
 class="clearfix"
 </pre>