Merge branch '3.0.0-wip' into bs3_navbar_overhaul

Conflicts:
	components.html
	dist/css/bootstrap.min.css

_includes/social-buttons.html

@@ -1,10 +1,10 @@
 <div class="bs-social">
   <ul class="bs-social-buttons">
     <li>
-      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20" title="Star on GitHub"></iframe>
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=watch&amp;count=true" width="100" height="20" title="Star on GitHub"></iframe>
     </li>
     <li>
-      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=fork&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102" height="20" title="Fork on GitHub"></iframe>
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=fork&amp;count=true" width="102" height="20" title="Fork on GitHub"></iframe>
     </li>
     <li class="follow-btn">
       <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>

assets/css/docs.css

@@ -416,17 +416,15 @@ body {
 }
 
 /* Typography */
-.bs-example-type .table td {
+.bs-example-type .table td:last-child {
   color: #999;
   vertical-align: middle;
 }
-.bs-example-type .table td,
+.bs-example-type .table td {
-.bs-example-type .table th {
   padding: 15px 0;
   border-color: #eee;
 }
-.bs-example-type .table tr:first-child td,
+.bs-example-type .table tr:first-child td {
-.bs-example-type .table tr:first-child th {
   border-top: 0;
 }
 .bs-example-type h1,
@@ -709,6 +707,11 @@ body {
 .bs-social-buttons .twitter-share-button {
   width: 98px !important;
 }
+/* Style the GitHub buttons via CSS instead of inline attributes */
+.github-btn {
+  border: 0;
+  overflow: hidden;
+}
 
 
 

components.html

@@ -1168,6 +1168,7 @@ base_url: "../"
   <p>Be sure to add a <code>role="navigation"</code> to every navbar to help with accessibility.</p>
 </div>
 
+
     <h2 id="navbar-optional-content">Optional navbar content</h2>
     <p>Quickly add other types of content, beyond links or forms, to a navbar with a few classes.</p>
 
@@ -1742,22 +1743,22 @@ body { padding-bottom: 70px; }
       <div class="row">
         <div class="col-lg-3">
           <a href="#" class="thumbnail">
-            <img data-src="holder.js/100%x180" alt="">
+            <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
           </a>
         </div>
         <div class="col-lg-3">
           <a href="#" class="thumbnail">
-            <img data-src="holder.js/100%x180" alt="">
+            <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
           </a>
         </div>
         <div class="col-lg-3">
           <a href="#" class="thumbnail">
-            <img data-src="holder.js/100%x180" alt="">
+            <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
           </a>
         </div>
         <div class="col-lg-3">
           <a href="#" class="thumbnail">
-            <img data-src="holder.js/100%x180" alt="">
+            <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
           </a>
         </div>
       </div>
@@ -1766,7 +1767,7 @@ body { padding-bottom: 70px; }
 <div class="row">
   <div class="col-lg-3">
     <a href="#" class="thumbnail">
-      <img data-src="holder.js/100%x180" alt="">
+      <img data-src="holder.js/100%x180" alt="...">
     </a>
   </div>
   ...
@@ -2071,7 +2072,7 @@ body { padding-bottom: 70px; }
     <div class="bs-example">
       <div class="media">
         <a class="pull-left" href="#">
-          <img class="media-object" data-src="holder.js/64x64">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
         <div class="media-body">
           <h4 class="media-heading">Media heading</h4>
@@ -2080,14 +2081,14 @@ body { padding-bottom: 70px; }
       </div>
       <div class="media">
         <a class="pull-left" href="#">
-          <img class="media-object" data-src="holder.js/64x64">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
         <div class="media-body">
           <h4 class="media-heading">Media heading</h4>
           Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
           <div class="media">
             <a class="pull-left" href="#">
-              <img class="media-object" data-src="holder.js/64x64">
+              <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
             </a>
             <div class="media-body">
               <h4 class="media-heading">Media heading</h4>
@@ -2100,7 +2101,7 @@ body { padding-bottom: 70px; }
 {% highlight html %}
 <div class="media">
   <a class="pull-left" href="#">
-    <img class="media-object" src="...">
+    <img class="media-object" src="..." alt="...">
   </a>
   <div class="media-body">
     <h4 class="media-heading">Media heading</h4>
@@ -2115,7 +2116,7 @@ body { padding-bottom: 70px; }
       <ul class="media-list">
         <li class="media">
           <a class="pull-left" href="#">
-            <img class="media-object" data-src="holder.js/64x64">
+            <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
           </a>
           <div class="media-body">
             <h4 class="media-heading">Media heading</h4>
@@ -2123,7 +2124,7 @@ body { padding-bottom: 70px; }
             <!-- Nested media object -->
             <div class="media">
               <a class="pull-left" href="#">
-                <img class="media-object" data-src="holder.js/64x64">
+                <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
               </a>
               <div class="media-body">
                 <h4 class="media-heading">Nested media heading</h4>
@@ -2131,7 +2132,7 @@ body { padding-bottom: 70px; }
                 <!-- Nested media object -->
                 <div class="media">
                   <a class="pull-left" href="#">
-                    <img class="media-object" data-src="holder.js/64x64">
+                    <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
                   </a>
                   <div class="media-body">
                     <h4 class="media-heading">Nested media heading</h4>
@@ -2143,7 +2144,7 @@ body { padding-bottom: 70px; }
             <!-- Nested media object -->
             <div class="media">
               <a class="pull-left" href="#">
-                <img class="media-object" data-src="holder.js/64x64">
+                <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
               </a>
               <div class="media-body">
                 <h4 class="media-heading">Nested media heading</h4>
@@ -2154,7 +2155,7 @@ body { padding-bottom: 70px; }
         </li>
         <li class="media">
           <a class="pull-right" href="#">
-            <img class="media-object" data-src="holder.js/64x64">
+            <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
           </a>
           <div class="media-body">
             <h4 class="media-heading">Media heading</h4>
@@ -2167,7 +2168,7 @@ body { padding-bottom: 70px; }
 <ul class="media-list">
   <li class="media">
     <a class="pull-left" href="#">
-      <img class="media-object" src="...">
+      <img class="media-object" src="..." alt="...">
     </a>
     <div class="media-body">
       <h4 class="media-heading">Media heading</h4>

css.html

@@ -585,27 +585,27 @@ base_url: "../"
       <table class="table">
         <tbody>
           <tr>
-            <th><h1>Bootstrap heading</h1></th>
+            <td><h1>Bootstrap heading</h1></td>
             <td>Semibold 38px</td>
           </tr>
           <tr>
-            <th><h2>Bootstrap heading</h2></th>
+            <td><h2>Bootstrap heading</h2></td>
             <td>Semibold 32px</td>
           </tr>
           <tr>
-            <th><h3>Bootstrap heading</h3></th>
+            <td><h3>Bootstrap heading</h3></td>
             <td>Semibold 24px</td>
           </tr>
           <tr>
-            <th><h4>Bootstrap heading</h4></th>
+            <td><h4>Bootstrap heading</h4></td>
             <td>Semibold 18px</td>
           </tr>
           <tr>
-            <th><h5>Bootstrap heading</h5></th>
+            <td><h5>Bootstrap heading</h5></td>
             <td>Semibold 16px</td>
           </tr>
           <tr>
-            <th><h6>Bootstrap heading</h6></th>
+            <td><h6>Bootstrap heading</h6></td>
             <td>Semibold 12px</td>
           </tr>
         </tbody>
@@ -1335,12 +1335,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <fieldset>
         <legend>Legend</legend>
         <div class="form-group">
-          <label for="exampleInputEmail">Email address</label>
+          <label for="exampleInputEmail1">Email address</label>
-          <input type="text" class="form-control" id="exampleInputEmail" placeholder="Enter email">
+          <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
         </div>
         <div class="form-group">
-          <label for="exampleInputPassword">Password</label>
+          <label for="exampleInputPassword1">Password</label>
-          <input type="password" class="form-control" id="exampleInputPassword" placeholder="Password">
+          <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
         </div>
         <div class="form-group">
           <label for="exampleInputFile">File input</label>
@@ -1360,12 +1360,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   <fieldset>
     <legend>Legend</legend>
     <div class="form-group">
-      <label for="exampleInputEmail">Email address</label>
+      <label for="exampleInputEmail1">Email address</label>
-      <input type="text" class="form-control" id="exampleInputEmail" placeholder="Enter email">
+      <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
     </div>
     <div class="form-group">
-      <label for="exampleInputPassword">Password</label>
+      <label for="exampleInputPassword1">Password</label>
-      <input type="password" class="form-control" id="exampleInputPassword" placeholder="Password">
+      <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
     </div>
     <div class="form-group">
       <label for="exampleInputFile">File input</label>
@@ -1395,12 +1395,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     </div>
     <form class="bs-example form-inline" role="form">
       <div class="form-group">
-        <label class="sr-only" for="exampleInputEmail">Email address</label>
+        <label class="sr-only" for="exampleInputEmail2">Email address</label>
-        <input type="text" class="form-control" id="exampleInputEmail" placeholder="Enter email">
+        <input type="text" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
       </div>
       <div class="form-group">
-        <label class="sr-only" for="exampleInputPassword">Password</label>
+        <label class="sr-only" for="exampleInputPassword2">Password</label>
-        <input type="password" class="form-control" id="exampleInputPassword" placeholder="Password">
+        <input type="password" class="form-control" id="exampleInputPassword2" placeholder="Password">
       </div>
       <div class="checkbox">
         <label>
@@ -1412,12 +1412,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% highlight html %}
 <form class="form-inline" role="form">
   <div class="form-group">
-    <label class="sr-only" for="exampleInputEmail">Email address</label>
+    <label class="sr-only" for="exampleInputEmail2">Email address</label>
-    <input type="text" class="form-control" id="exampleInputEmail" placeholder="Enter email">
+    <input type="text" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
   </div>
   <div class="form-group">
-    <label class="sr-only" for="exampleInputPassword">Password</label>
+    <label class="sr-only" for="exampleInputPassword2">Password</label>
-    <input type="password" class="form-control" id="exampleInputPassword" placeholder="Password">
+    <input type="password" class="form-control" id="exampleInputPassword2" placeholder="Password">
   </div>
   <div class="checkbox">
     <label>
@@ -1432,15 +1432,15 @@ 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 by adding <code>.form-horizontal</code> to the form. Doing so changes <code>.form-group</code>s to behave as grid rows, so no need for <code>.row</code>.</p>
     <form class="bs-example form-horizontal">
       <div class="form-group">
-        <label for="inputEmail" class="col-lg-2 control-label">Email</label>
+        <label for="inputEmail1" class="col-lg-2 control-label">Email</label>
         <div class="col-lg-10">
-          <input type="text" class="form-control" id="inputEmail" placeholder="Email">
+          <input type="text" class="form-control" id="inputEmail1" placeholder="Email">
         </div>
       </div>
       <div class="form-group">
-        <label for="inputPassword" class="col-lg-2 control-label">Password</label>
+        <label for="inputPassword1" class="col-lg-2 control-label">Password</label>
         <div class="col-lg-10">
-          <input type="password" class="form-control" id="inputPassword" placeholder="Password">
+          <input type="password" class="form-control" id="inputPassword1" placeholder="Password">
         </div>
       </div>
       <div class="form-group">
@@ -1461,15 +1461,15 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% highlight html %}
 <form class="form-horizontal" role="form">
   <div class="form-group">
-    <label for="inputEmail" class="col-lg-2 control-label">Email</label>
+    <label for="inputEmail1" class="col-lg-2 control-label">Email</label>
     <div class="col-lg-10">
-      <input type="text" class="form-control" id="inputEmail" placeholder="Email">
+      <input type="text" class="form-control" id="inputEmail1" placeholder="Email">
     </div>
   </div>
   <div class="form-group">
-    <label for="inputPassword" class="col-lg-2 control-label">Password</label>
+    <label for="inputPassword1" class="col-lg-2 control-label">Password</label>
     <div class="col-lg-10">
-      <input type="password" class="form-control" id="inputPassword" placeholder="Password">
+      <input type="password" class="form-control" id="inputPassword1" placeholder="Password">
     </div>
   </div>
   <div class="form-group">
@@ -1628,7 +1628,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>When you need to place regular, static text next to a form label within a horizontal form, use the <code>.form-control-static</code> class on a <code>&lt;p&gt;</code>.</p>
     <form class="bs-example form-horizontal">
       <div class="form-group">
-        <label for="inputEmail" class="col-lg-2 control-label">Email</label>
+        <label class="col-lg-2 control-label">Email</label>
         <div class="col-lg-10">
           <p class="form-control-static">email@example.com</p>
         </div>
@@ -1643,15 +1643,15 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% highlight html %}
 <form class="form-horizontal" role="form">
   <div class="form-group">
-    <label for="inputEmail2" class="col-lg-2 control-label">Email</label>
+    <label class="col-lg-2 control-label">Email</label>
     <div class="col-lg-10">
       <p class="form-control-static">email@example.com</p>
     </div>
   </div>
   <div class="form-group">
-    <label for="inputPassword2" class="col-lg-2 control-label">Password</label>
+    <label for="inputPassword" class="col-lg-2 control-label">Password</label>
     <div class="col-lg-10">
-      <input type="password" class="form-control" id="inputPassword2" placeholder="Password">
+      <input type="password" class="form-control" id="inputPassword" placeholder="Password">
     </div>
   </div>
 </form>
@@ -1695,11 +1695,11 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <form class="bs-example">
       <fieldset disabled>
         <div class="form-group">
-          <label for="disabledInput">Disabled input</label>
+          <label for="disabledTextInput">Disabled input</label>
-          <input type="text" id="disabledInput" class="form-control" placeholder="Disabled input">
+          <input type="text" id="disabledTextInput" class="form-control" placeholder="Disabled input">
         </div>
         <div class="form-group">
-          <label for="disabledInput">Disabled select menu</label>
+          <label for="disabledSelect">Disabled select menu</label>
           <select id="disabledSelect" class="form-control">
             <option>Disabled select</option>
           </select>
@@ -1716,11 +1716,11 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 <form class="form-inline" role="form">
   <fieldset disabled>
     <div class="form-group">
-      <label for="disabledInput">Disabled input</label>
+      <label for="disabledTextInput">Disabled input</label>
-      <input type="text" id="disabledInput" class="form-control" placeholder="Disabled input">
+      <input type="text" id="disabledTextInput" class="form-control" placeholder="Disabled input">
     </div>
     <div class="form-group">
-      <label for="disabledInput">Disabled select menu</label>
+      <label for="disabledSelect">Disabled select menu</label>
       <select id="disabledSelect" class="form-control">
         <option>Disabled select</option>
       </select>
@@ -1736,7 +1736,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
     <h3 id="forms-validation">Validation states</h3>
-    <p>Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add <code>.has-warning</code>, <code>.has-error</code>, or <code>.has-success</code> to the parent element. Any <code>.control-label</code>, <code>.form-control</code>, and <code>.help-block</code> within that element will receive the validation styles.</li>
+    <p>Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add <code>.has-warning</code>, <code>.has-error</code>, or <code>.has-success</code> to the parent element. Any <code>.control-label</code>, <code>.form-control</code>, and <code>.help-block</code> within that element will receive the validation styles.</p>
 
     <form class="bs-example">
       <div class="form-group has-warning">
@@ -2012,14 +2012,14 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <p>Keep in mind that Internet Explorer 8 lacks support for rounded corners.</p>
     </div>
     <div class="bs-example bs-example-images">
-      <img data-src="holder.js/140x140" class="img-rounded">
+      <img data-src="holder.js/140x140" class="img-rounded" alt="A generic square placeholder image with rounded corners">
-      <img data-src="holder.js/140x140" class="img-circle">
+      <img data-src="holder.js/140x140" class="img-circle" alt="A generic square placeholder image where only the portion within the circle circumscribed about said square is visible">
-      <img data-src="holder.js/140x140" class="img-thumbnail">
+      <img data-src="holder.js/140x140" class="img-thumbnail" alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera">
     </div>
 {% highlight html %}
-<img src="..." class="img-rounded">
+<img src="..." alt="..." class="img-rounded">
-<img src="..." class="img-circle">
+<img src="..." alt="..." class="img-circle">
-<img src="..." class="img-thumbnail">
+<img src="..." alt="..." class="img-thumbnail">
 {% endhighlight %}
 
     <div class="bs-callout bs-callout-warning">

dist/css/bootstrap.css

@@ -286,7 +286,9 @@ table {
   }
 }
 
