github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'shama-master' into 2.0.1-wip

Browse Source
This commit is contained in:
Mark Otto
2012-02-02 09:38:21 -08:00
parent bd0e952003 99f395bcd7
commit ab4345332d
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/templates/pages/javascript.mustache vendored
View File

@@ -58,7 +58,7 @@
<div class="span3">
<label>
<h3><a href="./javascript.html#tooltips">{{_i}}Tooltips{{/i}}</a></h3>
<p>{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images, uss CSS3 for animations, and data-attributes for local title storage.{{/i}}</p>
<p>{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images, use CSS3 for animations, and data-attributes for local title storage.{{/i}}</p>
</label>
</div>
<div class="span3">
@@ -552,7 +552,7 @@ $('#myModal').on('hidden', function () {
&lt;li&gt;&lt;a href="#home" data-toggle="tab"&gt;{{_i}}Home{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#profile" data-toggle="tab"&gt;{{_i}}Profile{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#messages" data-toggle="tab"&gt;{{_i}}Messages{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#ettings" data-toggle="tab"&gt;{{_i}}Settings{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="#settings" data-toggle="tab"&gt;{{_i}}Settings{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt;</pre>
<h3>{{_i}}Methods{{/i}}</h3>
<h4>$().tab</h4>
@@ -1069,7 +1069,7 @@ $('#my-alert').bind('closed', function () {
<td>{{_i}}parent{{/i}}</td>
<td>{{_i}}selector{{/i}}</td>
<td>false</td>
<td>{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collasabile item is shown. (similar to traditional accordion behavior){{/i}}</td>
<td>{{_i}}If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior){{/i}}</td>
</tr>
<tr>
<td>{{_i}}toggle{{/i}}</td>