aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-22 17:18:07 -0700
committerMark Otto <[email protected]>2012-03-22 17:18:07 -0700
commite0c85fb69cfc4a9956856e0b14afb12def2fccf0 (patch)
tree58c9c3777d987d1d41ae039c33cb64ab0fde3122 /docs
parent78e37e7d21eaa52e88f77df40c1334bce32ec84c (diff)
downloadbootstrap-e0c85fb69cfc4a9956856e0b14afb12def2fccf0.tar.xz
bootstrap-e0c85fb69cfc4a9956856e0b14afb12def2fccf0.zip
use new font-stack mixins in base and alt font family mixins
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin55584 -> 55584 bytes
-rw-r--r--docs/download.html16
-rw-r--r--docs/templates/pages/download.mustache16
3 files changed, 16 insertions, 16 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8fedb1f08..2f10c7654 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/download.html b/docs/download.html
index 427dad76d..5e6a1dc17 100644
--- 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 d7cc9e9f7..e5564a1f2 100644
--- 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>