From: Mark Otto <otto@github.com>
Date: Fri, 17 May 2013 05:11:31 +0000 (-0700)
Subject: Better grid template; link color change in docs navbar
X-Git-Tag: v3.0.0~81^2~11^2~1^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ecde4aab7e0376e5b89622df2dba800e78ed4a7;p=thirdparty%2Fbootstrap.git

Better grid template; link color change in docs navbar
---

diff --git a/grid.html b/grid.html
index eea2ac0cf2..d14602e4ec 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 -->