Merge branch '3.0.0-wip' into bs3_homepage

8 files changed, 64 insertions, 27 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..8898c02e8 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -4,18 +4,25 @@
 <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>
 
+{% if page.slug == "customize" %}
+<script src="{{ page.base_url }}assets/js/less.js"></script>
+<script src="{{ page.base_url }}assets/js/jszip.js"></script>
+<script src="{{ page.base_url }}assets/js/uglify.js"></script>
+<script src="{{ page.base_url }}assets/js/jquery.bbq.min.js"></script>
+<script src="{{ page.base_url }}assets/js/customizer.js"></script>
+{% endif %}
+
 <!-- Analytics
 ================================================== -->
 <script>
   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..dcb4374ef 100644
--- a/_includes/nav-components.html
+++ b/_includes/nav-components.html
@@ -12,6 +12,8 @@
   <ul class="nav">
     <li><a href="#btn-groups-single">Basic button group</a></li>
     <li><a href="#btn-groups-toolbar">Button toolbar</a></li>
+    <li><a href="#btn-groups-sizing">Button group sizing</a></li>
+    <li><a href="#btn-groups-nested">Nested button groups</a></li>
     <li><a href="#btn-groups-vertical">Vertical variation</a></li>
     <li><a href="#btn-groups-justified">Justified link buttons</a></li>
   </ul>
@@ -50,9 +52,7 @@
 <li>
   <a href="#navbar">Navbar</a>
   <ul class="nav">
-    <li><a href="#navbar-basic">Basic navbar</a></li>
-    <li><a href="#navbar-nav">Nav links</a></li>
-    <li><a href="#navbar-forms">Forms in navbars</a></li>
+    <li><a href="#navbar-default">Default navbar</a></li>
     <li><a href="#navbar-buttons">Buttons in navbars</a></li>
     <li><a href="#navbar-text">Text in navbars</a></li>
     <li><a href="#navbar-links">Links in navbars</a></li>
@@ -60,7 +60,7 @@
     <li><a href="#navbar-fixed-top">Fixed top navbar</a></li>
     <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-inverted">Inverted navbar</a></li>
   </ul>
 </li>
 <li><a href="#breadcrumbs">Breadcrumbs</a></li>
@@ -80,13 +80,19 @@
     <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-dismissable">Dismissable alerts</a></li>
     <li><a href="#alerts-links">Links in alerts</a></li>
   </ul>
 </li>
@@ -100,7 +106,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..f5226ec5e 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -15,10 +15,12 @@
 <li>
   <a href="#grid">Grid system</a>
   <ul class="nav">
+    <li><a href="#grid-media-queries">Media queries</a></li>
     <li><a href="#grid-options">Available options</a></li>
     <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li>
     <li><a href="#grid-example-mixed">Ex: Mobile-desktop</a></li>
     <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktop</a></li>
+    <li><a href="#grid-responsive-resets">Responsive column resets</a></li>
     <li><a href="#grid-offsetting">Offset columns</a></li>
     <li><a href="#grid-nesting">Nested columns</a></li>
     <li><a href="#grid-column-ordering">Column ordering</a></li>
@@ -46,7 +48,7 @@
     <li><a href="#tables-bordered">Bordered tables</a></li>
     <li><a href="#tables-hover-rows">Hover rows</a></li>
     <li><a href="#tables-condensed">Condensed tables</a></li>
-    <li><a href="#tables-row-classes">Contextual row classes</a></li>
+    <li><a href="#tables-contextual-classes">Contextual classes</a></li>
   </ul>
 </li>
 <li>
@@ -56,6 +58,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..fca38bde3 100644
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -12,11 +12,23 @@
   <a href="#template">Basic template</a>
 </li>
 <li>
+  <a href="#examples">Examples</a>
+</li>
+<li>
+  <a href="#disable-responsive">Disabling responsiveness</a>
+</li>
+<li>
   <a href="#browsers">Browser support</a>
 </li>
 <li>
+  <a href="#third-parties">Third party support</a>
+</li>
+<li>
+  <a href="#accessibility">Accessibility</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..197bad2d8 100644
--- a/_includes/nav-main.html
+++ b/_includes/nav-main.html
@@ -1,12 +1,15 @@
-<div class="navbar navbar-inverse navbar-fixed-top bs-docs-nav">
+<header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner">
   <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>
-    <div class="nav-collapse collapse bs-navbar-collapse">
+    <div class="navbar-header">
+      <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
+        <span class="sr-only">Toggle navigation</span>
+        <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 RC2</a>
+    </div>
+    <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
       <ul class="nav navbar-nav">
         <li{% if page.slug == "getting-started" %} class="active"{% endif %}>
           <a href="{{ page.base_url }}getting-started">Getting started</a>
@@ -24,6 +27,6 @@
           <a href="{{ page.base_url }}customize">Customize</a>
         </li>
       </ul>
-    </div>
+    </nav>
   </div>
-</div>
+</header>
diff --git a/_includes/social-buttons.html b/_includes/social-buttons.html
index 3700ecd14..43f5a096a 100644
--- a/_includes/social-buttons.html
+++ b/_includes/social-buttons.html
@@ -1,16 +1,16 @@
 <div class="bs-social">
   <ul class="bs-social-buttons">
     <li>
-      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></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&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></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>
     </li>
     <li class="tweet-btn">
-      <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twbs.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
+      <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://getbootstrap.com/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
     </li>
   </ul>
 </div>