diff options
author | Mark Otto <markotto@twitter.com> | 2012-08-19 22:54:05 +0400 |
---|---|---|
committer | Mark Otto <markotto@twitter.com> | 2012-08-19 22:54:05 +0400 |
commit | 8e271d664b80f7e04528ba25b81dfc4a7b316df7 (patch) | |
tree | ae08c7c37ae0a6333ddf10e46c5a2cbeb37f61bc /docs/templates/pages | |
parent | c531a75ff00fd58a6d1c05a944145ff165dba837 (diff) | |
parent | c9cef741f6d97bb8549af8e4809fccce4339f2f4 (diff) |
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'docs/templates/pages')
-rw-r--r-- | docs/templates/pages/javascript.mustache | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 450f98ba47..ccec7eb24e 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -496,7 +496,7 @@ $('#myModal').on('hidden', function () { <h2>{{_i}}Usage{{/i}}</h2> <h3>{{_i}}Via data attributes{{/i}}</h3> - <p>{{_i}}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.{{/i}}</p> + <p>{{_i}}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.{{/i}}</p> <pre class="prettyprint linenums"><body data-spy="scroll" data-target=".navbar">...</body></pre> <h3>{{_i}}Via JavaScript{{/i}}</h3> @@ -759,7 +759,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>{{_i}}trigger{{/i}}</td> <td>{{_i}}string{{/i}}</td> <td>'hover'</td> - <td>{{_i}}how tooltip is triggered{{/i}} - hover | focus | manual</td> + <td>{{_i}}how tooltip is triggered{{/i}} - click | hover | focus | manual</td> </tr> <tr> <td>{{_i}}delay{{/i}}</td> @@ -852,7 +852,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <h3>Live demo</h3> <div class="bs-docs-example" style="padding-bottom: 24px;"> - <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">{{_i}}Hover for popover{{/i}}</a> + <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">{{_i}}Click to toggle popover{{/i}}</a> </div> @@ -902,8 +902,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <tr> <td>{{_i}}trigger{{/i}}</td> <td>{{_i}}string{{/i}}</td> - <td>'hover'</td> - <td>{{_i}}how popover is triggered{{/i}} - hover | focus | manual</td> + <td>'click'</td> + <td>{{_i}}how popover is triggered{{/i}} - click | hover | focus | manual</td> </tr> <tr> <td>{{_i}}title{{/i}}</td> |