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

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

View file

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