From b188c0da8b51cd18d6fa3fa958e823a318ba5f10 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Sep 2011 09:41:58 -0700 Subject: [PATCH] updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having --- bootstrap-1.3.0.css | 18 ++++++------------ bootstrap-1.3.0.min.css | 5 ++--- docs/assets/css/docs.css | 2 ++ examples/fluid.html | 10 +++++++--- lib/scaffolding.less | 6 +++--- lib/tables.less | 3 ++- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index d7ba6bf2d..16bfefdb2 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 e4d8e002e..6d883aa83 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 37e18c8e4..cb1dbb2f7 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 f613b0ebb..ab4bb4367 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -71,9 +71,13 @@
-
a
-
b
-
+
a
+
b
+
+
+
a
+
b
+
diff --git a/lib/scaffolding.less b/lib/scaffolding.less index e4afa5aeb..13cc4f2b1 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 e00250f0d..988483f0e 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);