diff options
| author | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
| commit | 4fc2907723e7f7bb5b14eb5cec94d629b6834e7f (patch) | |
| tree | a9c1df41fbf5f912234f762f03668ea4ef9fd2b7 /_includes/nav-css.html | |
| parent | 0e8baab34ae21c813afb9d8c24b3cb2105aebc46 (diff) | |
| parent | 9966d035cd35c510369286cbb645340bdd6ffc95 (diff) | |
| download | bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.tar.xz bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs-assets/css/docs.css
docs-assets/js/application.js
Diffstat (limited to '_includes/nav-css.html')
| -rw-r--r-- | _includes/nav-css.html | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 543d004f3..0228932dd 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -16,6 +16,7 @@ <li><a href="#grid-media-queries">Media queries</a></li> <li><a href="#grid-options">Grid options</a></li> <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li> + <li><a href="#grid-example-fluid">Ex: Fluid container</a></li> <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li> <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li> <li><a href="#grid-responsive-resets">Responsive column resets</a></li> @@ -37,7 +38,14 @@ <li><a href="#type-lists">Lists</a></li> </ul> </li> -<li><a href="#code">Code</a></li> +<li> + <a href="#code">Code</a> + <ul class="nav"> + <li><a href="#code-inline">Inline code</a></li> + <li><a href="#code-user-input">User input</a></li> + <li><a href="#code-block">Blocks of code</a></li> + </ul> +</li> <li> <a href="#tables">Tables</a> <ul class="nav"> |