aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-16 14:07:18 -0700
committerMark Otto <[email protected]>2011-09-16 14:07:18 -0700
commit732ff9ed1c0b590c17951de412024cb7acd5763a (patch)
tree197410be030ea6a2dea53920cf6a6ae3d14237aa /bootstrap.css
parent08d017592b8369bca64a90eb4b8305bf36ea1412 (diff)
downloadbootstrap-732ff9ed1c0b590c17951de412024cb7acd5763a.tar.xz
bootstrap-732ff9ed1c0b590c17951de412024cb7acd5763a.zip
fix fluid example
Diffstat (limited to 'bootstrap.css')
-rw-r--r--bootstrap.css20
1 files changed, 9 insertions, 11 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 117f510f4..8b6fe3eb4 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Sep 16 11:24:41 PDT 2011
+ * Date: Fri Sep 16 14:07:03 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -208,6 +208,7 @@ body {
}
.container-fluid {
position: relative;
+ min-width: 940px;
padding-left: 20px;
padding-right: 20px;
zoom: 1;
@@ -226,16 +227,7 @@ body {
width: 220px;
}
.container-fluid > .content {
- float: left;
- min-width: 700px;
- max-width: 1180px;
- margin-left: 20px;
-}
-.hide {
- display: none;
-}
-.show {
- display: block;
+ margin-left: 240px;
}
a {
color: #0069d6;
@@ -253,6 +245,12 @@ a:hover {
.pull-left {
float: left;
}
+.hide {
+ display: none;
+}
+.show {
+ display: block;
+}
.row {
zoom: 1;
margin-left: -20px;