From: pthrasher <philipthrasher@gmail.com>
Date: Fri, 2 Sep 2011 16:45:03 +0000 (-0400)
Subject: incorporated idea from @markdotto in #138
X-Git-Tag: v1.2.0~10^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5960afc3490a174cadaf3bc0f4fe3cf605666756;p=thirdparty%2Fbootstrap.git

incorporated idea from @markdotto in #138
---

diff --git a/lib/patterns.less b/lib/patterns.less
index 83d7c5428c..d0e4cda123 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 ded9a1e5f1..5863659c2c 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;