diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index d7ba6bf2d3f2956fe1fb4355468fd1cd5ac6357c..16bfefdb2851d7276257c3bdc938d676bcca6591 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.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: Wed Sep 14 08:56:48 PDT 2011 + * Date: Thu Sep 15 09:29:41 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). @@ -226,19 +226,10 @@ body { width: 220px; } .container-fluid > .content { + float: left; min-width: 700px; max-width: 1180px; - margin-left: 240px; - zoom: 1; -} -.container-fluid > .content:before, .container-fluid > .content:after { - display: table; - content: ""; - zoom: 1; - *display: inline; -} -.container-fluid > .content:after { - clear: both; + margin-left: 20px; } .hide { display: none; @@ -1101,6 +1092,9 @@ table { margin-bottom: 18px; padding: 0; border-collapse: separate; + *border-collapse: collapse; + /* IE7, collapse table to remove spacing */ + font-size: 13px; border: 1px solid #ddd; -webkit-border-radius: 4px; diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index e4d8e002e16a19ea92edb0852e044378b4ff0663..6d883aa83a0ded7c3bd0c01d4ee40779c961f7ee 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -27,8 +27,7 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size: .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:after{clear:both;} .container-fluid>.sidebar{float:left;width:220px;} -.container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;zoom:1;}.container-fluid>.content:before,.container-fluid>.content:after{display:table;content:"";zoom:1;*display:inline;} -.container-fluid>.content:after{clear:both;} +.container-fluid>.content{float:left;min-width:700px;max-width:1180px;margin-left:20px;} .hide{display:none;} .show{display:block;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;} @@ -182,7 +181,7 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} .form-stacked div.clearfix.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} .form-stacked .actions{margin-left:-20px;padding-left:20px;} -table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} +table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;*border-collapse:collapse;font-size:13px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom:1px solid #ddd;} table td{vertical-align:top;} table th+th,table td+td{border-left:1px solid #ddd;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 37e18c8e44467c81fad2e4a2b8becefbd36127da..cb1dbb2f72c0d4b96c52862e8c57369bee151f0f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -22,6 +22,7 @@ section > .row { /* Jumbotrons -------------------------------------------------- */ .jumbotron { + min-width: 940px; padding-top: 40px; } .jumbotron .inner { @@ -98,6 +99,7 @@ section > .row { -------------------------------------------------- */ .footer { background-color: #eee; + min-width: 940px; padding: 30px 0; text-shadow: 0 1px 0 #fff; border-top: 1px solid #e5e5e5; diff --git a/examples/fluid.html b/examples/fluid.html index f613b0ebb33f96bc4e02d0889954c4d9304364a1..ab4bb4367d3485fc73384c9f1160a30fc08d86c7 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -71,9 +71,13 @@ <div class="content"> <!-- Main hero unit for a primary marketing message or call to action --> <div class="row"> -<div class="span4">a</div> -<div class="span12">b</div> -</div> + <div class="span4">a</div> + <div class="span12">b</div> + </div> + <div class="row"> + <div class="span4">a</div> + <div class="span12">b</div> + </div> <!-- Example row of columns --> <div class="row"> <div class="span6"> diff --git a/lib/scaffolding.less b/lib/scaffolding.less index e4afa5aebf03db89b0de85f82c3b0ca753624dfa..13cc4f2b1f641f0f91d7c06c938511df93cb9804 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; } diff --git a/lib/tables.less b/lib/tables.less index e00250f0da3e2401d538b0a6f35741ad81be8d69..988483f0ef82aa1eeac58fd1829283e627f675ba 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -11,7 +11,8 @@ table { width: 100%; margin-bottom: @baseline; padding: 0; - border-collapse: separate; + border-collapse: separate; // Done so we can round those corners! + *border-collapse: collapse; /* IE7, collapse table to remove spacing */ font-size: @basefont; border: 1px solid #ddd; .border-radius(4px);