diff options
| author | Mark Otto <[email protected]> | 2013-09-01 10:27:20 +0200 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-01 10:27:20 +0200 |
| commit | 129d8fcebc3e43a7dd03abd2baa8e8134f8e28f3 (patch) | |
| tree | 78c5cc4a613345d0d8e8bae7a8b3d0f469a39d41 | |
| parent | e2c6d329974ac16fab28962fbed089b745a036a5 (diff) | |
| download | bootstrap-129d8fcebc3e43a7dd03abd2baa8e8134f8e28f3.tar.xz bootstrap-129d8fcebc3e43a7dd03abd2baa8e8134f8e28f3.zip | |
fixes #10282: Cross reference tabs and tabs plugin
| -rw-r--r-- | components.html | 4 | ||||
| -rw-r--r-- | javascript.html | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/components.html b/components.html index 12c72e00a..edc6e5216 100644 --- a/components.html +++ b/components.html @@ -1210,6 +1210,10 @@ base_url: "../" <li><a href="#">Messages</a></li> </ul> {% endhighlight %} + <div class="bs-callout bs-callout-info"> + <h4>Requires JavaScript tabs plugin</h4> + <p>For tabs with tabbable areas, you must use the <a href="../javascript/#tabs">tabs JavaScript plugin</a>.</p> + </div> <h2 id="nav-pills">Pills</h2> <p>Take that same HTML, but use <code>.nav-pills</code> instead:</p> diff --git a/javascript.html b/javascript.html index 48aaf2cd9..6aca121e4 100644 --- a/javascript.html +++ b/javascript.html @@ -687,6 +687,11 @@ $('#myScrollspy').on('activate.bs.scrollspy', function () { </div> </div><!-- /example --> + <div class="bs-callout bs-callout-info"> + <h4>Extends tabbed navigation</h4> + <p>This plugin extends the <a href="../components/#nav-tabs">tabbed navigation component</a> to add tabbable areas.</p> + </div> + <h2 id="tabs-usage">Usage</h2> <p>Enable tabbable tabs via JavaScript (each tab needs to be activated individually):</p> |