aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-03-04 14:27:13 -0800
committerJacob Thornton <[email protected]>2012-03-04 14:27:13 -0800
commit29c63fdb6ae4877160dbad05cdcf34f8cf1f66ad (patch)
treeb1fc6478fd515ad9b31538c3f682070313f09efe
parent3524aa909cd0cef16c9d244bd21da0dfd7b48cf9 (diff)
downloadbootstrap-29c63fdb6ae4877160dbad05cdcf34f8cf1f66ad.tar.xz
bootstrap-29c63fdb6ae4877160dbad05cdcf34f8cf1f66ad.zip
true > child + varargs
-rw-r--r--docs/assets/bootstrap.zipbin54469 -> 9620 bytes
-rw-r--r--less/mixins.less12
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ec1369220..84e1f81f1 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/less/mixins.less b/less/mixins.less
index 3129d515e..c9ed13317 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -489,10 +489,10 @@
~".span@{index}" { .span(@index); }
#grid .spanX(@index - 1);
}
- .spanX (@index, @child) when not (@index = 0) and (@child) {
- ~"> .span@{index}" { .span(@index); }
- #grid .spanX(@index - 1, @child);
- }
+ .spanX (@index, child) when (@index > 0) {
+    ~"> .span@{index}" { .span(@index); }
+    #grid .spanX(@index - 1, child);
+  }
.spanX (0, ...) {}
.offsetX (@index) when (@index > 0) {
@@ -550,7 +550,7 @@
}
// generate .spanX
- #grid .spanX (@gridColumns, true);
+ #grid .spanX (@gridColumns, child);
}
}
@@ -567,7 +567,7 @@
margin-left: 0; // override margin-left from core grid system
// generate .spanX
- #grid .spanX (@gridColumns, true);
+ #grid .spanX (@gridColumns, child);
}
}