aboutsummaryrefslogtreecommitdiff
path: root/lib/scaffolding.less
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-09-16 11:09:46 -0700
committerJacob Thornton <[email protected]>2011-09-16 11:09:46 -0700
commitaa432390888bae158bbc3014eed9af55103d03aa (patch)
treeb9546431afee3e296dc201ed6228585d3bbd4867 /lib/scaffolding.less
parentf0d5caf0547da84c8e3b80e704510a36d8a4e39b (diff)
parente8d9eb264c3ba8c263d37259f65eece7247b00b9 (diff)
downloadbootstrap-aa432390888bae158bbc3014eed9af55103d03aa.tar.xz
bootstrap-aa432390888bae158bbc3014eed9af55103d03aa.zip
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'lib/scaffolding.less')
-rw-r--r--lib/scaffolding.less6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index e4afa5aeb..13cc4f2b1 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -33,17 +33,17 @@ body {
}
// TODO in v2: rename this and .popover .content to be more specific
> .content {
+ float: left;
min-width: 700px;
max-width: 1180px;
- margin-left: 240px;
- .clearfix();
+ margin-left: 20px;
}
}
+// Toggling content
.hide {
display: none;
}
-
.show {
display: block;
}