From 4bcb89946bf556ff524a67c82e079f43b045e747 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 14 Apr 2012 18:18:11 -0700
Subject: [PATCH] merge in #2684, offset on the .makeColumn mixin

---
 docs/assets/bootstrap.zip          | Bin 71315 -> 71315 bytes
 docs/less.html                     |  10 ++++++++++
 docs/templates/pages/less.mustache |  10 ++++++++++
 3 files changed, 20 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 6e1a6f41c17a1772192889d99ed1f990790ff463..8c0bb2cd8df5fb4c95b7f3e72405fc2446087fe2 100644
GIT binary patch
delta 473
zc-ou1mSyr<7M=iaW)?065HOoGkw;N^yJDCBP9QF=;AUWC`O3(^z#;;aL{S!?%C-Zn
zZ1TPaX(ph+3|p|k4#kbP|8fEaCg0+6go<od<o?A05|R}$VgnhzU2$`$h?)gRsMf~}
ztO_W!)8~dU$fN+7$?F?9*|sAaKlyfpGfb;WW2_=bsCkhsOz7Am6%!`&Nt54PQ(@bQ
zqR;rc0n8Pd*JG4HijMy>fhyX}`1`jQP}TH*f{gl1+ZCrD5M~sgo+rx41`_lWVl-yj
z0Tz@6@fQg(dL#4sgc<#j`E|mK4p2kD{QJU;E>L+CLuIBXh%kyHtDGUi7>La05(V0X
k;vDly)5}B|jhJ>K6rB`hw1Zm@l-CerbOOoeh%u@I08!kRE&u=k

delta 473
zc-ou1mSyr<7M=iaW)?065ZKc@kw;P4MXJl+4TwuCxEUB(zA`c}u!sO95z6-VP7F|G
za|J7#ystr;2`Dhb7A)W@wej{}PN2Z#TU?G%k<E(Szc`ro^iGx)F=7K5?jp50R7A}J
zq^j1(46F($wA1H?F;LaS0GY|_8#viq5XJ+w-fnP)X;o>ARRjq&FS3OR9b2Sg0y6E*
zH5E2DWM@q_zHR_>MdtMwWsuPEUnWpRn;C!q76TeJ{huJCK9h^o^aH|-;?wg)8QFm9
zruzvo8Z)_q1!Y0}MM8|;$b3FwMt?XTXh@wfqXX0su>5^tMi;0&)X+U(LuIBXh%k!7
sRRRTPh%g2s^SMNUHlaJGOq9`x$qixrNl`{SWanszF*<?dbHo_c0S7LUC;$Ke

diff --git a/docs/less.html b/docs/less.html
index 4fe26af56c..3fecd1ade2 100644
--- 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 5345cbf974..7698dd2900 100644
--- 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>
-- 
2.47.3