mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 12:59:05 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-02-26 23:16:11 -08:00
parent ccf7697185 43760eb202
commit 1a781a707e
7 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/javascript.html
View File

@@ -1310,6 +1310,12 @@ $('#myCollapsible').on('hidden', function () {
<td>5000</td>
<td>The amount of time to delay between automatically cycling an item.</td>
</tr>
<tr>
<td>pause</td>
<td>string</td>
<td>"hover"</td>
<td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td>
</tr>
</tbody>
</table>
<h3>Markup</h3>