From de44b4c653d817c407983c9f94f535e2959749bf Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 4 Nov 2011 13:34:44 -0700 Subject: [PATCH] fix > & bug and point to 1.1.4 less version --- bootstrap.css | 26 +++++++++++++------------- bootstrap.min.css | 24 ++++++++++++------------ docs/index.html | 2 +- lib/scaffolding.less | 24 ++++++++++++------------ 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index b8ae9b6927..d035edf012 100644 --- a/bootstrap.css +++ b/bootstrap.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: Thu Nov 3 18:40:15 PDT 2011 + * Date: Fri Nov 4 13:34:33 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). @@ -338,40 +338,40 @@ a:hover { .span24 { width: 1420px; } -.row > .offset1 { +.row > .offset1 { margin-left: 80px; } -.row > .offset2 { +.row > .offset2 { margin-left: 140px; } -.row > .offset3 { +.row > .offset3 { margin-left: 200px; } -.row > .offset4 { +.row > .offset4 { margin-left: 260px; } -.row > .offset5 { +.row > .offset5 { margin-left: 320px; } -.row > .offset6 { +.row > .offset6 { margin-left: 380px; } -.row > .offset7 { +.row > .offset7 { margin-left: 440px; } -.row > .offset8 { +.row > .offset8 { margin-left: 500px; } -.row > .offset9 { +.row > .offset9 { margin-left: 560px; } -.row > .offset10 { +.row > .offset10 { margin-left: 620px; } -.row > .offset11 { +.row > .offset11 { margin-left: 680px; } -.row > .offset12 { +.row > .offset12 { margin-left: 740px; } .span-one-third { diff --git a/bootstrap.min.css b/bootstrap.min.css index 28f1e25f47..3cdbded24a 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -59,18 +59,18 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .span22{width:1300px;} .span23{width:1360px;} .span24{width:1420px;} -.row >.offset1{margin-left:80px;} -.row >.offset2{margin-left:140px;} -.row >.offset3{margin-left:200px;} -.row >.offset4{margin-left:260px;} -.row >.offset5{margin-left:320px;} -.row >.offset6{margin-left:380px;} -.row >.offset7{margin-left:440px;} -.row >.offset8{margin-left:500px;} -.row >.offset9{margin-left:560px;} -.row >.offset10{margin-left:620px;} -.row >.offset11{margin-left:680px;} -.row >.offset12{margin-left:740px;} +.row>.offset1{margin-left:80px;} +.row>.offset2{margin-left:140px;} +.row>.offset3{margin-left:200px;} +.row>.offset4{margin-left:260px;} +.row>.offset5{margin-left:320px;} +.row>.offset6{margin-left:380px;} +.row>.offset7{margin-left:440px;} +.row>.offset8{margin-left:500px;} +.row>.offset9{margin-left:560px;} +.row>.offset10{margin-left:620px;} +.row>.offset11{margin-left:680px;} +.row>.offset12{margin-left:740px;} .span-one-third{width:300px;} .span-two-thirds{width:620px;} .offset-one-third{margin-left:340px;} diff --git a/docs/index.html b/docs/index.html index 4726981bd9..a6901708c7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1862,7 +1862,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita

Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

 <link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
-<script src="js/less-1.1.3.min.js"></script>
+<script src="js/less-1.1.4.min.js"></script>

Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.

What’s included

diff --git a/lib/scaffolding.less b/lib/scaffolding.less index bd7bf873c6..a0066393ee 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -116,18 +116,18 @@ a { // Offset column options .row { - & > .offset1 { .offset(1); } - & > .offset2 { .offset(2); } - & > .offset3 { .offset(3); } - & > .offset4 { .offset(4); } - & > .offset5 { .offset(5); } - & > .offset6 { .offset(6); } - & > .offset7 { .offset(7); } - & > .offset8 { .offset(8); } - & > .offset9 { .offset(9); } - & > .offset10 { .offset(10); } - & > .offset11 { .offset(11); } - & > .offset12 { .offset(12); } + > .offset1 { .offset(1); } + > .offset2 { .offset(2); } + > .offset3 { .offset(3); } + > .offset4 { .offset(4); } + > .offset5 { .offset(5); } + > .offset6 { .offset(6); } + > .offset7 { .offset(7); } + > .offset8 { .offset(8); } + > .offset9 { .offset(9); } + > .offset10 { .offset(10); } + > .offset11 { .offset(11); } + > .offset12 { .offset(12); } } // Unique column sizes for 16-column grid