From 51f37cbb8105ad632fae7367912130aafc0f6c86 Mon Sep 17 00:00:00 2001 From: ctalkington Date: Thu, 15 Mar 2012 13:34:50 -0500 Subject: [PATCH 1/2] make font family mixins customizable with variables. --- less/mixins.less | 6 +++--- less/variables.less | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/less/mixins.less b/less/mixins.less index a118fe7c46..c4b4ee82ee 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 94c3a0667c..56f2a8d59d 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 // ------------------------- From 2c4230e2d3abde2bbf3b9d2798d8c9ce2c9f81da Mon Sep 17 00:00:00 2001 From: ctalkington Date: Thu, 15 Mar 2012 14:46:27 -0500 Subject: [PATCH 2/2] update docs to match variable addition. --- docs/download.html | 6 ++++++ docs/templates/pages/download.mustache | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/docs/download.html b/docs/download.html index 6aa113001d..3074b55260 100644 --- a/docs/download.html +++ b/docs/download.html @@ -296,6 +296,12 @@ + + + + + +

Tables

diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index 87fdc6a383..1be5bf64f2 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -220,6 +220,12 @@ + + + + + +

{{_i}}Tables{{/i}}