aboutsummaryrefslogtreecommitdiff
path: root/_includes/nav-css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-16 00:36:46 -0700
committerMark Otto <[email protected]>2013-08-16 00:36:46 -0700
commitafdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a (patch)
treef1e15a8e540f2b3fece2dc6cd817b49a3a76a98f /_includes/nav-css.html
parentafef74d03d393863048f7374a1ff9e0c4ad93bbb (diff)
parent2fa0975956f646be627aaa4732527f6de5335a2c (diff)
downloadbootstrap-afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a.tar.xz
bootstrap-afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a.zip
Merge branch '3.0.0-wip' into bs3_homepage
Diffstat (limited to '_includes/nav-css.html')
-rw-r--r--_includes/nav-css.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/_includes/nav-css.html b/_includes/nav-css.html
index fc10a3037..f5226ec5e 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -15,10 +15,12 @@
<li>
<a href="#grid">Grid system</a>
<ul class="nav">
+ <li><a href="#grid-media-queries">Media queries</a></li>
<li><a href="#grid-options">Available options</a></li>
<li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li>
<li><a href="#grid-example-mixed">Ex: Mobile-desktop</a></li>
<li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktop</a></li>
+ <li><a href="#grid-responsive-resets">Responsive column resets</a></li>
<li><a href="#grid-offsetting">Offset columns</a></li>
<li><a href="#grid-nesting">Nested columns</a></li>
<li><a href="#grid-column-ordering">Column ordering</a></li>
@@ -46,7 +48,7 @@
<li><a href="#tables-bordered">Bordered tables</a></li>
<li><a href="#tables-hover-rows">Hover rows</a></li>
<li><a href="#tables-condensed">Condensed tables</a></li>
- <li><a href="#tables-row-classes">Contextual row classes</a></li>
+ <li><a href="#tables-contextual-classes">Contextual classes</a></li>
</ul>
</li>
<li>
@@ -56,6 +58,7 @@
<li><a href="#forms-inline">Inline variation</a></li>
<li><a href="#forms-horizontal">Horizontal variation</a></li>
<li><a href="#forms-controls">Supported controls</a></li>
+ <li><a href="#forms-controls-static">Static form control</a></li>
<li><a href="#forms-control-states">Control states</a></li>
<li><a href="#forms-control-sizes">Control sizing</a></li>
<li><a href="#forms-help-text">Help text</a></li>