From 5fbb9e9f5d241744dc2e2cbd1bfd8676c566f22d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 16 May 2013 21:03:29 -0700
Subject: More row change ups:

* No more negative side margins
* However, keep the negative margin for nested rows
---
 docs/examples/grid.html | 2 --
 1 file changed, 2 deletions(-)

(limited to 'docs/examples/grid.html')

diff --git a/docs/examples/grid.html b/docs/examples/grid.html
index 580f69cbf..eea2ac0cf 100644
--- a/docs/examples/grid.html
+++ b/docs/examples/grid.html
@@ -13,8 +13,6 @@ title: Grid template
 
   .row {
     margin-bottom: 20px;
-    margin-left: -15px;
-    margin-right: -15px;
   }
   [class*="col-lg-"] {
     padding-top: 15px;
-- 
cgit v1.2.3


From 5f7352a6fe5f7a7eef4dce64184f55d1fec2676b Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 16 May 2013 22:11:31 -0700
Subject: Better grid template; link color change in docs navbar

---
 docs/examples/grid.html | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'docs/examples/grid.html')

diff --git a/docs/examples/grid.html b/docs/examples/grid.html
index eea2ac0cf..d14602e4e 100644
--- a/docs/examples/grid.html
+++ b/docs/examples/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 -->
-- 
cgit v1.2.3