aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-07 01:59:53 -0800
committerMark Otto <[email protected]>2012-01-07 01:59:53 -0800
commit5fb2c666acfd5e7d2f134d2cb5b65b828102c5a9 (patch)
tree2624482cc8403f0aab60ac4dbde70db18bf1f780 /lib
parent45d671d97f4d448780729bbb6357e9ec776f980c (diff)
downloadbootstrap-5fb2c666acfd5e7d2f134d2cb5b65b828102c5a9.tar.xz
bootstrap-5fb2c666acfd5e7d2f134d2cb5b65b828102c5a9.zip
update the fluid examples to use new classes and clear the floats properly from sidebar
Diffstat (limited to 'lib')
-rw-r--r--lib/scaffolding.less22
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index d75adba56..f454b2e91 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -29,21 +29,23 @@ body {
padding-right: 20px;
.clearfix();
}
+
// Sidebars (left and right options)
-.fluid-sidebar-left,
-.fluid-sidebar-right {
+.fluid-sidebar {
width: 220px;
+ margin: 0 20px 18px;
}
-.fluid-sidebar-left { float: left; }
-.fluid-sidebar-right { float: right; }
+.sidebar-left { padding-left: 260px; }
+.sidebar-right { padding-right: 260px; }
+
+// Float the sidebars accordingly
+.sidebar-left .fluid-sidebar { float: left; margin-left: -240px; }
+.sidebar-right .fluid-sidebar { float: right; margin-right: -240px; }
+
// The main content area
.fluid-content {
- margin-left: 240px;
-}
-// Reverse layout for sidebar on right
-.fluid-container.reverse .fluid-content {
- margin-left: 0;
- margin-right: 240px;
+ float: left;
+ width: 100%;
}