From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 4 Mar 2012 22:27:13 +0000 (-0800)
Subject: true > child + varargs
X-Git-Tag: v2.0.2~56^2~3^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29c63fdb6ae4877160dbad05cdcf34f8cf1f66ad;p=thirdparty%2Fbootstrap.git

true > child + varargs
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ec1369220c..84e1f81f1c 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/less/mixins.less b/less/mixins.less
index 3129d515e5..c9ed133175 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);
     }
 
   }