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

This commit is contained in:
Mark Otto 2012-01-12 10:29:16 -08:00
commit f58aa16f59
1 changed files with 3 additions and 3 deletions

View File

@ -528,7 +528,7 @@ $('#myModal').on('hidden', function () {
<!-- Tabs
================================================== -->
<section id="tab">
<section id="tabs">
<div class="page-header">
<h1>Togglable tabs <small>bootstrap-tab.js</small></h1>
</div>
@ -832,7 +832,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<!-- Alert
================================================== -->
<section id="alert">
<section id="alerts">
<div class="page-header">
<h1>Alert messages <small>bootstrap-alert.js</small></h1>
</div>
@ -901,7 +901,7 @@ $('#my-alert').bind('closed', function () {
<!-- Buttons
================================================== -->
<section id="button">
<section id="buttons">
<div class="page-header">
<h1>Buttons <small>bootstrap-button.js</small></h1>
</div>