aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-05-16 22:11:31 -0700
committerMark Otto <[email protected]>2013-05-16 22:11:31 -0700
commit9ecde4aab7e0376e5b89622df2dba800e78ed4a7 (patch)
treee601fb62c572f2b7824dc6011af6b36f020d64b7
parent551d72908355f869cdd94e8866f15678bef64ad3 (diff)
downloadbootstrap-9ecde4aab7e0376e5b89622df2dba800e78ed4a7.tar.xz
bootstrap-9ecde4aab7e0376e5b89622df2dba800e78ed4a7.zip
Better grid template; link color change in docs navbar
-rw-r--r--grid.html22
1 files changed, 21 insertions, 1 deletions
diff --git a/grid.html b/grid.html
index eea2ac0cf..d14602e4e 100644
--- a/grid.html
+++ b/grid.html
@@ -11,9 +11,16 @@ title: Grid template
padding-right: 15px;
}
+ h4 {
+ margin-top: 25px;
+ }
.row {
margin-bottom: 20px;
}
+ .row .row {
+ margin-top: 10px;
+ margin-bottom: 0;
+ }
[class*="col-lg-"] {
padding-top: 15px;
padding-bottom: 15px;
@@ -49,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 -->