root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 

Conflicts:
	docs/less.html
	docs/templates/pages/less.mustache
This commit is contained in:
Mark Otto 2012-01-25 01:23:50 -08:00
parent b8fa6cfacf c5103d0ad1
commit f4f7296fa8
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/less.html
View File

@ -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>

1
docs/templates/pages/less.mustache vendored
View File

@ -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>