aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-09 23:43:43 -0700
committerMark Otto <[email protected]>2013-06-09 23:43:43 -0700
commit993efebe4fad6b0c9fdba525963036f10991c31b (patch)
tree4f0fe58f6ab9cc0f6fe058de18a1e8b5dfa19a05
parent37cd7b8596f2e288e8286ebbe11319cd8d480a80 (diff)
downloadbootstrap-993efebe4fad6b0c9fdba525963036f10991c31b.tar.xz
bootstrap-993efebe4fad6b0c9fdba525963036f10991c31b.zip
Redo grid documentation
* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations * Add more examples to the grid example page * Red columns instead of gray for more Bootstrapy aesthetic
-rw-r--r--grid.html34
1 files changed, 32 insertions, 2 deletions
diff --git a/grid.html b/grid.html
index 98dd760da..14e8ecdf6 100644
--- a/grid.html
+++ b/grid.html
@@ -24,8 +24,8 @@ title: Grid template
[class*="col-lg-"] {
padding-top: 15px;
padding-bottom: 15px;
- background-color: #f5f5f5;
- border: 1px solid #e5e5e5;
+ background-color: rgba(185,74,72,.15);
+ border: 1px solid rgba(185,74,72,.2);
}
</style>
@@ -70,5 +70,35 @@ title: Grid template
<div class="col-lg-4">.col-lg-4</div>
</div>
+ <h4>Mixed: mobile and desktop</h4>
+ <div class="row">
+ <div class="col-12 col-lg-8">.col-12 .col-lg-8</div>
+ <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+ </div>
+ <div class="row">
+ <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+ <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+ <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+ </div>
+ <div class="row">
+ <div class="col-6 col-lg-6">.col-6 .col-lg-6</div>
+ <div class="col-6 col-lg-6">.col-6 .col-lg-6</div>
+ </div>
+
+ <h4>Mixed: mobile, tablet, and desktop</h4>
+ <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>
+ <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>
+ <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>
+
</div> <!-- /container -->