diff options
| author | Jacob Thornton <[email protected]> | 2012-01-27 11:07:17 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-27 11:07:17 -0800 |
| commit | 3b3dbd7229f53eb71759def4eca90dfd7a2699f8 (patch) | |
| tree | 89a8af1724ef8791a315a028c5515a5ec8500d3b /docs/scaffolding.html | |
| parent | aa594501bd24d51181dc3504602aa4aaefb1cb60 (diff) | |
| parent | 97546adc90a9c8149bb4560641b4164338e38063 (diff) | |
| download | bootstrap-3b3dbd7229f53eb71759def4eca90dfd7a2699f8.tar.xz bootstrap-3b3dbd7229f53eb71759def4eca90dfd7a2699f8.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index f49b8d6c4..51dfc6dbb 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -136,6 +136,8 @@ </div> </div><!-- /row --> + <br> + <h2>Offsetting columns</h2> <div class="row show-grid"> <div class="span4">4</div> @@ -148,6 +150,12 @@ <div class="row show-grid"> <div class="span8 offset4">8 offset 4</div> </div><!-- /row --> +<pre class="prettyprint linenums"> +<div class="row"> + <div class="span4">...</div> + <div class="span4 offset4">...</div> +</div> +</pre> <br> |