1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

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

This commit is contained in:
Mark Otto 2012-12-26 10:15:23 -06:00
commit b19fd8e4fa

View file

@ -571,12 +571,12 @@ $('#myModal').on('hidden', function () {
<h2>Usage</h2>
<h3>Via data attributes</h3>
<p>To easily add scrollspy behavior to your topbar navigation, just add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the body) and <code>data-target=".navbar"</code> to select which nav to use. You'll want to use scrollspy with a <code>.nav</code> component.</p>
<p>To easily add scrollspy behavior to your topbar navigation, just add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the body) and <code>data-target=".navbar"</code> to select which nav to use. You'll need to use scrollspy with a <code>.nav</code> component.</p>
<pre class="prettyprint linenums">&lt;body data-spy="scroll" data-target=".navbar"&gt;...&lt;/body&gt;</pre>
<h3>Via JavaScript</h3>
<p>Call the scrollspy via JavaScript:</p>
<pre class="prettyprint linenums">$('#navbar').scrollspy()</pre>
<pre class="prettyprint linenums">$('body').scrollspy(options)</pre>
<div class="alert alert-info">
<strong>Heads up!</strong>
@ -604,6 +604,12 @@ $('[data-spy="scroll"]').each(function () {
</tr>
</thead>
<tbody>
<tr>
<td>target</td>
<td>selector</td>
<td>'body'</td>
<td>Nav target to be updated on scroll. (Scrollspy looks for <code>.nav li > a</code> inside this target.)</td>
</tr>
<tr>
<td>offset</td>
<td>number</td>