diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-27 11:06:31 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-27 11:06:31 +0300 |
| commit | 3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc (patch) | |
| tree | 5fa0a3d3556a83cd96147da46e90ae9f361d8efc /docs/examples/grid.html | |
| parent | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (diff) | |
| parent | 7cbb1c0452a1d9904f7655aea78644def85b7f2e (diff) | |
| download | bootstrap-3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc.tar.xz bootstrap-3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/bootstrap-collapse.js
Diffstat (limited to 'docs/examples/grid.html')
| -rw-r--r-- | docs/examples/grid.html | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/docs/examples/grid.html b/docs/examples/grid.html index 580f69cbf..d14602e4e 100644 --- a/docs/examples/grid.html +++ b/docs/examples/grid.html @@ -11,10 +11,15 @@ title: Grid template padding-right: 15px; } + h4 { + margin-top: 25px; + } .row { margin-bottom: 20px; - margin-left: -15px; - margin-right: -15px; + } + .row .row { + margin-top: 10px; + margin-bottom: 0; } [class*="col-lg-"] { padding-top: 15px; @@ -51,6 +56,19 @@ title: Grid template </div> <h4>Full width, single column</h4> - <p class="text-muted">No grid classes are necessary for full-width elements.</p> + <p class="text-warning">No grid classes are necessary for full-width elements.</p> + + <h4>Two columns with two nested columns</h4> + <div class="row"> + <div class="col col-lg-8"> + .col .col-lg-8 + <div class="row"> + <div class="col col-lg-6">.col .col-lg-6</div> + <div class="col col-lg-6">.col .col-lg-6</div> + </div> + </div> + <div class="col col-lg-4">.col .col-lg-4</div> + </div> + </div> <!-- /container --> |