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

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8fedb1f08685c363bf6a9c59f05b71dd1f8a4b8a..2f10c7654e0e2d68047b8214aeace4ef792a0514 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/download.html b/docs/download.html
index 427dad76dd865593522883546f444292267012eb..5e6a1dc173eb061c349b32862e24332ccb3671cb 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -276,14 +276,20 @@
       <input type="text" class="span3" placeholder="2.127659574%">
 
       <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>
       <input type="text" class="span3" placeholder="13px">
       <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>
       <input type="text" class="span3" placeholder="18px">
       <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>
       <input type="text" class="span3" placeholder="inherit">
       <label>@headingsFontWeight</label>
@@ -296,12 +302,6 @@
       <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 d7cc9e9f7e06f0a8f6d86e4fe34d0618739ebd36..e5564a1f2254ac7d82af285fc5d865a81459d837 100644 (file)
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -200,14 +200,20 @@
       <input type="text" class="span3" placeholder="2.127659574%">
 
       <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>
       <input type="text" class="span3" placeholder="13px">
       <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>
       <input type="text" class="span3" placeholder="18px">
       <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>
       <input type="text" class="span3" placeholder="inherit">
       <label>@headingsFontWeight</label>
@@ -220,12 +226,6 @@
       <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/variables.less b/less/variables.less
index 1fb22ac3230f2272e219471c9e3993e707a0fb75..c8e2a3c0df05e862d181fa85b85e72e303adbcf7 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -45,19 +45,19 @@
 
 // Typography
 // -------------------------
+@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
+@monoFontFamily:        Menlo, Monaco, "Courier New", monospace;
+
 @baseFontSize:          13px;
-@baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@baseFontFamily:        @sansFontFamily;
 @baseLineHeight:        18px;
-@altFontFamily:         Georgia, "Times New Roman", Times, serif;
+@altFontFamily:         @serifFontFamily;
 
 @headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
 @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
 // -------------------------