From: Mark Otto Date: Sat, 10 Sep 2011 03:48:45 +0000 (-0700) Subject: fix the grid before 1.3.0 drops soon X-Git-Tag: v1.3.0~2^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a40690a17c1a72fe2364518a62962d6bb5616373;p=thirdparty%2Fbootstrap.git fix the grid before 1.3.0 drops soon --- diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index b7fe65e783..b0ecc57439 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.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: Fri Sep 2 15:07:03 PDT 2011 + * Date: Fri Sep 9 20:48:32 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). @@ -279,7 +279,7 @@ textarea { .row:after { clear: both; } -.row [class^="span"] { +.row [class*="span"] { display: inline; float: left; margin-left: 20px; diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index 95b54405bb..f423a5a95d 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -30,7 +30,7 @@ textarea{overflow:auto;vertical-align:top;} .btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .row{zoom:1;margin-bottom:18px;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} -.row [class^="span"]{display:inline;float:left;margin-left:20px;} +.row [class*="span"]{display:inline;float:left;margin-left:20px;} .row .span1{width:40px;} .row .span2{width:100px;} .row .span3{width:160px;} diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 615e6be78d..c07686ab3b 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -13,7 +13,7 @@ // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7) // Credit to @dhg for the idea - [class^="span"] { + [class*="span"] { display: inline; float: left; margin-left: @gridGutterWidth;