diff options
| author | Mark Otto <[email protected]> | 2012-03-22 17:13:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-22 17:13:58 -0700 |
| commit | 78e37e7d21eaa52e88f77df40c1334bce32ec84c (patch) | |
| tree | 040dfb3bb948f87f35f6d4f0c13ed8140e8b49cc | |
| parent | 89ea238c32716aabe59dcab7d4e2480858bbba91 (diff) | |
| parent | 2c4230e2d3abde2bbf3b9d2798d8c9ce2c9f81da (diff) | |
| download | bootstrap-78e37e7d21eaa52e88f77df40c1334bce32ec84c.tar.xz bootstrap-78e37e7d21eaa52e88f77df40c1334bce32ec84c.zip | |
Merge branch 'font-variables' of https://github.com/ctalkington/bootstrap into ctalkington-font-variables
| -rw-r--r-- | docs/download.html | 6 | ||||
| -rw-r--r-- | docs/templates/pages/download.mustache | 6 | ||||
| -rw-r--r-- | less/mixins.less | 6 | ||||
| -rw-r--r-- | less/variables.less | 4 |
4 files changed, 19 insertions, 3 deletions
diff --git a/docs/download.html b/docs/download.html index 89ddd76a2..427dad76d 100644 --- a/docs/download.html +++ b/docs/download.html @@ -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> diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index b282db6c9..d7cc9e9f7 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -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> diff --git a/less/mixins.less b/less/mixins.less index a118fe7c4..c4b4ee82e 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -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) { diff --git a/less/variables.less b/less/variables.less index 812587fcd..1fb22ac32 100644 --- a/less/variables.less +++ b/less/variables.less @@ -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 // ------------------------- |