Merge branch '3.0.0-wip' into bs3_theme

Conflicts:
	dist/css/bootstrap.min.css

7 files changed, 26 insertions, 10 deletions

diff --git a/_includes/ads.html b/_includes/ads.html
index 495e7ba47..ba4775f5e 100644
--- a/_includes/ads.html
+++ b/_includes/ads.html
@@ -1 +1 @@
-<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
\ No newline at end of file
+<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script>var z = document.createElement("script"); z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
diff --git a/_includes/footer.html b/_includes/footer.html
index 47a671b26..83ff87e26 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -4,7 +4,7 @@
 <script src="{{ page.base_url }}assets/js/jquery.js"></script>
 <script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
 
-<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+<script src="http://platform.twitter.com/widgets.js"></script>
 <script src="{{ page.base_url }}assets/js/holder.js"></script>
 
 <script src="{{ page.base_url }}assets/js/application.js"></script>
@@ -15,7 +15,6 @@
   var _gauges = _gauges || [];
   (function() {
     var t   = document.createElement('script');
-    t.type  = 'text/javascript';
     t.async = true;
     t.id    = 'gauges-tracker';
     t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
diff --git a/_includes/header.html b/_includes/header.html
index b5eff5f5e..827b1c2c9 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -31,12 +31,12 @@
                 <link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}assets/ico/apple-touch-icon-57-precomposed.png">
                                <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
 
-<script type="text/javascript">
+<script>
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-146052-10']);
   _gaq.push(['_trackPageview']);
   (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    var ga = document.createElement('script'); ga.async = true;
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
diff --git a/_includes/nav-components.html b/_includes/nav-components.html
index 86bf4d070..6e3228ae5 100644
--- a/_includes/nav-components.html
+++ b/_includes/nav-components.html
@@ -61,6 +61,8 @@
     <li><a href="#navbar-fixed-bottom">Fixed bottom navbar</a></li>
     <li><a href="#navbar-static-top">Static top navbar</a></li>
     <li><a href="#navbar-responsive">Responsive navbar</a></li>
+    <li><a href="#navbar-scrollable">Scrollable responsive navbar</a></li>
+    <li><a href="#navbar-inverted">Inverted navbar</a></li>
   </ul>
 </li>
 <li><a href="#breadcrumbs">Breadcrumbs</a></li>
@@ -80,12 +82,17 @@
     <li><a href="#type-components-page-header">Page header</a></li>
   </ul>
 </li>
-<li><a href="#thumbnails">Thumbnails</a></li>
+<li>
+  <a href="#thumbnails">Thumbnails</a>
+  <ul class="nav">
+    <li><a href="#thumbnails-default">Default thumbnails</a></li>
+    <li><a href="#thumbnails-custom-content">Custom content</a></li>
+  </ul>
+</li>
 <li>
   <a href="#alerts">Alerts</a>
   <ul class="nav">
     <li><a href="#alerts-default">Default alert</a></li>
-    <li><a href="#alerts-block">Block alerts</a></li>
     <li><a href="#alerts-alternatives">Contextual alternatives</a></li>
     <li><a href="#alerts-links">Links in alerts</a></li>
   </ul>
@@ -100,7 +107,13 @@
     <li><a href="#progress-stacked">Stacked</a></li>
   </ul>
 </li>
-<li><a href="#media">Media object</a></li>
+<li>
+  <a href="#media">Media object</a>
+  <ul class="nav">
+    <li><a href="#media-default">Default media</a></li>
+    <li><a href="#media-list">Media list</a></li>
+  </ul>
+</li>
 <li>
   <a href="#list-group">List group</a>
   <ul class="nav">
diff --git a/_includes/nav-css.html b/_includes/nav-css.html
index fc10a3037..921dfe0b2 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -56,6 +56,7 @@
     <li><a href="#forms-inline">Inline variation</a></li>
     <li><a href="#forms-horizontal">Horizontal variation</a></li>
     <li><a href="#forms-controls">Supported controls</a></li>
+    <li><a href="#forms-controls-static">Static form control</a></li>
     <li><a href="#forms-control-states">Control states</a></li>
     <li><a href="#forms-control-sizes">Control sizing</a></li>
     <li><a href="#forms-help-text">Help text</a></li>
diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index 022d335cd..9788facdd 100644
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -15,8 +15,11 @@
   <a href="#browsers">Browser support</a>
 </li>
 <li>
+  <a href="#third-parties">Third party support</a>
+</li>
+<li>
   <a href="#license-faqs">License FAQs</a>
 </li>
 <li>
   <a href="#customizing">Customizing Bootstrap</a>
-</li>
\ No newline at end of file
+</li>
diff --git a/_includes/nav-main.html b/_includes/nav-main.html
index d7f5a0eec..a9604f588 100644
--- a/_includes/nav-main.html
+++ b/_includes/nav-main.html
@@ -1,11 +1,11 @@
 <div class="navbar navbar-inverse navbar-fixed-top bs-docs-nav">
   <div class="container">
-    <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC1</a>
     <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
     </button>
+    <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC1</a>
     <div class="nav-collapse collapse bs-navbar-collapse">
       <ul class="nav navbar-nav">
         <li{% if page.slug == "getting-started" %} class="active"{% endif %}>