Merge branch '3.0.0-wip' into bs3_makefile_separated_done

Conflicts:
	Makefile

1 files changed, 125 insertions, 48 deletions

diff --git a/docs/components.html b/docs/components.html
index b80eb6e71..5727a1759 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -28,7 +28,8 @@ title: Components
           <li><a href="#navbar"><i class="glyphicon glyphicon-chevron-right"></i> Navbar</a></li>
           <li><a href="#breadcrumbs"><i class="glyphicon glyphicon-chevron-right"></i> Breadcrumbs</a></li>
           <li><a href="#pagination"><i class="glyphicon glyphicon-chevron-right"></i> Pagination</a></li>
-          <li><a href="#counters"><i class="glyphicon glyphicon-chevron-right"></i> Counters</a></li>
+          <li><a href="#labels"><i class="glyphicon glyphicon-chevron-right"></i> Labels</a></li>
+          <li><a href="#badges"><i class="glyphicon glyphicon-chevron-right"></i> Badges</a></li>
           <li><a href="#typography"><i class="glyphicon glyphicon-chevron-right"></i> Typography</a></li>
           <li><a href="#thumbnails"><i class="glyphicon glyphicon-chevron-right"></i> Thumbnails</a></li>
           <li><a href="#alerts"><i class="glyphicon glyphicon-chevron-right"></i> Alerts</a></li>
@@ -765,7 +766,7 @@ title: Components
           <p>To start, navbars are static (not fixed to the top) and include support for a project name and basic navigation. Place one anywhere within a <code>.container</code>, which sets the width of your site and content.</p>
           <div class="bs-docs-example">
             <div class="navbar">
-              <a class="brand" href="#">Title</a>
+              <a class="navbar-brand" href="#">Title</a>
               <ul class="nav">
                 <li class="active"><a href="#">Home</a></li>
                 <li><a href="#">Link</a></li>
@@ -775,7 +776,7 @@ title: Components
           </div><!-- /example -->
 {% highlight html linenos %}
 <div class="navbar">
-  <a class="brand" href="#">Title</a>
+  <a class="navbar-brand" href="#">Title</a>
   <ul class="nav">
     <li class="active"><a href="#">Home</a></li>
     <li><a href="#">Link</a></li>
@@ -790,11 +791,11 @@ title: Components
           <p>A simple link to show your brand or project name only requires an anchor tag.</p>
           <div class="bs-docs-example">
             <div class="navbar">
-              <a class="brand" href="#">Title</a>
+              <a class="navbar-brand" href="#">Title</a>
             </div>
           </div><!-- /example -->
 {% highlight html linenos %}
-<a class="brand" href="#">Title</a>
+<a class="navbar-brand" href="#">Title</a>
 {% endhighlight %}
 
           <h3>Nav links</h3>
@@ -804,7 +805,7 @@ title: Components
               <ul class="nav">
                 <li class="active"><a href="#">Home</a></li>
                 <li><a href="#">Link</a></li>
-                <li><a href="#">Link</a></li>
+                <li class="disabled"><a href="#">Disabled</a></li>
               </ul>
             </div>
           </div><!-- /example -->
@@ -812,22 +813,20 @@ title: Components
 <ul class="nav">
   <li class="active"><a href="#">Home</a></li>
   <li><a href="#">Link</a></li>
-  <li><a href="#">Link</a></li>
+  <li class="disabled"><a href="#">Disabled</a></li>
 </ul>
 {% endhighlight %}
           <p>You can easily add dividers to your nav links with an empty list item and a simple class. Just add the appropriate class to <code>&lt;li&gt;</code> elements between links. Dividers will be horizontal to start, but at resolutions above 768px they become vertical with the navigation.</p>
           <div class="bs-docs-example">
             <div class="navbar">
-              <div class="navbar-inner">
-                <ul class="nav">
-                  <li class="active"><a href="#">Home</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Link</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Link</a></li>
-                  <li class="divider"></li>
-                </ul>
-              </div>
+              <ul class="nav">
+                <li class="active"><a href="#">Home</a></li>
+                <li class="divider"></li>
+                <li><a href="#">Link</a></li>
+                <li class="divider"></li>
+                <li><a href="#">Link</a></li>
+                <li class="divider"></li>
+              </ul>
             </div>
           </div><!-- /example -->
 {% highlight html linenos %}
