Skip to content

Commit

Permalink
fix fluid example
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Sep 16, 2011
1 parent 08d0175 commit 732ff9e
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 27 deletions.
20 changes: 9 additions & 11 deletions bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -208,6 +208,7 @@ body {
}
.container-fluid {
position: relative;
min-width: 940px;
padding-left: 20px;
padding-right: 20px;
zoom: 1;
Expand All @@ -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;
Expand All @@ -253,6 +245,12 @@ a:hover {
.pull-left {
float: left;
}
.hide {
display: none;
}
.show {
display: block;
}
.row {
zoom: 1;
margin-left: -20px;
Expand Down
8 changes: 4 additions & 4 deletions bootstrap.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 10 additions & 12 deletions lib/scaffolding.less
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ body {
// Fluid layouts (left aligned, with sidebar, min- & max-width content)
.container-fluid {
position: relative;
min-width: 940px;
padding-left: 20px;
padding-right: 20px;
.clearfix();
Expand All @@ -33,21 +34,10 @@ body {
}
// TODO in v2: rename this and .popover .content to be more specific
> .content {
float: left;
min-width: 700px;
max-width: 1180px;
margin-left: 20px;
margin-left: 240px;
}
}

// Toggling content
.hide {
display: none;
}
.show {
display: block;
}


// BASE STYLES
// -----------
Expand All @@ -72,6 +62,14 @@ a {
float: left;
}

// Toggling content
.hide {
display: none;
}
.show {
display: block;
}


// GRID SYSTEM
// -----------
Expand Down

0 comments on commit 732ff9e

Please sign in to comment.