Skip to content

B
bootstrap
Commit f58aa16f authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

parents 5e3c2113 8b5c8a3a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
docs/javascript.html
View file @ f58aa16f
...@@ -528,7 +528,7 @@ $('#myModal').on('hidden', function () { ...@@ -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) { ...@@ -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 () { ...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment