diff options
| author | Mark Otto <[email protected]> | 2012-04-14 18:18:11 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-14 18:18:11 -0700 |
| commit | 4bcb89946bf556ff524a67c82e079f43b045e747 (patch) | |
| tree | a1ffdddd745077cbcbfd062e9b138d8e09c474bc | |
| parent | d8acc062c1503fbda10bfa5041677c1459654b62 (diff) | |
| download | bootstrap-4bcb89946bf556ff524a67c82e079f43b045e747.tar.xz bootstrap-4bcb89946bf556ff524a67c82e079f43b045e747.zip | |
merge in #2684, offset on the .makeColumn mixin
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 71315 -> 71315 bytes | |||
| -rw-r--r-- | docs/less.html | 10 | ||||
| -rw-r--r-- | docs/templates/pages/less.mustache | 10 |
3 files changed, 20 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 6e1a6f41c..8c0bb2cd8 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/less.html b/docs/less.html index 4fe26af56..3fecd1ade 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 5345cbf97..7698dd290 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> |