diff options
| author | Evan Meagher <[email protected]> | 2011-12-02 10:47:46 -0800 |
|---|---|---|
| committer | Evan Meagher <[email protected]> | 2011-12-02 10:47:46 -0800 |
| commit | 3726df695eedecee323920305cb5d486a787acd6 (patch) | |
| tree | cc1727ab482f0ddc35ed84da330802c180bcb860 /docs/scaffolding.html | |
| parent | 61e84d8762d79befb2d75685705fd4e451a609fe (diff) | |
| parent | cee2f61898f4807311402fed747a93ee68a31f8f (diff) | |
| download | bootstrap-3726df695eedecee323920305cb5d486a787acd6.tar.xz bootstrap-3726df695eedecee323920305cb5d486a787acd6.zip | |
Merge remote-tracking branch 'upstream/2.0-wip' into add-vertical-nav-divider
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index f330d750d..dd7f05bc6 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -50,9 +50,18 @@ ================================================== --> <header class="jumbotron subhead" id="overview"> <h1>Scaffolding</h1> - <p class="lead">Responsive 12-column grid and fixed- and fluid-width layouts</p> + <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p> </header> + <!-- Work in progress sub nav for docs --> + <div class="navbar subnav docked-top"> + <ul class="nav"> + <li class="active"><a href="#">Grid system</a></li> + <li><a href="#">Layouts</a></li> + <li><a href="#">Responsive</a></li> + </ul> + </div> + <!-- Grid system |