Merge branch 'derp' into derp_navs

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

4 files changed, 64 insertions, 168 deletions

diff --git a/docs/_includes/components/badges.html b/docs/_includes/components/badges.html
index 95aea2e40..fe5cb9de2 100644
--- a/docs/_includes/components/badges.html
+++ b/docs/_includes/components/badges.html
@@ -43,9 +43,20 @@
       </li>
     </ul>
     <br>
-    <button class="btn btn-primary" type="button">
-      Messages <span class="badge">4</span>
-    </button>
+    <p>
+      <button class="btn btn-primary btn-lg" type="button">
+        Large button <span class="badge">4</span>
+      </button>
+      <button class="btn btn-primary" type="button">
+        Button <span class="badge">4</span>
+      </button>
+      <button class="btn btn-primary btn-sm" type="button">
+        Small button <span class="badge">4</span>
+      </button>
+      <button class="btn btn-primary btn-xs" type="button">
+        Extra small <span class="badge">4</span>
+      </button>
+    </p>
   </div>
 {% highlight html %}
 <ul class="nav nav-pills nav-stacked" role="tablist">
diff --git a/docs/_includes/components/progress-bars.html b/docs/_includes/components/progress-bars.html
index a77afc161..949c2368f 100644
--- a/docs/_includes/components/progress-bars.html
+++ b/docs/_includes/components/progress-bars.html
@@ -1,182 +1,79 @@
 <div class="bs-docs-section">
   <h1 id="progress" class="page-header">Progress bars</h1>
 
-  <p class="lead">Provide up-to-date feedback on the progress of a workflow or action with simple yet flexible progress bars.</p>
-
-  <div class="bs-callout bs-callout-danger">
-    <h4>Cross-browser compatibility</h4>
-    <p>Progress bars use CSS3 transitions and animations to achieve some of their effects. These features are not supported in Internet Explorer 9 and below or older versions of Firefox. Opera 12 does not support animations.</p>
-  </div>
+  <p class="lead">Stylize the HTML5 <code>&lt;progress&gt;</code> element with a few extra classes and some crafty browser-specific CSS. Be sure to read up on the browser support.</p>
 
   <h3 id="progress-basic">Basic example</h3>
   <p>Default progress bar.</p>
   <div class="bs-example">
-    <div class="progress">
-      <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
-        <span class="sr-only">60% Complete</span>
-      </div>
-    </div>
+    <progress class="progress" value="0" max="100">0%</progress>
+    <progress class="progress" value="25" max="100">25%</progress>
+    <progress class="progress" value="50" max="100">50%</progress>
+    <progress class="progress" value="75" max="100">75%</progress>
+    <progress class="progress" value="100" max="100">100%</progress>
   </div>
 {% highlight html %}
-<div class="progress">
-  <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
-    <span class="sr-only">60% Complete</span>
-  </div>
-</div>
+<progress class="progress" value="0" max="100">0%</progress>
+<progress class="progress" value="25" max="100">25%</progress>
+<progress class="progress" value="50" max="100">50%</progress>
+<progress class="progress" value="75" max="100">75%</progress>
+<progress class="progress" value="100" max="100">100%</progress>
 {% endhighlight %}
 
-  <h3 id="progress-label">With label</h3>
-  <p>Remove the <code>.sr-only</code> class from within the progress bar to show a visible percentage. For low percentages, consider adding a <code>min-width</code> to ensure the label's text is fully visible.</p>
+  <h3 id="progress-ie9">Internet Explorer 9 support</h3>
+  <p>IE9 doesn't support the HTML5 <code>&lt;progress&gt;</code> element, but we can work around that.</p>
   <div class="bs-example">
-    <div class="progress">
-      <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
-        60%
+    <progress class="progress" value="25" max="100">
+      <div class="progress">
+        <span class="progress-bar" style="width: 25%;">25%</span>
       </div>
-    </div>
+    </progress>
   </div>
 {% highlight html %}
-<div class="progress">
-  <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
-    60%
+<progress class="progress" value="25" max="100">
+  <div class="progress">
+    <span class="progress-bar" style="width: 25%;">25%</span>
   </div>
