update to reflect fix in master for fluid layout example

This commit is contained in:
Mark Otto
2011-09-16 14:08:07 -07:00
parent 30731d6ebc
commit 9fbc3eb928
3 changed files with 14 additions and 16 deletions
+9 -11
View File
@@ -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;
+4 -4
View File
@@ -24,15 +24,15 @@ html,body{background-color:#ffffff;}
body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#404040;}
.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;*display:inline;}
.container:after{clear:both;}
.container-fluid{position:relative;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
.container-fluid{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
.container-fluid:after{clear:both;}
.container-fluid>.sidebar{float:left;width:220px;}
.container-fluid>.content{float:left;min-width:700px;max-width:1180px;margin-left:20px;}
.hide{display:none;}
.show{display:block;}
.container-fluid>.content{margin-left:240px;}
a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;}
.pull-right{float:right;}
.pull-left{float:left;}
.hide{display:none;}
.show{display:block;}
.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;}
.row:after{clear:both;}
[class*="span"]{display:inline;float:left;margin-left:20px;}
+1 -1
View File
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../1.3.0/bootstrap.css" rel="stylesheet">
<link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;