diff options
| author | Mark Otto <[email protected]> | 2012-01-25 01:23:50 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-25 01:23:50 -0800 |
| commit | f4f7296fa8b371ed06addd4e7d1f0662c01b2b76 (patch) | |
| tree | ee69214a6cbe07a619ce220f7746aba5d1b363e7 | |
| parent | b8fa6cfacf61a02ab769b9031253c7b06111fa7c (diff) | |
| parent | c5103d0ad12c2b1bb1ca7f35c56e6126233f5e08 (diff) | |
| download | bootstrap-f4f7296fa8b371ed06addd4e7d1f0662c01b2b76.tar.xz bootstrap-f4f7296fa8b371ed06addd4e7d1f0662c01b2b76.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/less.html
docs/templates/pages/less.mustache
| -rw-r--r-- | docs/less.html | 1 | ||||
| -rw-r--r-- | docs/templates/pages/less.mustache | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/less.html b/docs/less.html index 6bb04e8d8..ac75dd346 100644 --- a/docs/less.html +++ b/docs/less.html @@ -398,6 +398,7 @@ <div class="page-header" id="mixins"> <h1>Bootstrap mixins <small></small></h1> </div> + <h3>Mixins up the wazoo</h3> <p>Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like <code>box-shadow</code>, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.</p> <h4>Font stacks</h4> diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 76ecf70c9..b3b9c15eb 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -335,6 +335,7 @@ <div class="page-header" id="mixins"> <h1>{{_i}}Bootstrap mixins <small></small>{{/i}}</h1> </div> + <h3>{{_i}}Mixins up the wazoo{{/i}}</h3> <p>{{_i}}Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like <code>box-shadow</code>, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.{{/i}}</p> <h4>{{_i}}Font stacks{{/i}}</h4> |