From: Mark Otto <markdotto@gmail.com>
Date: Thu, 22 Dec 2011 00:39:02 +0000 (-0600)
Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fb380151d477f1741b7609ade7a9e7fd5450b2c;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
	docs/javascript.html
---

9fb380151d477f1741b7609ade7a9e7fd5450b2c
diff --cc bootstrap.css
index 3fa776fcbb,612fe24bc7..354f534b28
--- a/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Wed Dec 21 18:20:33 CST 2011
 - * Date: Wed Dec 21 13:29:41 PST 2011
++ * Date: Wed Dec 21 18:38:56 CST 2011
   */
  html, body {
    margin: 0;
diff --cc docs/javascript.html
index 91fe949101,acde34d46a..bf27dd7f17
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@@ -25,7 -25,19 +25,8 @@@
  
      <!-- Le javascript -->
      <!-- placed up here so that the inline demos can be next to their markup -->
-     <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
+     <!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> -->
+     <script src="../js/tests/vendor/jquery.js"></script>
 -
 -    <script type="text/javascript">
 -      // NOT FINAL BY ANY MEANS, JUST MAH JANK CODE BRO
 -      $(document).ready(function() {
 -        $('.nav .active').click(function(e) {
 -          e.preventDefault();
 -          $(this).siblings().toggle();
 -        });
 -      });
 -    </script>
 -
      <script src="assets/js/google-code-prettify/prettify.js"></script>
      <script>$(function () { prettyPrint() })</script>
      <script src="../js/bootstrap-transition.js"></script>
@@@ -136,11 -145,16 +134,16 @@@
             </tr>
             <tr>
               <td><a href="./javascript.html#popover">bootstrap-popover.js</a></td>
 -             <td>The popover plugin provides a simple interface for adding popovers to your application. It extends the <a href="#twipsy">boostrap-twipsy.js</a> plugin, so be sure to grab that file as well when including popovers in your project!</td>
 +             <td>The popover plugin provides a simple interface for adding popovers to your application. It extends the <a href="#twipsy">bootstrap-twipsy.js</a> plugin, so be sure to grab that file as well when including popovers in your project!</td>
             </tr>
+            </tr>
+            <tr>
+              <td><a href="./javascript.html#alert">bootstrap-alert.js</a></td>
+              <td>The alert plugin is a tiny class for adding close functionality to alerts.</td>
+            </tr>
             <tr>
                <td><a href="./javascript.html#button">bootstrap-button.js</a></td>
-               <td>This plugin offers additional functionality for managing button state.</td>
+               <td>This plugin offers additional functionality for managing button state in single buttons and button sets.</td>
              </tr>
              <tr>
                <td><a href="./javascript.html#collapse">bootstrap-collapse.js</a></td>
@@@ -295,10 -303,12 +292,12 @@@ $('#myModal').on('hidden', function () 
            <a href="../js/bootstrap-dropdown.js" target="_blank" class="btn primary">Download</a>
          </div>
          <div class="span9 columns">
 -          <h3>Using boostrap-dropdown.js</h3>
 +          <h3>Using bootstrap-dropdown.js</h3>
            <pre class="prettyprint linenums">$('.dropdown-toggle').dropdown()</pre>
            <h3>Markup</h3>
-           <p>To quickly add dropdown functionality to any element just add <code>data-toggle="dropdown"</code>. Any valid bootstrap dropdown will automatically be activated.</p>
+           <p>To quickly add dropdown functionality to any element just add <code>data-toggle="dropdown"</code> and any valid bootstrap dropdown will automatically be activated.</p>
+           <p><span class="label notice">Notice</span> For added control and flexibility, optionally specify a <code>data-target="#fat"</code> or <code>href="#fat"</code> - this allows you to target specific dropdowns.</p>
+ 
  <pre class="prettyprint linenums">
  &lt;ul class="tabs"&gt;
    &lt;li class="active"&gt;&lt;a href="#"&gt;Home&lt;/a&gt;&lt;/li&gt;
@@@ -644,10 -655,10 +644,10 @@@ $('a[data-toggle="tab"]').on('shown', f
            <a href="../js/bootstrap-popover.js" target="_blank" class="btn primary">Download</a>
          </div>
          <div class="span9 columns">
 -          <h3>Using boostrap-popover.js</h3>
 +          <h3>Using bootstrap-popover.js</h3>
            <pre class="prettyprint linenums">$('#example').popover(options)</pre>
            <h3>Options</h3>
-           <table class="striped-table">
+           <table class="bordered-table striped-table">
              <thead>
               <tr>
                 <th style="width: 100px;">Name</th>