merge in #2684, offset on the .makeColumn mixin

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 6e1a6f41c17a1772192889d99ed1f990790ff463..8c0bb2cd8df5fb4c95b7f3e72405fc2446087fe2 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/less.html b/docs/less.html
index 4fe26af56c01b494fa6d72e51dfa977f76e8634b..3fecd1ade2997f42d8bde2b14c2d7ae8e121b492 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -812,6 +812,16 @@
         <td><code>@fluidGridColumnWidth, @fluidGridGutterWidth</code></td>
         <td>Generate a precent grid system with <em>n</em> columns and <em>x</em> % wide gutter</td>
       </tr>
+      <tr>
+        <td><code>#grid > .input()</code></td>
+        <td><code>@gridColumnWidth, @gridGutterWidth</code></td>
+        <td>Generate the pixel grid system for <code>input</code> elements, accounting for padding and borders</td>
+      </tr>
+      <tr>
+        <td><code>.makeColumn</code></td>
+        <td><code>@columns: 1, @offset: 0</code></td>
+        <td>Turn any <code>div</code> into a grid column without the <code>.span*</code> classes</td>
+      </tr>
     </tbody>
   </table>
   <h3>CSS3 properties</h3>

diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 5345cbf974ec3b868f97bfed104b5f98a83ac9cc..7698dd290004609792c543a72bbfeaae0c56b1c1 100644 (file)
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -735,6 +735,16 @@
         <td><code>@fluidGridColumnWidth, @fluidGridGutterWidth</code></td>
         <td>{{_i}}Generate a precent grid system with <em>n</em> columns and <em>x</em> % wide gutter{{/i}}</td>
       </tr>
+      <tr>
+        <td><code>#grid > .input()</code></td>
+        <td><code>@gridColumnWidth, @gridGutterWidth</code></td>
+        <td>{{_i}}Generate the pixel grid system for <code>input</code> elements, accounting for padding and borders{{/i}}</td>
+      </tr>
+      <tr>
+        <td><code>.makeColumn</code></td>
+        <td><code>@columns: 1, @offset: 0</code></td>
+        <td>{{_i}}Turn any <code>div</code> into a grid column without the <code>.span*</code> classes{{/i}}</td>
+      </tr>
     </tbody>
   </table>
   <h3>{{_i}}CSS3 properties{{/i}}</h3>