]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fixes #10282: Cross reference tabs and tabs plugin
authorMark Otto <otto@github.com>
Sun, 1 Sep 2013 08:27:20 +0000 (10:27 +0200)
committerMark Otto <otto@github.com>
Sun, 1 Sep 2013 08:27:20 +0000 (10:27 +0200)
components.html
javascript.html

index 12c72e00ae5a9df6b5fa88a3f8a5d81affaaf2cb..edc6e52167e2f3f84ce571e6caada86d9b8804a0 100644 (file)
@@ -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>
index 48aaf2cd9f744f8ccdeec9d1b6e12ee3d647dd1e..6aca121e4cf785fcd04a0eb5d32f3b2a0189c318 100644 (file)
@@ -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>