diff options
| author | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
| commit | e148923f2764d0af6f7d6fb1b601840d241759b5 (patch) | |
| tree | 7831543c9b205eb0d184f2eb3187fb2cd3873110 /javascript.html | |
| parent | ef636bd62d6ab82e7cc70170f23bffe7bc8bd3cf (diff) | |
| parent | 22d308b2c12525a7ba65fca4f2ca7dba8a2a80bb (diff) | |
| download | bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.tar.xz bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/javascript.html b/javascript.html index 0f97d1c6c..5bac259e2 100644 --- a/javascript.html +++ b/javascript.html @@ -750,10 +750,10 @@ $('#myTab li:eq(2) a').tab('show') // Select third tab (0-indexed) </p> {% highlight html %} <ul class="nav nav-tabs" id="myTab"> - <li class="active"><a href="#home">Home</a></li> - <li><a href="#profile">Profile</a></li> - <li><a href="#messages">Messages</a></li> - <li><a href="#settings">Settings</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="#messages" data-toggle="tab">Messages</a></li> + <li><a href="#settings" data-toggle="tab">Settings</a></li> </ul> <div class="tab-content"> @@ -1456,7 +1456,7 @@ $('.btn-group').button() <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> - <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne"> Collapsible Group Item #1 </a> </h4> @@ -1470,7 +1470,7 @@ $('.btn-group').button() <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> - <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"> Collapsible Group Item #2 </a> </h4> @@ -1484,7 +1484,7 @@ $('.btn-group').button() <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> - <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree"> Collapsible Group Item #3 </a> </h4> @@ -1502,7 +1502,7 @@ $('.btn-group').button() <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> - <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne"> Collapsible Group Item #1 </a> </h4> @@ -1516,7 +1516,7 @@ $('.btn-group').button() <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> - <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"> Collapsible Group Item #2 </a> </h4> @@ -1530,7 +1530,7 @@ $('.btn-group').button() <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> - <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree"> Collapsible Group Item #3 </a> </h4> |