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

use new font-stack mixins in base and alt font family mixins

This commit is contained in:
Mark Otto 2012-03-22 17:18:07 -07:00
parent 78e37e7d21
commit e0c85fb69c
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

16
docs/download.html
View File

@ -276,14 +276,20 @@
<input type="text" class="span3" placeholder="2.127659574%"> <input type="text" class="span3" placeholder="2.127659574%">
<h3>Typography</h3> <h3>Typography</h3>
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
<label>@baseFontSize</label> <label>@baseFontSize</label>
<input type="text" class="span3" placeholder="13px"> <input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label> <label>@baseFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif"> <input type="text" class="span3" placeholder="@sansFontFamily">
<label>@baseLineHeight</label> <label>@baseLineHeight</label>
<input type="text" class="span3" placeholder="18px"> <input type="text" class="span3" placeholder="18px">
<label>@altFontFamily</label> <label>@altFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif;"> <input type="text" class="span3" placeholder="@serifFontFamily">
<label>@headingsFontFamily</label> <label>@headingsFontFamily</label>
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@headingsFontWeight</label> <label>@headingsFontWeight</label>
@ -296,12 +302,6 @@
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@heroUnitLeadColor</label> <label>@heroUnitLeadColor</label>
<input type="text" class="span3" placeholder="inherit"> <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><!-- /span -->
<div class="span3"> <div class="span3">
<h3>Tables</h3> <h3>Tables</h3>

16
docs/templates/pages/download.mustache vendored
View File

@ -200,14 +200,20 @@
<input type="text" class="span3" placeholder="2.127659574%"> <input type="text" class="span3" placeholder="2.127659574%">
<h3>{{_i}}Typography{{/i}}</h3> <h3>{{_i}}Typography{{/i}}</h3>
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
<label>@baseFontSize</label> <label>@baseFontSize</label>
<input type="text" class="span3" placeholder="13px"> <input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label> <label>@baseFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif"> <input type="text" class="span3" placeholder="@sansFontFamily">
<label>@baseLineHeight</label> <label>@baseLineHeight</label>
<input type="text" class="span3" placeholder="18px"> <input type="text" class="span3" placeholder="18px">
<label>@altFontFamily</label> <label>@altFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif;"> <input type="text" class="span3" placeholder="@serifFontFamily">
<label>@headingsFontFamily</label> <label>@headingsFontFamily</label>
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@headingsFontWeight</label> <label>@headingsFontWeight</label>
@ -220,12 +226,6 @@
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@heroUnitLeadColor</label> <label>@heroUnitLeadColor</label>
<input type="text" class="span3" placeholder="inherit"> <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><!-- /span -->
<div class="span3"> <div class="span3">
<h3>{{_i}}Tables{{/i}}</h3> <h3>{{_i}}Tables{{/i}}</h3>

12
less/variables.less
View File

@ -45,19 +45,19 @@
// Typography // Typography
// ------------------------- // -------------------------
@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
@monoFontFamily: Menlo, Monaco, "Courier New", monospace;
@baseFontSize: 13px; @baseFontSize: 13px;
@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; @baseFontFamily: @sansFontFamily;
@baseLineHeight: 18px; @baseLineHeight: 18px;
@altFontFamily: Georgia, "Times New Roman", Times, serif; @altFontFamily: @serifFontFamily;
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
@headingsFontWeight: bold; // instead of browser default, bold @headingsFontWeight: bold; // instead of browser default, bold
@headingsColor: inherit; // empty to use BS default, @textColor @headingsColor: inherit; // empty to use BS default, @textColor
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@monoFontFamily: Menlo, Monaco, "Courier New", monospace;
// Tables // Tables
// ------------------------- // -------------------------