-</div>
+</progress>
 {% endhighlight %}
 
   <h3 id="progress-alternatives">Contextual alternatives</h3>
   <p>Progress bars use some of the same button and alert classes for consistent styles.</p>
   <div class="bs-example">
-    <div class="progress">
-      <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
-        <span class="sr-only">40% Complete (success)</span>
-      </div>
-    </div>
-    <div class="progress">
-      <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
-        <span class="sr-only">20% Complete</span>
-      </div>
-    </div>
-    <div class="progress">
-      <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
-        <span class="sr-only">60% Complete (warning)</span>
-      </div>
-    </div>
-    <div class="progress">
-      <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
-        <span class="sr-only">80% Complete (danger)</span>
-      </div>
-    </div>
+    <progress class="progress progress-success" value="25" max="100">25%</progress>
+    <progress class="progress progress-info" value="50" max="100">50%</progress>
+    <progress class="progress progress-warning" value="75" max="100">75%</progress>
+    <progress class="progress progress-danger" value="100" max="100">100%</progress>
   </div>
 {% highlight html %}
-<div class="progress">
-  <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
-    <span class="sr-only">40% Complete (success)</span>
-  </div>
-</div>
-<div class="progress">
-  <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
-    <span class="sr-only">20% Complete</span>
-  </div>
-</div>
-<div class="progress">
-  <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
-    <span class="sr-only">60% Complete (warning)</span>
-  </div>
-</div>
-<div class="progress">
-  <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
-    <span class="sr-only">80% Complete</span>
-  </div>
-</div>
+<progress class="progress progress-success" value="25" max="100">25%</progress>
+<progress class="progress progress-info" value="50" max="100">50%</progress>
+<progress class="progress progress-warning" value="75" max="100">75%</progress>
+<progress class="progress progress-danger" value="100" max="100">100%</progress>
 {% endhighlight %}
 
   <h3 id="progress-striped">Striped</h3>
-  <p>Uses a gradient to create a striped effect. Not available in IE8.</p>
+  <p>Uses a gradient to create a striped effect.</p>
   <div class="bs-example">
-    <div class="progress">
-      <div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
-        <span class="sr-only">40% Complete (success)</span>
-      </div>
-    </div>
-    <div class="progress">
-      <div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
-        <span class="sr-only">20% Complete</span>
-      </div>
-    </div>
-    <div class="progress">
-      <div class="progress-bar progress-bar-warning progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
-        <span class="sr-only">60% Complete (warning)</span>
-      </div>
-    </div>
-    <div class="progress">
-      <div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
-        <span class="sr-only">80% Complete (danger)</span>
-      </div>
-    </div>
+    <progress class="progress progress-striped" value="10" max="100">10%</progress>
+    <progress class="progress progress-striped progress-success" value="25" max="100">25%</progress>
+    <progress class="progress progress-striped progress-info" value="50" max="100">50%</progress>
+    <progress class="progress progress-striped progress-warning" value="75" max="100">75%</progress>
+    <progress class="progress progress-striped progress-danger" value="100" max="100">100%</progress>
   </div>
 {% highlight html %}
-<div class="progress">
-  <div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
-    <span class="sr-only">40% Complete (success)</span>
-  </div>
-</div>
-<div class="progress">
-  <div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
-    <span class="sr-only">20% Complete</span>
-  </div>
-</div>
-<div class="progress">
-  <div class="progress-bar progress-bar-warning progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
-    <span class="sr-only">60% Complete (warning)</span>
-  </div>
-</div>
-<div class="progress">
-  <div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
-    <span class="sr-only">80% Complete (danger)</span>
-  </div>
-</div>
+<progress class="progress progress-striped" value="10" max="100">10%</progress>
+<progress class="progress progress-striped progress-success" value="25" max="100">25%</progress>
+<progress class="progress progress-striped progress-info" value="50" max="100">50%</progress>
+<progress class="progress progress-striped progress-warning" value="75" max="100">75%</progress>
+<progress class="progress progress-striped progress-danger" value="100" max="100">100%</progress>
 {% endhighlight %}
 
   <h3 id="progress-animated">Animated</h3>
