diff options
| author | Jacob Thornton <[email protected]> | 2011-11-30 22:05:49 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-11-30 22:05:49 -0800 |
| commit | b1cba98aab5ee2d0576bbbbb92ba3488516290eb (patch) | |
| tree | cb938e0ba8f666ffbd8e6436b8e3b4fb1490adc4 /docs/scaffolding.html | |
| parent | dc628c9115b74e49940c0cc200a8914232c9d2a2 (diff) | |
| parent | bc51c15709469fd0c2e78886a15e849626a8f191 (diff) | |
| download | bootstrap-b1cba98aab5ee2d0576bbbbb92ba3488516290eb.tar.xz bootstrap-b1cba98aab5ee2d0576bbbbb92ba3488516290eb.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 10ad71a74..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 @@ -162,7 +171,7 @@ </div> <h2>Grid customization</h2> - <table class="striped-table"> + <table class="bordered-table striped-table"> <thead> <tr> <th>Variable</th> @@ -173,12 +182,12 @@ <tbody> <tr> <td><code>@gridColumns</code></td> - <td>16</td> + <td>12</td> <td>The number of columns within the grid</td> </tr> <tr> <td><code>@gridColumnWidth</code></td> - <td>40px</td> + <td>60px</td> <td>The width of each column within the grid</td> </tr> <tr> @@ -274,7 +283,7 @@ <div class="span8"> <h2>Supported devices</h2> <p>Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p> - <table class="striped-table"> + <table class="bordered-table striped-table"> <thead> <tr> <th>Label</th> |