@@ -871,9 +870,9 @@ title: Components
           <h3>Fixed to top</h3>
           <p>Add <code>.navbar-fixed-top</code> and remember to account for the hidden area underneath it by adding at least 40px <code>padding</code> to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p>
           <div class="bs-docs-example bs-navbar-top-example">
-            <div class="navbar navbar-fixed-top" style="position: absolute;">
+            <div class="navbar navbar-fixed-top" style="position: absolute; top: -1px;">
               <div class="container" style="width: auto;">
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                 <ul class="nav">
                   <li class="active"><a href="#">Home</a></li>
                   <li><a href="#">Link</a></li>
@@ -891,9 +890,9 @@ title: Components
           <h3>Fixed to bottom</h3>
           <p>Add <code>.navbar-fixed-bottom</code> instead.</p>
           <div class="bs-docs-example bs-navbar-bottom-example">
-            <div class="navbar navbar-fixed-bottom" style="position: absolute;">
+            <div class="navbar navbar-fixed-bottom" style="position: absolute; bottom: -1px;">
               <div class="container" style="width: auto;">
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                 <ul class="nav">
                   <li class="active"><a href="#">Home</a></li>
                   <li><a href="#">Link</a></li>
@@ -913,7 +912,7 @@ title: Components
           <div class="bs-docs-example bs-navbar-top-example">
             <div class="navbar navbar-static-top" style="margin: -1px -1px 0;">
               <div class="container" style="width: auto;">
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                 <ul class="nav">
                   <li class="active"><a href="#">Home</a></li>
                   <li><a href="#">Link</a></li>
@@ -930,16 +929,16 @@ title: Components
 
 
           <h2>Responsive navbar</h2>
-          <p>To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.</p>
+          <p>To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.navbar-toggle</code>.</p>
           <div class="bs-docs-example">
             <div class="navbar">
               <div class="container">
-                <a class="btn btn-navbar" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+                <a class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
                 </a>
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                 <div class="nav-collapse collapse navbar-responsive-collapse">
                   <ul class="nav">
                     <li class="active"><a href="#">Home</a></li>
@@ -958,8 +957,8 @@ title: Components
                       </ul>
                     </li>
                   </ul>
-                  <form class="navbar-search pull-left" action="">
-                    <input type="text" class="search-query span2" placeholder="Search">
+                  <form class="navbar-form pull-left" action="">
+                    <input type="text" class="span8" placeholder="Search">
                   </form>
                   <ul class="nav pull-right">
                     <li><a href="#">Link</a></li>
@@ -983,15 +982,15 @@ title: Components
 <div class="navbar">
   <div class="container">
 
-    <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-    <a class="btn btn-navbar" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+    <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
+    <a class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
     </a>
 
     <!-- Be sure to leave the brand out there if you want it shown -->
-    <a class="brand" href="#">Title</a>
+    <a class="navbar-brand" href="#">Title</a>
 
     <!-- Place everything within .navbar-collapse to hide it until above 768px -->
     <div class="nav-collapse collapse navbar-responsive-collapse">
@@ -1011,12 +1010,12 @@ title: Components
           <div class="bs-docs-example">
             <div class="navbar navbar-inverse" style="position: static;">
               <div class="container">
-                <a class="btn btn-navbar" data-toggle="collapse" data-target=".navbar-inverse-collapse">
+                <a class="navbar-toggle" data-toggle="collapse" data-target=".navbar-inverse-collapse">
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
                 </a>
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                 <div class="nav-collapse collapse navbar-inverse-collapse">
                   <ul class="nav">
                     <li class="active"><a href="#">Home</a></li>
@@ -1035,8 +1034,8 @@ title: Components
                       </ul>
                     </li>
                   </ul>
-                  <form class="navbar-search pull-left" action="">
-                    <input type="text" class="search-query span2" placeholder="Search">
+                  <form class="navbar-form pull-left" action="">
+                    <input type="text" class="span8" placeholder="Search">
                   </form>
                   <ul class="nav pull-right">
                     <li><a href="#">Link</a></li>
@@ -1274,44 +1273,122 @@ title: Components
 
 
 
