diff options
| author | Jacob Thornton <[email protected]> | 2012-04-14 21:45:23 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-14 21:45:23 -0700 |
| commit | ce944421042def2782fc8699e16d872ee6dce4e3 (patch) | |
| tree | 74c2ef19a6de608b73f12f4e984403bd90f1631c /docs/templates | |
| parent | d65f7f204a918906d7ce5120b9719abf105d60c5 (diff) | |
| parent | 490eb1bd16177f951b7c66c364d2eee6a6288a5d (diff) | |
| download | bootstrap-ce944421042def2782fc8699e16d872ee6dce4e3.tar.xz bootstrap-ce944421042def2782fc8699e16d872ee6dce4e3.zip | |
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/pages/index.mustache | 2 | ||||
| -rw-r--r-- | docs/templates/pages/less.mustache | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index bef11b810..41a89e07a 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -6,7 +6,7 @@ <p>{{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}</p> <p class="download-info"> <a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large">{{_i}}View project on GitHub{{/i}}</a> - <a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap <small>(v2.0.2)</small>{{/i}}</a> + <a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap <small>(v2.0.3)</small>{{/i}}</a> </p> </div> 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> |