-  <p>Add <code>.active</code> to <code>.progress-bar-striped</code> to animate the stripes right to left. Not available in IE9 and below.</p>
-  <div class="bs-example">
-    <div class="progress">
-      <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%"><span class="sr-only">45% Complete</span></div>
-    </div>
-  </div>
-{% highlight html %}
-<div class="progress">
-  <div class="progress-bar progress-bar-striped active"  role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%">
-    <span class="sr-only">45% Complete</span>
-  </div>
-</div>
-{% endhighlight %}
-
-  <h3 id="progress-stacked">Stacked</h3>
-  <p>Place multiple bars into the same <code>.progress</code> to stack them.</p>
+  <p>Add <code>.progress-animated</code> to <code>.progress</code> to animate the stripes right to left via CSS3 animations. Animated progress bars do not work in IE9, older versions of Firefox, and Opera 12 as they don't support CSS3 animations.</p>
   <div class="bs-example">
-    <div class="progress">
-      <div class="progress-bar progress-bar-success" style="width: 35%">
-        <span class="sr-only">35% Complete (success)</span>
-      </div>
-      <div class="progress-bar progress-bar-warning progress-bar-striped" style="width: 20%">
-        <span class="sr-only">20% Complete (warning)</span>
-      </div>
-      <div class="progress-bar progress-bar-danger" style="width: 10%">
-        <span class="sr-only">10% Complete (danger)</span>
-      </div>
-    </div>
+    <progress class="progress progress-striped progress-animated" value="25" max="100">25%</progress>
   </div>
 {% highlight html %}
-<div class="progress">
-  <div class="progress-bar progress-bar-success" style="width: 35%">
-    <span class="sr-only">35% Complete (success)</span>
-  </div>
-  <div class="progress-bar progress-bar-warning progress-bar-striped" style="width: 20%">
-    <span class="sr-only">20% Complete (warning)</span>
-  </div>
-  <div class="progress-bar progress-bar-danger" style="width: 10%">
-    <span class="sr-only">10% Complete (danger)</span>
-  </div>
-</div>
+<progress class="progress progress-striped progress-animated" value="25" max="100">25%</progress>
 {% endhighlight %}
-</div>
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 406b84cda..47e7e9839 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -21,31 +21,20 @@
 {% endif %}
 {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %}
   <!-- Optional Bootstrap Theme -->
-{% if site.github %}
-  <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet">
-{% else %}
-  <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.css" rel="stylesheet" id="bs-theme-stylesheet">
-{% endif %}
+  {% if site.github %}
+    <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet">
+  {% else %}
+    <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.css" rel="stylesheet" id="bs-theme-stylesheet">
+  {% endif %}
 {% endif %}
 
 <!-- Documentation extras -->
-{% if site.github %}
 <link href="../assets/css/docs.min.css" rel="stylesheet">
-{% else %}
-<link href="../assets/css/src/docs.css" rel="stylesheet">
-<link href="../assets/css/src/pygments-manni.css" rel="stylesheet">
-{% endif %}
-<!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 <script src="../assets/js/ie10-viewport-bug-workaround.js"></script>
 <script src="../assets/js/ie-emulation-modes-warning.js"></script>
 
-<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-<!--[if lt IE 9]>
-  <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-  <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-<![endif]-->
-
 <!-- Favicons -->
 <link rel="apple-touch-icon-precomposed" href="/apple-touch-icon-precomposed.png">
 <link rel="icon" href="/favicon.ico">
diff --git a/docs/_includes/nav/docs.html b/docs/_includes/nav/docs.html
index 5a3f69549..519f73954 100644
--- a/docs/_includes/nav/docs.html
+++ b/docs/_includes/nav/docs.html
@@ -8,8 +8,7 @@
         <span class="icon-bar"></span>
       </button>
       <a href="../" class="navbar-brand">
-        <span class="visible-xs">Bootstrap</span>
-        <span class="bs-docs-booticon bs-docs-booticon-md hidden-xs">B</span>
+        Bootstrap
       </a>
     </div>
     <nav class="collapse navbar-collapse bs-sidenav-collapse" role="navigation">