diff options
| author | Mark Otto <[email protected]> | 2013-08-02 13:58:06 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-02 13:58:06 -0700 |
| commit | 83eea13e6395d414a3c297c24b7f0f5dd7d7acce (patch) | |
| tree | ec7987e2b55a92c0ce56f2bf6674ed46c73c2a3e /css.html | |
| parent | e23b7ec20e672e7878ef235c751f3ab3fe793140 (diff) | |
| parent | 1583dd55e9f05275ee054884720dce2be8e2f07a (diff) | |
| download | bootstrap-83eea13e6395d414a3c297c24b7f0f5dd7d7acce.tar.xz bootstrap-83eea13e6395d414a3c297c24b7f0f5dd7d7acce.zip | |
Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'css.html')
| -rw-r--r-- | css.html | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -299,31 +299,31 @@ base_url: "../" </div> <h3 id="grid-offsetting">Offsetting columns</h3> - <p>Move columns to the right using <code>.col-offset-*</code> classes. These classes increase the left margin of a column by <code>*</code> columns. For example, <code>.col-offset-4</code> moves <code>.col-lg-4</code> over four columns.</p> + <p>Move columns to the right using <code>.col-lg-offset-*</code> classes. These classes increase the left margin of a column by <code>*</code> columns. For example, <code>.col-lg-offset-4</code> moves <code>.col-lg-4</code> over four columns.</p> <div class="bs-docs-grid"> <div class="row show-grid"> <div class="col-lg-4">4</div> - <div class="col-lg-4 col-offset-4">4 offset 4</div> + <div class="col-lg-4 col-lg-offset-4">4 offset 4</div> </div><!-- /row --> <div class="row show-grid"> - <div class="col-lg-3 col-offset-3">3 offset 3</div> - <div class="col-lg-3 col-offset-3">3 offset 3</div> + <div class="col-lg-3 col-lg-offset-3">3 offset 3</div> + <div class="col-lg-3 col-lg-offset-3">3 offset 3</div> </div><!-- /row --> <div class="row show-grid"> - <div class="col-lg-6 col-offset-3">6 offset 3</div> + <div class="col-lg-6 col-lg-offset-3">6 offset 3</div> </div><!-- /row --> </div> {% highlight html %} <div class="row"> <div class="col-lg-4">...</div> - <div class="col-lg-4 col-offset-4">...</div> + <div class="col-lg-4 col-lg-offset-4">...</div> </div> <div class="row"> - <div class="col-lg-3 col-offset-3">3 offset 3</div> - <div class="col-lg-3 col-offset-3">3 offset 3</div> + <div class="col-lg-3 col-lg-offset-3">3 offset 3</div> + <div class="col-lg-3 col-lg-offset-3">3 offset 3</div> </div> <div class="row"> - <div class="col-lg-6 col-offset-3">...</div> + <div class="col-lg-6 col-lg-offset-3">...</div> </div> {% endhighlight %} @@ -360,16 +360,16 @@ base_url: "../" {% endhighlight %} <h3 id="grid-column-ordering">Column ordering</h3> - <p>Easily change the order of our built-in grid columns with <code>.col-push-*</code> and <code>.col-pull-*</code> modifier classes.</p> + <p>Easily change the order of our built-in grid columns with <code>.col-lg-push-*</code> and <code>.col-lg-pull-*</code> modifier classes.</p> <div class="row show-grid"> - <div class="col-lg-9 col-push-3">9</div> - <div class="col-lg-3 col-pull-9">3</div> + <div class="col-lg-9 col-lg-push-3">9</div> + <div class="col-lg-3 col-lg-pull-9">3</div> </div> {% highlight html %} <div class="row"> - <div class="col-lg-9 col-push-3">9</div> - <div class="col-lg-3 col-pull-9">3</div> + <div class="col-lg-9 col-lg-push-3">9</div> + <div class="col-lg-3 col-lg-pull-9">3</div> </div> {% endhighlight %} |