Skip to content
GitLab
Commit cb524586 authored by Mark Otto's avatar Mark Otto
Browse files

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

parents 21eb2dac 0bbb64be
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
+2 -1
docs/javascript.html
+ 2
- 1
View file @ cb524586
...@@ -479,7 +479,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) { ...@@ -479,7 +479,8 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
e.relatedTarget // previous tab e.relatedTarget // previous tab
})</pre> })</pre>
<h3>Demo</h3> <h3>Demo</h3>
<ul id="tab" class="tabs">
<ul id="tab" class="nav tabs">
<li class="active"><a href="#home" data-toggle="tab">Home</a></li> <li class="active"><a href="#home" data-toggle="tab">Home</a></li>
<li><a href="#profile" data-toggle="tab">Profile</a></li> <li><a href="#profile" data-toggle="tab">Profile</a></li>
<li><a href="#messages" data-toggle="tab">Messages</a></li> <li><a href="#messages" data-toggle="tab">Messages</a></li>
......
Supports Markdown
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