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

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

This commit is contained in:
Mark Otto 2012-03-22 17:13:58 -07:00
parent 89ea238c32 2c4230e2d3
commit 78e37e7d21
4 changed files with 19 additions and 3 deletions
Show Stats 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>

6
less/mixins.less
View File

@ -116,13 +116,13 @@
#font {
#family {
.serif() {
font-family: Georgia, "Times New Roman", Times, serif;
font-family: @serifFontFamily;
}
.sans-serif() {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: @sansFontFamily;
}
.monospace() {
font-family: Menlo, Monaco, "Courier New", monospace;
font-family: @monoFontFamily;
}
}
.shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {

4
less/variables.less
View File

@ -54,6 +54,10 @@
@headingsFontWeight: bold; // instead of browser default, bold
@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
// -------------------------