Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

Conflicts:
	docs/index.html

1 files changed, 36 insertions, 9 deletions

diff --git a/docs/javascript.html b/docs/javascript.html
index 294f5dbe4..b830e7d64 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -44,6 +44,7 @@
         <div class="container">
           <h3><a href="#">Bootstrap JS</a></h3>
           <ul>
+            <li><a href="#overview">Overview</a></li>
             <li><a href="#modal">Modals</a></li>
             <li><a href="#dropdown">Dropdown</a></li>
             <li><a href="#scrollspy">ScrollSpy</a></li>
@@ -56,6 +57,20 @@
       </div>
     </div>
 
+    <!-- Masthead (blueprinty thing)
+    ================================================== -->
+    <header class="jumbotron subhead" id="overview">
+      <div class="inner">
+        <div class="container">
+          <h1>Javascript for Bootstrap</h1>
+          <p class="lead">
+            Bring Bootstrap's components to life with new, custom plugins that work with <a href="http://jquery.com/" target="_blank">jQuery</a> and <a href="http://ender.no.de" target="_blank">Ender</a>.
+          </p>
+          <p><a href="./index.html">&larr; Back to Bootstrap home</a></p>
+        </div><!-- /container -->
+      </div>
+    </header>
+
     <div class="container">
 
     <!-- Modal
@@ -71,7 +86,7 @@
           <a href="../js/bootstrap-modal.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span12 columns">
-          <h2>Using bootstrap-modal</h2>
+          <h3>Using bootstrap-modal</h3>
           <pre class="prettyprint linenums">$('#modal-content').modal(options)</pre>
           <h3>Options</h3>
           <ul>
@@ -161,7 +176,7 @@ $('#modal-content')
           <a href="../js/bootstrap-dropdown.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span12 columns">
-          <h2>Using boostrap-dropdown.js</h2>
+          <h3>Using boostrap-dropdown.js</h3>
           <pre class="prettyprint linenums">$('#topbar').dropdown()</pre>
           <h3>Method</h3>
           <h4>$().dropdown</h4>
@@ -176,7 +191,7 @@ $('#modal-content')
           </script>
           <div class="topbar-wrapper">
             <div id="topbar-example" class="topbar">
-              <div class="fill">
+              <div class="topbar-inner">
                 <div class="container">
                   <h3><a href="#">Project Name</a></h3>
                   <ul>
@@ -264,7 +279,7 @@ $('#modal-content')
           <a href="../js/bootstrap-tabs.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span12 columns">
-          <h2>Using boostrap-tabs.js</h2>
+          <h3>Using boostrap-tabs.js</h3>
           <pre class="prettyprint linenums">$('.tabs').tabs()</pre>
           <h3>Method</h3>
           <h4>$().tabs or $().pills</h4>
@@ -331,7 +346,7 @@ Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seita
           <a href="../js/bootstrap-twipsy.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span12 columns">
-          <h2>Using bootstrap-twipsy.js</h2>
+          <h3>Using bootstrap-twipsy.js</h3>
           <pre class="prettyprint linenums">$('#example').twipsy(options)</pre>
           <h3>Options</h3>
           <ul>
@@ -386,7 +401,7 @@ Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seita
           <a href="../js/bootstrap-popover.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span12 columns">
-          <h2>Using boostrap-popover.js</h2>
+          <h3>Using boostrap-popover.js</h3>
           <pre class="prettyprint linenums">$('#example').popover(options)</pre>
           <h3>Options</h3>
           <ul>
@@ -440,7 +455,7 @@ Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seita
           <a href="../js/bootstrap-alerts.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span12 columns">
-          <h2>Using bootstrap-alert</h2>
+          <h3>Using bootstrap-alerts.js</h3>
           <pre class="prettyprint linenums">$(".alert-message").alert()</pre>
           <h3>Methods</h3>
           <h4>$().alert</h4>
@@ -471,6 +486,18 @@ Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seita
       </div>
     </section>
 
-    </div>
+
+    </div><!-- /container -->
+
+    <footer class="footer">
+      <div class="container">
+        <p class="pull-right"><a href="#">Back to top</a></p>
+        <p>
+          Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.<br />
+          Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
+        </p>
+      </div>
+    </footer>
+
   </body>
-</html>
\ No newline at end of file
+</html>