diff options
| author | Mark Otto <[email protected]> | 2015-03-28 20:31:53 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-03-28 20:31:53 -0700 |
| commit | 57c8e3cd51abcb4230d37863b40bcca564d033f4 (patch) | |
| tree | 32ccb26c5f92cd96d9d569e9db277b2990ce04e3 /docs/_includes | |
| parent | df8010b815b8cc4d2f5854b9ec05ca05143be29e (diff) | |
| parent | 93bf800e1f00861525688007ae7aaf6f3daeda47 (diff) | |
| download | bootstrap-57c8e3cd51abcb4230d37863b40bcca564d033f4.tar.xz bootstrap-57c8e3cd51abcb4230d37863b40bcca564d033f4.zip | |
Merge branch 'master' into input_sizing
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/js/tabs.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/_includes/js/tabs.html b/docs/_includes/js/tabs.html index 8c4c3c08f..3cd5e1b67 100644 --- a/docs/_includes/js/tabs.html +++ b/docs/_includes/js/tabs.html @@ -3,7 +3,7 @@ <h2 id="tabs-examples">Example tabs</h2> <p>Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.</p> - <div class="bs-example bs-example-tabs" role="tabpanel" data-example-id="togglable-tabs"> + <div class="bs-example bs-example-tabs" data-example-id="togglable-tabs"> <ul id="myTabs" class="nav nav-tabs" role="tablist"> <li role="presentation" class="active"><a href="#home" id="home-tab" role="tab" data-toggle="tab" aria-controls="home" aria-expanded="true">Home</a></li> <li role="presentation"><a href="#profile" role="tab" id="profile-tab" data-toggle="tab" aria-controls="profile">Profile</a></li> @@ -59,7 +59,7 @@ $('#myTabs li:eq(2) a').tab('show') // Select third tab (0-indexed) <h3>Markup</h3> <p>You can activate a tab or pill navigation without writing any JavaScript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element. Adding the <code>nav</code> and <code>nav-tabs</code> classes to the tab <code>ul</code> will apply the Bootstrap <a href="../components/#nav-tabs">tab styling</a>, while adding the <code>nav</code> and <code>nav-pills</code> classes will apply <a href="../components/#nav-pills">pill styling</a>.</p> {% highlight html %} -<div role="tabpanel"> +<div> <!-- Nav tabs --> <ul class="nav nav-tabs" role="tablist"> |