aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-03-04 14:21:54 -0800
committerJacob Thornton <[email protected]>2012-03-04 14:21:54 -0800
commit3524aa909cd0cef16c9d244bd21da0dfd7b48cf9 (patch)
tree23cf04c5b848c8a5387b2e919fa0f7f474088036
parent2f598e35a0954532388960c5cf0e2855a076d48c (diff)
downloadbootstrap-3524aa909cd0cef16c9d244bd21da0dfd7b48cf9.tar.xz
bootstrap-3524aa909cd0cef16c9d244bd21da0dfd7b48cf9.zip
make sure to pass child var through
-rw-r--r--docs/assets/bootstrap.zipbin54463 -> 54469 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css176
-rw-r--r--docs/assets/css/bootstrap.css88
-rw-r--r--less/mixins.less6
4 files changed, 135 insertions, 135 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e84dd00cc..ec1369220 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index bd1b47ca7..8de0bb349 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -278,37 +278,37 @@
.row-fluid > .span12 {
width: 99.999999993%;
}
- .row-fluid .span11 {
+ .row-fluid > .span11 {
width: 91.436464082%;
}
- .row-fluid .span10 {
+ .row-fluid > .span10 {
width: 82.87292817100001%;
}
- .row-fluid .span9 {
+ .row-fluid > .span9 {
width: 74.30939226%;
}
- .row-fluid .span8 {
+ .row-fluid > .span8 {
width: 65.74585634900001%;
}
- .row-fluid .span7 {
+ .row-fluid > .span7 {
width: 57.182320438000005%;
}
- .row-fluid .span6 {
+ .row-fluid > .span6 {
width: 48.618784527%;
}
- .row-fluid .span5 {
+ .row-fluid > .span5 {
width: 40.055248616%;
}
- .row-fluid .span4 {
+ .row-fluid > .span4 {
width: 31.491712705%;
}
- .row-fluid .span3 {
+ .row-fluid > .span3 {
width: 22.928176794%;
}
- .row-fluid .span2 {
+ .row-fluid > .span2 {
width: 14.364640883%;
}
- .row-fluid .span1 {
+ .row-fluid > .span1 {
width: 5.801104972%;
}
input,
@@ -321,59 +321,59 @@
.uneditable-input > .span12 {
width: 714px;
}
- input .span11,
- textarea .span11,
- .uneditable-input .span11 {
+ input > .span11,
+ textarea > .span11,
+ .uneditable-input > .span11 {
width: 652px;
}
- input .span10,
- textarea .span10,
- .uneditable-input .span10 {
+ input > .span10,
+ textarea > .span10,
+ .uneditable-input > .span10 {
width: 590px;
}
- input .span9,
- textarea .span9,
- .uneditable-input .span9 {
+ input > .span9,
+ textarea > .span9,
+ .uneditable-input > .span9 {
width: 528px;
}
- input .span8,
- textarea .span8,
- .uneditable-input .span8 {
+ input > .span8,
+ textarea > .span8,
+ .uneditable-input > .span8 {
width: 466px;
}
- input .span7,
- textarea .span7,
- .uneditable-input .span7 {
+ input > .span7,
+ textarea > .span7,
+ .uneditable-input > .span7 {
width: 404px;
}
- input .span6,
- textarea .span6,
- .uneditable-input .span6 {
+ input > .span6,
+ textarea > .span6,
+ .uneditable-input > .span6 {
width: 342px;
}
- input .span5,
- textarea .span5,
- .uneditable-input .span5 {
+ input > .span5,
+ textarea > .span5,
+ .uneditable-input > .span5 {
width: 280px;
}
- input .span4,
- textarea .span4,
- .uneditable-input .span4 {
+ input > .span4,
+ textarea > .span4,
+ .uneditable-input > .span4 {
width: 218px;
}
- input .span3,
- textarea .span3,
- .uneditable-input .span3 {
+ input > .span3,
+ textarea > .span3,
+ .uneditable-input > .span3 {
width: 156px;
}
- input .span2,
- textarea .span2,
- .uneditable-input .span2 {
+ input > .span2,
+ textarea > .span2,
+ .uneditable-input > .span2 {
width: 94px;
}
- input .span1,
- textarea .span1,
- .uneditable-input .span1 {
+ input > .span1,
+ textarea > .span1,
+ .uneditable-input > .span1 {
width: 32px;
}
}
@@ -607,37 +607,37 @@
.row-fluid > .span12 {
width: 100%;
}
- .row-fluid .span11 {
+ .row-fluid > .span11 {
width: 91.45299145300001%;
}
- .row-fluid .span10 {
+ .row-fluid > .span10 {
width: 82.905982906%;
}
- .row-fluid .span9 {
+ .row-fluid > .span9 {
width: 74.358974359%;
}
- .row-fluid .span8 {
+ .row-fluid > .span8 {
width: 65.81196581200001%;
}
- .row-fluid .span7 {
+ .row-fluid > .span7 {
width: 57.264957265%;
}
- .row-fluid .span6 {
+ .row-fluid > .span6 {
width: 48.717948718%;
}
- .row-fluid .span5 {
+ .row-fluid > .span5 {
width: 40.170940171000005%;
}
- .row-fluid .span4 {
+ .row-fluid > .span4 {
width: 31.623931624%;
}
- .row-fluid .span3 {
+ .row-fluid > .span3 {
width: 23.076923077%;
}
- .row-fluid .span2 {
+ .row-fluid > .span2 {
width: 14.529914530000001%;
}
- .row-fluid .span1 {
+ .row-fluid > .span1 {
width: 5.982905983%;
}
input,
@@ -650,59 +650,59 @@
.uneditable-input > .span12 {
width: 1160px;
}
- input .span11,
- textarea .span11,
- .uneditable-input .span11 {
+ input > .span11,
+ textarea > .span11,
+ .uneditable-input > .span11 {
width: 1060px;
}
- input .span10,
- textarea .span10,
- .uneditable-input .span10 {
+ input > .span10,
+ textarea > .span10,
+ .uneditable-input > .span10 {
width: 960px;
}
- input .span9,
- textarea .span9,
- .uneditable-input .span9 {
+ input > .span9,
+ textarea > .span9,
+ .uneditable-input > .span9 {
width: 860px;
}
- input .span8,
- textarea .span8,
- .uneditable-input .span8 {
+ input > .span8,
+ textarea > .span8,
+ .uneditable-input > .span8 {
width: 760px;
}
- input .span7,
- textarea .span7,
- .uneditable-input .span7 {
+ input > .span7,
+ textarea > .span7,
+ .uneditable-input > .span7 {
width: 660px;
}
- input .span6,
- textarea .span6,
- .uneditable-input .span6 {
+ input > .span6,
+ textarea > .span6,
+ .uneditable-input > .span6 {
width: 560px;
}
- input .span5,
- textarea .span5,
- .uneditable-input .span5 {
+ input > .span5,
+ textarea > .span5,
+ .uneditable-input > .span5 {
width: 460px;
}
- input .span4,
- textarea .span4,
- .uneditable-input .span4 {
+ input > .span4,
+ textarea > .span4,
+ .uneditable-input > .span4 {
width: 360px;
}
- input .span3,
- textarea .span3,
- .uneditable-input .span3 {
+ input > .span3,
+ textarea > .span3,
+ .uneditable-input > .span3 {
width: 260px;
}
- input .span2,
- textarea .span2,
- .uneditable-input .span2 {
+ input > .span2,
+ textarea > .span2,
+ .uneditable-input > .span2 {
width: 160px;
}
- input .span1,
- textarea .span1,
- .uneditable-input .span1 {
+ input > .span1,
+ textarea > .span1,
+ .uneditable-input > .span1 {
width: 60px;
}
.thumbnails {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c79e20edc..20ec7f609 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -242,37 +242,37 @@ a:hover {
.row-fluid > .span12 {
width: 99.99999998999999%;
}
-.row-fluid .span11 {
+.row-fluid > .span11 {
width: 91.489361693%;
}
-.row-fluid .span10 {
+.row-fluid > .span10 {
width: 82.97872339599999%;
}
-.row-fluid .span9 {
+.row-fluid > .span9 {
width: 74.468085099%;
}
-.row-fluid .span8 {
+.row-fluid > .span8 {
width: 65.95744680199999%;
}
-.row-fluid .span7 {
+.row-fluid > .span7 {
width: 57.446808505%;
}
-.row-fluid .span6 {
+.row-fluid > .span6 {
width: 48.93617020799999%;
}
-.row-fluid .span5 {
+.row-fluid > .span5 {
width: 40.425531911%;
}
-.row-fluid .span4 {
+.row-fluid > .span4 {
width: 31.914893614%;
}
-.row-fluid .span3 {
+.row-fluid > .span3 {
width: 23.404255317%;
}
-.row-fluid .span2 {
+.row-fluid > .span2 {
width: 14.89361702%;
}
-.row-fluid .span1 {
+.row-fluid > .span1 {
width: 6.382978723%;
}
.container {
@@ -772,59 +772,59 @@ textarea > .span12,
.uneditable-input > .span12 {
width: 930px;
}
-input .span11,
-textarea .span11,
-.uneditable-input .span11 {
+input > .span11,
+textarea > .span11,
+.uneditable-input > .span11 {
width: 850px;
}
-input .span10,
-textarea .span10,
-.uneditable-input .span10 {
+input > .span10,
+textarea > .span10,
+.uneditable-input > .span10 {
width: 770px;
}
-input .span9,
-textarea .span9,
-.uneditable-input .span9 {
+input > .span9,
+textarea > .span9,
+.uneditable-input > .span9 {
width: 690px;
}
-input .span8,
-textarea .span8,
-.uneditable-input .span8 {
+input > .span8,
+textarea > .span8,
+.uneditable-input > .span8 {
width: 610px;
}
-input .span7,
-textarea .span7,
-.uneditable-input .span7 {
+input > .span7,
+textarea > .span7,
+.uneditable-input > .span7 {
width: 530px;
}
-input .span6,
-textarea .span6,
-.uneditable-input .span6 {
+input > .span6,
+textarea > .span6,
+.uneditable-input > .span6 {
width: 450px;
}
-input .span5,
-textarea .span5,
-.uneditable-input .span5 {
+input > .span5,
+textarea > .span5,
+.uneditable-input > .span5 {
width: 370px;
}
-input .span4,
-textarea .span4,
-.uneditable-input .span4 {
+input > .span4,
+textarea > .span4,
+.uneditable-input > .span4 {
width: 290px;
}
-input .span3,
-textarea .span3,
-.uneditable-input .span3 {
+input > .span3,
+textarea > .span3,
+.uneditable-input > .span3 {
width: 210px;
}
-input .span2,
-textarea .span2,
-.uneditable-input .span2 {
+input > .span2,
+textarea > .span2,
+.uneditable-input > .span2 {
width: 130px;
}
-input .span1,
-textarea .span1,
-.uneditable-input .span1 {
+input > .span1,
+textarea > .span1,
+.uneditable-input > .span1 {
width: 50px;
}
input[disabled],
diff --git a/less/mixins.less b/less/mixins.less
index b1274847d..3129d515e 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -489,11 +489,11 @@
~".span@{index}" { .span(@index); }
#grid .spanX(@index - 1);
}
- .spanX (@index, @child) when (@index > 0) and (@child) {
+ .spanX (@index, @child) when not (@index = 0) and (@child) {
~"> .span@{index}" { .span(@index); }
- #grid .spanX(@index - 1);
+ #grid .spanX(@index - 1, @child);
}
- .spanX (0) {}
+ .spanX (0, ...) {}
.offsetX (@index) when (@index > 0) {
~".offset@{index}" { .offset(@index); }