rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'font-variables' of https://github.com/ctalkington/bootstrap into ctalkington-font-variables

Browse source
This commit is contained in:
Mark Otto 2012-03-22 17:13:58 -07:00
commit 78e37e7d21
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/download.html
View file

@ -296,6 +296,12 @@
<input type="text" class="span3" placeholder="inherit">
<label>@heroUnitLeadColor</label>
<input type="text" class="span3" placeholder="inherit">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
</div><!-- /span -->
<div class="span3">
<h3>Tables</h3>

6
docs/templates/pages/download.mustache vendored
View file

@ -220,6 +220,12 @@
<input type="text" class="span3" placeholder="inherit">
<label>@heroUnitLeadColor</label>
<input type="text" class="span3" placeholder="inherit">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
</div><!-- /span -->
<div class="span3">
<h3>{{_i}}Tables{{/i}}</h3>