aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorpthrasher <[email protected]>2011-09-02 12:45:03 -0400
committerpthrasher <[email protected]>2011-09-02 12:45:03 -0400
commit5960afc3490a174cadaf3bc0f4fe3cf605666756 (patch)
tree1de6f7998c5f7de4c73cbed146af0a61abf30e7e /lib
parentce1d1c2146fd9f11335671464232d7ec1fd7f401 (diff)
downloadbootstrap-5960afc3490a174cadaf3bc0f4fe3cf605666756.tar.xz
bootstrap-5960afc3490a174cadaf3bc0f4fe3cf605666756.zip
incorporated idea from @markdotto in #138
Diffstat (limited to 'lib')
-rw-r--r--lib/patterns.less3
-rw-r--r--lib/scaffolding.less4
2 files changed, 2 insertions, 5 deletions
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;