aboutsummaryrefslogtreecommitdiff
path: root/getting-started.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-07 11:41:02 -0800
committerMark Otto <[email protected]>2013-12-07 11:41:02 -0800
commitcc1f95652bbf5c7d7ab5b040cdc15478d68e0369 (patch)
tree2b0c31076784e3d74e4e9d05b62916a696e1b959 /getting-started.html
parent775c29fef6d87dd91ebc6dba5980f3b59976b435 (diff)
parent94a5413ec7fb90c1340f1243869274c36d308cb0 (diff)
downloadbootstrap-cc1f95652bbf5c7d7ab5b040cdc15478d68e0369.tar.xz
bootstrap-cc1f95652bbf5c7d7ab5b040cdc15478d68e0369.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'getting-started.html')
-rw-r--r--getting-started.html10
1 files changed, 10 insertions, 0 deletions
diff --git a/getting-started.html b/getting-started.html
index 18f89adc3..29a9c6f81 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -688,6 +688,16 @@ bootstrap/
<td class="text-muted">N/A</td>
</tr>
<tr>
+ <td>Pill-based tabbable area</td>
+ <td><code>.pill-content</code></td>
+ <td><code>.tab-content</code></td>
+ </tr>
+ <tr>
+ <td>Pill-based tabbable area pane</td>
+ <td><code>.pill-pane</code></td>
+ <td><code>.tab-pane</code></td>
+ </tr>
+ <tr>
<td>Nav lists</td>
<td><code>.nav-list</code> <code>.nav-header</code></td>
<td>No direct equivalent, but <a href="../components/#list-group">list groups</a> and <a href="../javascript/#collapse"><code>.panel-group</code>s</a> are similar.</td>