-* {
+*,
+*:before,
+*:after {
   -webkit-box-sizing: border-box;
      -moz-box-sizing: border-box;
           box-sizing: border-box;
@@ -2253,7 +2255,8 @@ input[type="button"].btn-block {
 }
 
 .input-group-lg > .form-control,
-.input-group-lg > .input-group-addon {
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn {
   height: 45px;
   padding: 10px 16px;
   font-size: 18px;
@@ -2262,7 +2265,8 @@ input[type="button"].btn-block {
 }
 
 .input-group-sm > .form-control,
-.input-group-sm > .input-group-addon {
+.input-group-sm > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn {
   height: 30px;
   padding: 5px 10px;
   font-size: 12px;

javascript.html

@@ -1613,13 +1613,13 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
         </ol>
         <div class="carousel-inner">
           <div class="item active">
-            <img data-src="holder.js/900x500/auto/#777:#555/text:First slide" alt="">
+            <img data-src="holder.js/900x500/auto/#777:#555/text:First slide" alt="First slide">
           </div>
           <div class="item">
-            <img data-src="holder.js/900x500/auto/#666:#444/text:Second slide" alt="">
+            <img data-src="holder.js/900x500/auto/#666:#444/text:Second slide" alt="Second slide">
           </div>
           <div class="item">
-            <img data-src="holder.js/900x500/auto/#555:#333/text:Third slide" alt="">
+            <img data-src="holder.js/900x500/auto/#555:#333/text:Third slide" alt="Third slide">
           </div>
         </div>
         <a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
@@ -1642,7 +1642,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
   <!-- Wrapper for slides -->
   <div class="carousel-inner">
     <div class="item active">
-      <img src="..." alt="">
+      <img src="..." alt="...">
       <div class="carousel-caption">
         ...
       </div>

less/input-groups.less

@@ -28,9 +28,11 @@
 // manipulation.
 
 .input-group-lg > .form-control,
-.input-group-lg > .input-group-addon { .input-lg(); }
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn { .input-lg(); }
 .input-group-sm > .form-control,
-.input-group-sm > .input-group-addon { .input-sm(); }
+.input-group-sm > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn { .input-sm(); }
 
 
 // Display as table-cell

less/scaffolding.less

@@ -6,7 +6,9 @@
 // Reset the box-sizing
 // -------------------------
 
-* {
+*,
+*:before,
+*:after {
   .box-sizing(border-box);
 }