-        <!-- Counters
+        <!-- Labels
+        ================================================== -->
+        <section id="labels">
+          <div class="page-header">
+            <h1>Labels</h1>
+          </div>
+          <p class="lead"></p>
+
+          <h3>Example</h3>
+          <div class="bs-docs-example">
+            <h1>Example heading <span class="label">New</span></h1>
+            <h2>Example heading <span class="label">New</span></h2>
+            <h3>Example heading <span class="label">New</span></h3>
+            <h4>Example heading <span class="label">New</span></h4>
+            <h5>Example heading <span class="label">New</span></h5>
+            <h6>Example heading <span class="label">New</span></h6>
+          </div>
+{% highlight html linenos %}
+<h3>Example heading <span class="label">New</span></h3>
+{% endhighlight %}
+
+          <h3>Available variations</h3>
+          <p>Add any of the below mentioned modifier classes to change the appearance of a label.</p>
+          <table class="table table-bordered table-striped">
+            <thead>
+              <tr>
+                <th>Labels</th>
+                <th>Markup</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>
+                  <span class="label">Default</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label"&gt;Default&lt;/span&gt;</code>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span class="label label-success">Success</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label label-success"&gt;Success&lt;/span&gt;</code>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span class="label label-warning">Warning</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label label-warning"&gt;Warning&lt;/span&gt;</code>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span class="label label-danger">Danger</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label label-danger"&gt;Danger&lt;/span&gt;</code>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span class="label label-info">Info</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label label-info"&gt;Info&lt;/span&gt;</code>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+        </section>
+
+
+
+        <!-- Badges
         ================================================== -->
-        <section id="counters">
+        <section id="badges">
           <div class="page-header">
-            <h1>Counters</h1>
+            <h1>Badges</h1>
           </div>
-          <p class="lead">Easily highlight new or unread items by adding a <code>&lt;span class="counter"&gt;</code> to links, Bootstrap navs, and more.</p>
+          <p class="lead">Easily highlight new or unread items by adding a <code>&lt;span class="badge"&gt;</code> to links, Bootstrap navs, and more.</p>
 
           <div class="bs-docs-example">
-            <a href="#">Inbox <span class="counter">42</span></a>
+            <a href="#">Inbox <span class="badge">42</span></a>
           </div>
 {% highlight html linenos %}
-<a href="#">Inbox <span class="counter">42</span></a>
+<a href="#">Inbox <span class="badge">42</span></a>
 {% endhighlight %}
 
           <h4>Self collapsing</h4>
-          <p>When there are no new or unread items, counters will simply collapse (via CSS's <code>:empty</code> selector) provided no content exists within.</p>
+          <p>When there are no new or unread items, badges will simply collapse (via CSS's <code>:empty</code> selector) provided no content exists within.</p>
 
           <h4>Adapts to active nav states</h4>
-          <p>Built-in styles are included for placing counters in active states in pill and list navigations.</p>
+          <p>Built-in styles are included for placing badges in active states in pill and list navigations.</p>
           <div class="bs-docs-example">
             <ul class="nav nav-pills">
-              <li class="active"><a href="#">Home <span class="counter">42</span></a></li>
+              <li class="active"><a href="#">Home <span class="badge">42</span></a></li>
               <li><a href="#">Profile</a></li>
-              <li><a href="#">Messages <span class="counter">3</span></a></li>
+              <li><a href="#">Messages <span class="badge">3</span></a></li>
             </ul>
             <br>
             <ul class="nav nav-list" style="max-width: 260px;">
               <li class="active">
                 <a href="#">
-                  <span class="counter pull-right">42</span>
+                  <span class="badge pull-right">42</span>
                   Home
                 </a>
               </li>
               <li><a href="#">Profile</a></li>
               <li>
                 <a href="#">
-                  <span class="counter pull-right">3</span>
+                  <span class="badge pull-right">3</span>
                   Messages
                 </a>
               </li>
@@ -1321,7 +1398,7 @@ title: Components
 <ul class="nav nav-list">
   <li class="active">
     <a href="#">
-      <span class="counter pull-right">42</span>
+      <span class="badge pull-right">42</span>
       Home
     </a>
   </li>
@@ -1380,7 +1457,7 @@ title: Components
           <div class="page-header">
             <h1>Thumbnails</h1>
           </div>
-          <p class="lead">Extend Bootstrap's <a href="./css.html#gridSystem">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
+          <p class="lead">Extend Bootstrap's <a href="./css/#gridsystem">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
 
           <h3>Default thumbnails</h3>
           <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>