aboutsummaryrefslogtreecommitdiff
path: root/_includes
diff options
context:
space:
mode:
authorfat <[email protected]>2013-08-04 15:45:51 -0700
committerfat <[email protected]>2013-08-04 15:45:51 -0700
commitf22a077f6ea0e0d85d9899a1f44eab4733ca6af6 (patch)
tree95c0b4c0bedd3a2ac1aa61e03d0ead12c7827f4f /_includes
parentb1d21731adfc04adb654133988f3c8e444d8b240 (diff)
parentb6390d298aa71e6dccb10e539097fbc7aaa45b8a (diff)
downloadbootstrap-f22a077f6ea0e0d85d9899a1f44eab4733ca6af6.tar.xz
bootstrap-f22a077f6ea0e0d85d9899a1f44eab4733ca6af6.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to '_includes')
-rw-r--r--_includes/nav-components.html16
1 files changed, 14 insertions, 2 deletions
diff --git a/_includes/nav-components.html b/_includes/nav-components.html
index baf462322..109df8a11 100644
--- a/_includes/nav-components.html
+++ b/_includes/nav-components.html
@@ -80,7 +80,13 @@
<li><a href="#type-components-page-header">Page header</a></li>
</ul>
</li>
-<li><a href="#thumbnails">Thumbnails</a></li>
+<li>
+ <a href="#thumbnails">Thumbnails</a>
+ <ul class="nav">
+ <li><a href="#thumbnails-default">Default thumbnails</a></li>
+ <li><a href="#thumbnails-custom-content">Custom content</a></li>
+ </ul>
+</li>
<li>
<a href="#alerts">Alerts</a>
<ul class="nav">
@@ -99,7 +105,13 @@
<li><a href="#progress-stacked">Stacked</a></li>
</ul>
</li>
-<li><a href="#media">Media object</a></li>
+<li>
+ <a href="#media">Media object</a>
+ <ul class="nav">
+ <li><a href="#media-default">Default media</a></li>
+ <li><a href="#media-list">Media list</a></li>
+ </ul>
+</li>
<li>
<a href="#list-group">List group</a>
<ul class="nav">