From e6ffd3a86fcc3585cf2291b151fb4625f435586e Mon Sep 17 00:00:00 2001
From: pthrasher <philipthrasher@gmail.com>
Date: Fri, 2 Sep 2011 10:43:26 -0400
Subject: Fix for issue #136. Now nests fine in both layouts.

---
 lib/patterns.less | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index d0e4cda12..83d7c5428 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -742,6 +742,9 @@ input[type=submit].btn {
   .content {
     background-color: @white;
     padding: 14px;
+    min-width:inherit;
+    max-width:inherit;
+    margin:auto;
     .border-radius(0 0 3px 3px);
     .background-clip(padding-box);
     p, ul, ol {
-- 
cgit v1.2.3


From 5960afc3490a174cadaf3bc0f4fe3cf605666756 Mon Sep 17 00:00:00 2001
From: pthrasher <philipthrasher@gmail.com>
Date: Fri, 2 Sep 2011 12:45:03 -0400
Subject: incorporated idea from @markdotto in #138

---
 lib/patterns.less    | 3 ---
 lib/scaffolding.less | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/patterns.less b/lib/patterns.less
index 83d7c5428..d0e4cda12 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -742,9 +742,6 @@ input[type=submit].btn {
   .content {
     background-color: @white;
     padding: 14px;
-    min-width:inherit;
-    max-width:inherit;
-    margin:auto;
     .border-radius(0 0 3px 3px);
     .background-clip(padding-box);
     p, ul, ol {
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index ded9a1e5f..5863659c2 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -90,11 +90,11 @@ body {
 .container-fluid {
   padding: 0 20px;
   .clearfix();
-  .sidebar {
+  > .sidebar {
     float: left;
     width: 220px;
   }
-  .content {
+  > .content {
     min-width: 700px;
     max-width: 1180px;
     margin-left: 240px;
-- 
cgit v1.2.3