diff options
| author | Mark Otto <[email protected]> | 2013-08-02 14:08:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-02 14:08:58 -0700 |
| commit | 7cd54e52f2d731fcf08cd2508a45417637fba4d9 (patch) | |
| tree | 2ba24d3e5517d66ed88048812c29803dac6b7220 | |
| parent | d46e645a0f19b24280bf700f4d4fb56caadb4409 (diff) | |
| parent | b86cac65b6105f2891be795abad1f0c78d02810f (diff) | |
| download | bootstrap-7cd54e52f2d731fcf08cd2508a45417637fba4d9.tar.xz bootstrap-7cd54e52f2d731fcf08cd2508a45417637fba4d9.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
| -rw-r--r-- | css.html | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -263,32 +263,32 @@ base_url: "../" <p>Build on the previous example by creating even more dynamic and powerful layouts with tablet <code>.col-sm-*</code> classes.</p> <div class="bs-docs-grid"> <div class="row show-grid"> - <div class="col-12 col-sm-8 col-lg-8">.col-12 .col-lg-8</div> - <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> + <div class="col-12 col-sm-8 col-lg-8">.col-12 .col-sm-8 .col-lg-8</div> + <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-sm-4 .col-lg-4</div> </div> <div class="row show-grid"> - <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> - <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> - <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> + <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-sm-4 .col-lg-4</div> + <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-sm-4 .col-lg-4</div> + <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-sm-4 .col-lg-4</div> </div> <div class="row show-grid"> - <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div> - <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div> + <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-sm-6 .col-lg-6</div> + <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-sm-6 .col-lg-6</div> </div> </div> {% highlight html %} <div class="row"> - <div class="col-12 col-sm-8 col-lg-8">.col-12 .col-lg-8</div> - <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> + <div class="col-12 col-sm-8 col-lg-8">.col-12 .col-sm-8 .col-lg-8</div> + <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-sm-4 .col-lg-4</div> </div> <div class="row"> - <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> - <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> - <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> + <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-sm-4 .col-lg-4</div> + <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-sm-4 .col-lg-4</div> + <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-sm-4 .col-lg-4</div> </div> <div class="row"> - <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div> - <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div> + <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-sm-6 .col-lg-6</div> + <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-sm-6 .col-lg-6</div> </div> {% endhighlight %} |