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

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

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>

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>

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) {

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
 // -------------------------